Fixed issue with double class loading.

Author: AlexeyKuznetsov-DD

dd-java-agent/src/main/java/datadog/trace/bootstrap/BootstrapInitializationTelemetry.java

@@ -239,7 +239,8 @@ public void addPoint(String name, List<String> tags) {
       }
     }
 
-    public byte[] json() {
+    @Override
+    public String toString() {
       try (JsonWriter writer = new JsonWriter()) {
         writer.beginObject();
         writer.name("metadata").beginObject();
@@ -273,13 +274,13 @@ public byte[] json() {
         writer.endArray();
         writer.endObject();
 
-        return writer.toByteArray();
+        return writer.toString();
       }
     }
   }
 
   public interface JsonSender {
-    void send(Telemetry telemetry);
+    void send(Object telemetry);
   }
 
   public static final class ForwarderJsonSender implements JsonSender {
@@ -290,7 +291,7 @@ public static final class ForwarderJsonSender implements JsonSender {
     }
 
     @Override
-    public void send(Telemetry telemetry) {
+    public void send(Object telemetry) {
       ForwarderJsonSenderThread t = new ForwarderJsonSenderThread(forwarderPath, telemetry);
       t.setDaemon(true);
       t.start();
@@ -299,9 +300,9 @@ public void send(Telemetry telemetry) {
 
   public static final class ForwarderJsonSenderThread extends Thread {
     private final String forwarderPath;
-    private final Telemetry telemetry;
+    private final Object telemetry;
 
-    public ForwarderJsonSenderThread(String forwarderPath, Telemetry telemetry) {
+    public ForwarderJsonSenderThread(String forwarderPath, Object telemetry) {
       super("dd-forwarder-json-sender");
       this.forwarderPath = forwarderPath;
       this.telemetry = telemetry;
@@ -314,7 +315,7 @@ public void run() {
 
       // Run forwarder and mute tracing for subprocesses executed in by dd-java-agent.
       try (final Closeable ignored = muteTracing()) {
-        byte[] payload = telemetry.json();
+        byte[] payload = telemetry.toString().getBytes();
 
         Process process = builder.start();
         try (OutputStream out = process.getOutputStream()) {

dd-java-agent/src/test/groovy/datadog/trace/bootstrap/BootstrapInitializationTelemetryTest.groovy

@@ -1,11 +1,8 @@
 package datadog.trace.bootstrap
 
-import datadog.trace.bootstrap.BootstrapInitializationTelemetry.Telemetry
 import groovy.json.JsonBuilder
 import spock.lang.Specification
 
-import static java.nio.charset.StandardCharsets.UTF_8
-
 class BootstrapInitializationTelemetryTest extends Specification {
   Capture capture
   def initTelemetry
@@ -107,14 +104,14 @@ class BootstrapInitializationTelemetryTest extends Specification {
   }
 
   static class Capture implements BootstrapInitializationTelemetry.JsonSender {
-    Telemetry telemetry
+    Object telemetry
 
-    void send(Telemetry telemetry) {
+    void send(Object telemetry) {
       this.telemetry = telemetry
     }
 
     String json() {
-      return new String(telemetry.json(), UTF_8)
+      return telemetry.toString()
     }
   }
 }