feat(ci-visibility): Migrate to JSON component

Author: PerfectSlayer

dd-java-agent/agent-ci-visibility/build.gradle

@@ -29,6 +29,7 @@ dependencies {
   implementation group: 'org.jacoco', name: 'org.jacoco.report', version: '0.8.12'
 
   implementation project(':communication')
+  implementation project(':components:json')
   implementation project(':internal-api')
   implementation project(':internal-api:internal-api-9')
 

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuildkiteInfo.java

@@ -1,10 +1,10 @@
 package datadog.trace.civisibility.ci;
 
+import static datadog.json.JsonMapper.toJson;
 import static datadog.trace.api.git.GitUtils.filterSensitiveInfo;
 import static datadog.trace.api.git.GitUtils.normalizeBranch;
 import static datadog.trace.api.git.GitUtils.normalizeTag;
 import static datadog.trace.civisibility.utils.FileUtils.expandTilde;
-import static datadog.trace.util.Strings.toJson;
 
 import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CITagsProvider.java

@@ -1,6 +1,6 @@
 package datadog.trace.civisibility.ci;
 
-import static datadog.trace.util.Strings.toJson;
+import static datadog.json.JsonMapper.toJson;
 
 import datadog.trace.api.DDTags;
 import datadog.trace.api.git.GitInfo;

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/JenkinsInfo.java

@@ -1,5 +1,6 @@
 package datadog.trace.civisibility.ci;
 
+import static datadog.json.JsonMapper.toJson;
 import static datadog.trace.api.git.GitUtils.filterSensitiveInfo;
 import static datadog.trace.api.git.GitUtils.isTagReference;
 import static datadog.trace.api.git.GitUtils.normalizeBranch;
@@ -10,11 +11,8 @@
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.civisibility.ci.env.CiEnvironment;
-import datadog.trace.util.Strings;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -75,8 +73,7 @@ private String buildCiNodeLabels() {
     if (labels == null || labels.isEmpty()) {
       return labels;
     }
-    List<String> labelsList = Arrays.asList(labels.split(" "));
-    return Strings.toJson(labelsList);
+    return toJson(labels.split(" "));
   }
 
   private String buildGitRepositoryUrl() {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java

@@ -1,8 +1,8 @@
 package datadog.trace.civisibility.domain;
 
+import static datadog.json.JsonMapper.toJson;
 import static datadog.trace.api.civisibility.CIConstants.CI_VISIBILITY_INSTRUMENTATION_NAME;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
-import static datadog.trace.util.Strings.toJson;
 
 import datadog.trace.api.Config;
 import datadog.trace.api.DDTraceId;

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java

@@ -1,8 +1,8 @@
 package datadog.trace.civisibility.domain;
 
+import static datadog.json.JsonMapper.toJson;
 import static datadog.trace.api.civisibility.CIConstants.CI_VISIBILITY_INSTRUMENTATION_NAME;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
-import static datadog.trace.util.Strings.toJson;
 
 import datadog.trace.api.Config;
 import datadog.trace.api.civisibility.DDTestSuite;

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java

@@ -1,7 +1,6 @@
 package datadog.trace.civisibility.events;
 
-import static datadog.trace.util.Strings.toJson;
-
+import datadog.json.JsonWriter;
 import datadog.trace.api.DisableTestTrace;
 import datadog.trace.api.civisibility.DDTest;
 import datadog.trace.api.civisibility.DDTestSuite;
@@ -21,7 +20,6 @@
 import datadog.trace.civisibility.domain.TestSuiteImpl;
 import java.lang.reflect.Method;
 import java.util.Collection;
-import java.util.Collections;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.objectweb.asm.Type;
@@ -76,13 +74,23 @@ public void onTestSuiteStart(
       }
     }
     if (categories != null && !categories.isEmpty()) {
-      testSuite.setTag(
-          Tags.TEST_TRAITS, toJson(Collections.singletonMap("category", toJson(categories)), true));
+      testSuite.setTag(Tags.TEST_TRAITS, getTestTraits(categories));
     }
 
     inProgressTestSuites.put(descriptor, testSuite);
   }
 
+  private String getTestTraits(Collection<String> categories) {
+    try (JsonWriter writer = new JsonWriter()) {
+      writer.beginObject().name("category").beginArray();
+      for (String category : categories) {
+        writer.value(category);
+      }
+      writer.endArray().endObject();
+      return writer.toString();
+    }
+  }
+
   @Override
   public void onTestSuiteFinish(SuiteKey descriptor) {
     if (skipTrace(descriptor.getClass())) {
@@ -160,8 +168,7 @@ public void onTestStart(
       test.setTag(Tags.TEST_SOURCE_METHOD, testMethodName + Type.getMethodDescriptor(testMethod));
     }
     if (categories != null && !categories.isEmpty()) {
-      String json = toJson(Collections.singletonMap("category", toJson(categories)), true);
-      test.setTag(Tags.TEST_TRAITS, json);
+      test.setTag(Tags.TEST_TRAITS, getTestTraits(categories));
 
       for (String category : categories) {
         if (category.endsWith(InstrumentationBridge.ITR_UNSKIPPABLE_TAG)) {

dd-trace-core/build.gradle

@@ -61,6 +61,7 @@ dependencies {
   api project(':dd-trace-api')
   api project(':communication')
   api project(':internal-api')
+  implementation project(':components:json')
   implementation project(':utils:container-utils')
   implementation project(':utils:socket-utils')
   // for span exception debugging

dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1.java

@@ -2,6 +2,7 @@
 
 import static datadog.communication.http.OkHttpUtils.gzippedMsgpackRequestBodyOf;
 import static datadog.communication.http.OkHttpUtils.msgpackRequestBodyOf;
+import static datadog.json.JsonMapper.toJson;
 
 import datadog.communication.serialization.GrowableBuffer;
 import datadog.communication.serialization.Writable;
@@ -20,7 +21,6 @@
 import datadog.trace.core.CoreSpan;
 import datadog.trace.core.Metadata;
 import datadog.trace.core.MetadataConsumer;
-import datadog.trace.util.Strings;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
@@ -357,7 +357,7 @@ public void accept(Metadata metadata) {
           if (!(value instanceof Iterable)) {
             writable.writeObjectString(value, null);
           } else {
-            String serializedValue = Strings.toJson((Iterable<String>) value);
+            String serializedValue = toJson((Collection<String>) value);
             writable.writeString(serializedValue, null);
           }
         }