Merge pull request #6892 from luneo7/ISSUE-6889

bm1549 · web-flow · commit 8a3889a6aaf1 · 2024-04-11T18:04:05.000-04:00
Register SpanLinkAdapter and SpanLinkJson for reflection
diff --git a/dd-java-agent/agent-bootstrap/src/main/resources/META-INF/native-image/com.datadoghq/dd-java-agent/reflect-config.json b/dd-java-agent/agent-bootstrap/src/main/resources/META-INF/native-image/com.datadoghq/dd-java-agent/reflect-config.json
@@ -47,6 +47,19 @@
       {"name": "fromJson"}
     ]
   },
+  {
+    "name" : "datadog.trace.agent.core.DDSpanLink$SpanLinkAdapter",
+    "methods": [
+      {"name": "toSpanLinkJson"}
+    ]
+  },
+  {
+    "name" : "datadog.trace.agent.core.DDSpanLink$SpanLinkJson",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredFields" : true,
+    "allPublicFields" : true
+  },
   {
     "name" : "datadog.trace.instrumentation.springweb.HandlerMappingResourceNameFilter",
     "methods": [
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanLink.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanLink.java
@@ -23,8 +23,6 @@ public class DDSpanLink extends SpanLink {
   private static final Logger LOGGER = LoggerFactory.getLogger(DDSpanLink.class);
   /** The maximum of characters a span tag value can hold. */
   private static final int TAG_MAX_LENGTH = 25_000;
-  /** JSON encoder (lazily initialized) */
-  private static JsonAdapter<AgentSpanLink> encoder;
 
   protected DDSpanLink(
       DDTraceId traceId, long spanId, byte traceFlags, String traceState, Attributes attributes) {
@@ -95,11 +93,20 @@ public static String toTag(List<AgentSpanLink> links) {
   }
 
   private static JsonAdapter<AgentSpanLink> getEncoder() {
-    if (encoder == null) {
+    return EncoderHolder.ENCODER;
+  }
+
+  /**
+   * JSON encoder (lazily initialized). This is not folded at native image build time, so it works
+   * as expected.
+   */
+  private static class EncoderHolder {
+    static final JsonAdapter<AgentSpanLink> ENCODER = createEncoder();
+
+    private static JsonAdapter<AgentSpanLink> createEncoder() {
       Moshi moshi = new Moshi.Builder().add(new SpanLinkAdapter()).build();
-      encoder = moshi.adapter(AgentSpanLink.class);
+      return moshi.adapter(AgentSpanLink.class);
     }
-    return encoder;
   }
 
   private static class SpanLinkAdapter {
