Merge pull request #342 from newrelic/fix/trace-id-reporting/NR-321827

Report trace.id and span.id in all JSONs
newrelic · Nov 6, 2024 · 3d94339 · 3d94339
2 parents d62f25e + 814ce7a
commit 3d94339
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...c/main/java/com/newrelic/agent/security/intcodeagent/models/javaagent/AgentBasicInfo.java b/...c/main/java/com/newrelic/agent/security/intcodeagent/models/javaagent/AgentBasicInfo.java
@@ -5,6 +5,8 @@
 import com.newrelic.agent.security.AgentInfo;
 import com.newrelic.agent.security.instrumentator.utils.AgentUtils;
 import com.newrelic.agent.security.instrumentator.utils.INRSettingsKey;
+import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.TraceMetadata;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
@@ -80,6 +82,9 @@ public AgentBasicInfo() {
         setGroupName(AgentConfig.getInstance().getGroupName());
         setNodeId(AgentInfo.getInstance().getLinkingMetadata().getOrDefault(INRSettingsKey.NR_ENTITY_GUID, StringUtils.EMPTY));
         setLinkingMetadata(new HashMap<>(AgentInfo.getInstance().getLinkingMetadata()));
+        TraceMetadata traceMetadata = NewRelic.getAgent().getTraceMetadata();
+        linkingMetadata.put(NR_APM_TRACE_ID, traceMetadata.getTraceId());
+        linkingMetadata.put(NR_APM_SPAN_ID, traceMetadata.getSpanId());
         setAppEntityGuid(AgentInfo.getInstance().getLinkingMetadata().getOrDefault(INRSettingsKey.NR_ENTITY_GUID, StringUtils.EMPTY));
         setAppAccountId(AgentConfig.getInstance().getConfig().getCustomerInfo().getAccountId());
         setApplicationUUID(AgentInfo.getInstance().getApplicationUUID());