move is_user_provided_service tag to payload header

Author: daniel-mohedano

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

@@ -3,7 +3,6 @@
 import static datadog.trace.api.civisibility.CIConstants.CI_VISIBILITY_INSTRUMENTATION_NAME;
 
 import datadog.trace.api.Config;
-import datadog.trace.api.DDTags;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityCountMetric;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector;
 import datadog.trace.api.civisibility.telemetry.tag.EventType;
@@ -73,8 +72,6 @@ public AbstractTestModule(
     span.setTag(Tags.TEST_MODULE_ID, span.getSpanId());
     span.setTag(Tags.TEST_SESSION_ID, span.getTraceId());
 
-    span.setTag(DDTags.TEST_IS_USER_PROVIDED_SERVICE, config.isServiceNameSetByUser());
-
     // setting status to skip initially,
     // as we do not know in advance whether the module will have any children
     span.setTag(Tags.TEST_STATUS, TestStatus.skip);

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

@@ -4,7 +4,6 @@
 import static datadog.trace.api.civisibility.CIConstants.CI_VISIBILITY_INSTRUMENTATION_NAME;
 
 import datadog.trace.api.Config;
-import datadog.trace.api.DDTags;
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.IdGenerationStrategy;
 import datadog.trace.api.civisibility.CIConstants;
@@ -98,8 +97,6 @@ public AbstractTestSession(
     span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_TEST_SESSION);
     span.setTag(Tags.TEST_SESSION_ID, span.getTraceId());
 
-    span.setTag(DDTags.TEST_IS_USER_PROVIDED_SERVICE, config.isServiceNameSetByUser());
-
     // setting status to skip initially,
     // as we do not know in advance whether the session will have any children
     span.setTag(Tags.TEST_STATUS, TestStatus.skip);

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

@@ -5,7 +5,6 @@
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
 
 import datadog.trace.api.Config;
-import datadog.trace.api.DDTags;
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.civisibility.CIConstants;
 import datadog.trace.api.civisibility.DDTest;
@@ -125,8 +124,6 @@ public TestImpl(
     span.setTag(Tags.TEST_MODULE_ID, moduleSpanContext.getSpanId());
     span.setTag(Tags.TEST_SESSION_ID, moduleSpanContext.getTraceId());
 
-    span.setTag(DDTags.TEST_IS_USER_PROVIDED_SERVICE, config.isServiceNameSetByUser());
-
     span.setTag(Tags.TEST_STATUS, TestStatus.pass);
 
     if (testClass != null && !testClass.getName().equals(testSuiteName)) {

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

@@ -5,7 +5,6 @@
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
 
 import datadog.trace.api.Config;
-import datadog.trace.api.DDTags;
 import datadog.trace.api.civisibility.DDTestSuite;
 import datadog.trace.api.civisibility.coverage.CoverageStore;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityCountMetric;
@@ -114,8 +113,6 @@ public TestSuiteImpl(
     span.setTag(Tags.TEST_MODULE_ID, moduleSpanContext.getSpanId());
     span.setTag(Tags.TEST_SESSION_ID, moduleSpanContext.getTraceId());
 
-    span.setTag(DDTags.TEST_IS_USER_PROVIDED_SERVICE, config.isServiceNameSetByUser());
-
     // setting status to skip initially,
     // as we do not know in advance whether the suite will have any children
     span.setTag(Tags.TEST_STATUS, TestStatus.skip);

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy

@@ -3,7 +3,6 @@ package datadog.trace.civisibility.domain
 import datadog.trace.agent.test.asserts.ListWriterAssert
 import datadog.trace.api.Config
 import datadog.trace.api.DDSpanTypes
-import datadog.trace.api.DDTags
 import datadog.trace.api.DDTraceId
 import datadog.trace.api.civisibility.config.TestIdentifier
 import datadog.trace.api.civisibility.coverage.CoverageProbes
@@ -21,7 +20,7 @@ import datadog.trace.civisibility.test.ExecutionResults
 import datadog.trace.civisibility.utils.SpanUtils
 
 class TestImplTest extends SpanWriterTest {
-  def "test span is generated and tags populated"() {
+  def "test span is generated"() {
     setup:
     def test = givenATest()
 
@@ -34,9 +33,6 @@ class TestImplTest extends SpanWriterTest {
         span(0) {
           parent()
           spanType DDSpanTypes.TEST
-          tags(false) {
-            "$DDTags.TEST_IS_USER_PROVIDED_SERVICE" true
-          }
         }
       }
     })
@@ -75,10 +71,10 @@ class TestImplTest extends SpanWriterTest {
     def coverageStore = Mock(CoverageStore)
     coverageStore.getProbes() >> coverageProbes
 
-    def coveageStoreFactory = Stub(CoverageStore.Factory)
-    coveageStoreFactory.create((TestIdentifier) _) >> coverageStore
+    def coverageStoreFactory = Stub(CoverageStore.Factory)
+    coverageStoreFactory.create((TestIdentifier) _) >> coverageStore
 
-    def test = givenATest(coveageStoreFactory)
+    def test = givenATest(coverageStoreFactory)
 
     when:
     test.setSkipReason("skipped")
@@ -88,7 +84,8 @@ class TestImplTest extends SpanWriterTest {
     0 * coverageStore.report(_, _, _)
   }
 
-  private TestImpl givenATest(CoverageStore.Factory coverageStoreFactory = new NoOpCoverageStore.Factory()) {
+  private TestImpl givenATest(
+    CoverageStore.Factory coverageStoreFactory = new NoOpCoverageStore.Factory()) {
 
     def traceId = Stub(DDTraceId)
     traceId.toLong() >> 123
@@ -98,10 +95,8 @@ class TestImplTest extends SpanWriterTest {
     moduleSpanContext.getTraceId() >> traceId
     def suiteId = 789
 
-    def config = Spy(Config.get())
-    config.isServiceNameSetByUser() >> true
-
     def testFramework = TestFrameworkInstrumentation.OTHER
+    def config = Config.get()
     def metricCollector = Stub(CiVisibilityMetricCollectorImpl)
     def executionResults = Stub(ExecutionResults)
     def testDecorator = new TestDecoratorImpl("component", "session-name", "test-command", [:])

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy

@@ -3,7 +3,6 @@ package datadog.trace.civisibility.domain
 import datadog.trace.agent.test.asserts.ListWriterAssert
 import datadog.trace.api.Config
 import datadog.trace.api.DDSpanTypes
-import datadog.trace.api.DDTags
 import datadog.trace.api.DDTraceId
 import datadog.trace.api.civisibility.coverage.CoverageStore
 import datadog.trace.api.civisibility.coverage.NoOpCoverageStore
@@ -35,7 +34,6 @@ class TestSuiteImplTest extends SpanWriterTest {
             "$Tags.TEST_CODEOWNERS" "[\"@global-owner1\",\"@global-owner2\"]"
             "$Tags.TEST_SOURCE_START" 10
             "$Tags.TEST_SOURCE_END" 20
-            "$DDTags.TEST_IS_USER_PROVIDED_SERVICE" true
           }
         }
       }
@@ -44,18 +42,17 @@ class TestSuiteImplTest extends SpanWriterTest {
 
   private static final class MyClass {}
 
-  private TestSuiteImpl givenATestSuite(CoverageStore.Factory coverageStoreFactory = new NoOpCoverageStore.Factory()) {
+  private TestSuiteImpl givenATestSuite(
+    CoverageStore.Factory coverageStoreFactory = new NoOpCoverageStore.Factory()) {
     def traceId = Stub(DDTraceId)
     traceId.toLong() >> 123
 
     def moduleSpanContext = Stub(AgentSpanContext)
     moduleSpanContext.getSpanId() >> 456
     moduleSpanContext.getTraceId() >> traceId
 
-    def config = Spy(Config.get())
-    config.isServiceNameSetByUser() >> true
-
     def testFramework = TestFrameworkInstrumentation.OTHER
+    def config = Config.get()
     def metricCollector = Stub(CiVisibilityMetricCollectorImpl)
     def executionResults = Stub(ExecutionResults)
     def testDecorator = new TestDecoratorImpl("component", "session-name", "test-command", [:])

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy

@@ -1,9 +1,6 @@
 package datadog.trace.civisibility.domain.headless
 
-import datadog.trace.agent.test.asserts.ListWriterAssert
 import datadog.trace.api.Config
-import datadog.trace.api.DDSpanTypes
-import datadog.trace.api.DDTags
 import datadog.trace.api.civisibility.config.TestIdentifier
 import datadog.trace.api.civisibility.config.TestSourceData
 import datadog.trace.api.civisibility.coverage.CoverageStore
@@ -19,26 +16,6 @@ import datadog.trace.civisibility.source.SourcePathResolver
 import datadog.trace.civisibility.test.ExecutionStrategy
 
 class HeadlessTestModuleTest extends SpanWriterTest {
-  def "test module span is created and tags populated"() {
-    setup:
-    def headlessTestModule = givenAHeadlessTestModule()
-
-    when:
-    headlessTestModule.end(null)
-
-    then:
-    ListWriterAssert.assertTraces(TEST_WRITER, 1, false, {
-      trace(1) {
-        span(0) {
-          spanType DDSpanTypes.TEST_MODULE_END
-          tags(false) {
-            "$DDTags.TEST_IS_USER_PROVIDED_SERVICE" true
-          }
-        }
-      }
-    })
-  }
-
   def "test total retries limit is applied across test cases"() {
     given:
     def headlessTestModule = givenAHeadlessTestModule()
@@ -75,7 +52,6 @@ class HeadlessTestModuleTest extends SpanWriterTest {
     // this counts all executions of a test case (first attempt is counted too)
     config.getCiVisibilityTotalFlakyRetryCount() >> 2
     // this counts retries across all tests (first attempt is not a retry, so it is not counted)
-    config.isServiceNameSetByUser() >> true
 
     def executionStrategy = new ExecutionStrategy(config, executionSettings, Stub(SourcePathResolver), Stub(LinesResolver))
 

dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityApmProtocolInterceptor.java

@@ -2,6 +2,7 @@
 
 import datadog.trace.api.Config;
 import datadog.trace.api.DDSpanTypes;
+import datadog.trace.api.DDTags;
 import datadog.trace.api.civisibility.CiVisibilityWellKnownTags;
 import datadog.trace.api.interceptor.AbstractTraceInterceptor;
 import datadog.trace.api.interceptor.MutableSpan;
@@ -47,6 +48,9 @@ public Collection<? extends MutableSpan> onTraceComplete(
         span.setTag(Tags.OS_ARCHITECTURE, wellKnownTags.getOsArch().toString());
         span.setTag(Tags.OS_PLATFORM, wellKnownTags.getOsPlatform().toString());
         span.setTag(Tags.OS_VERSION, wellKnownTags.getOsVersion().toString());
+        span.setTag(
+            DDTags.TEST_IS_USER_PROVIDED_SERVICE,
+            wellKnownTags.getIsUserProvidedService().toString());
       }
     }
     return filteredTrace;

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

@@ -92,9 +92,6 @@ public void map(List<? extends CoreSpan<?>> trace, Writable writable) {
       Number testSuiteId = span.getTag(Tags.TEST_SUITE_ID);
       span.removeTag(Tags.TEST_SUITE_ID);
 
-      Boolean testIsUserProvidedService = span.getTag(DDTags.TEST_IS_USER_PROVIDED_SERVICE);
-      span.removeTag(DDTags.TEST_IS_USER_PROVIDED_SERVICE);
-
       String itrCorrelationId = span.getTag(Tags.ITR_CORRELATION_ID);
       span.removeTag(Tags.ITR_CORRELATION_ID);
 
@@ -108,9 +105,6 @@ public void map(List<? extends CoreSpan<?>> trace, Writable writable) {
       if (testSuiteId != null) {
         topLevelTagsCount++;
       }
-      if (testIsUserProvidedService != null) {
-        topLevelTagsCount++;
-      }
       if (itrCorrelationId != null) {
         topLevelTagsCount++;
       }
@@ -202,10 +196,6 @@ public void map(List<? extends CoreSpan<?>> trace, Writable writable) {
         writable.writeUTF8(TEST_SUITE_ID);
         writable.writeObject(testSuiteId, null);
       }
-      if (testIsUserProvidedService != null) {
-        writable.writeUTF8(TEST_IS_USER_PROVIDED_SERVICE);
-        writable.writeObject(testIsUserProvidedService, null);
-      }
       if (itrCorrelationId != null) {
         writable.writeUTF8(ITR_CORRELATION_ID);
         writable.writeObjectString(itrCorrelationId, null);
@@ -253,7 +243,7 @@ private void writeHeader() {
     headerWriter.startMap(1);
     /* 2,1 */
     headerWriter.writeUTF8(METADATA_ASTERISK);
-    headerWriter.startMap(9);
+    headerWriter.startMap(10);
     /* 2,1,1 */
     headerWriter.writeUTF8(ENV);
     headerWriter.writeUTF8(wellKnownTags.getEnv());
@@ -281,6 +271,9 @@ private void writeHeader() {
     /* 2,1,9 */
     headerWriter.writeUTF8(OS_VERSION);
     headerWriter.writeUTF8(wellKnownTags.getOsVersion());
+    /* 2,1,10 */
+    headerWriter.writeUTF8(TEST_IS_USER_PROVIDED_SERVICE);
+    headerWriter.writeUTF8(wellKnownTags.getIsUserProvidedService());
     /* 3  */
     headerWriter.writeUTF8(EVENTS);
     headerWriter.startArray(eventCount);