Move to _dd.p.ts and refactor all the tests

dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java

@@ -8,6 +8,7 @@
 import com.datadog.iast.model.VulnerabilityBatch;
 import com.datadog.iast.taint.TaintedObjects;
 import datadog.trace.api.Config;
+import datadog.trace.api.ProductTs;
 import datadog.trace.api.gateway.RequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
 import datadog.trace.api.internal.TraceSegment;
@@ -125,7 +126,7 @@ private VulnerabilityBatch getOrCreateVulnerabilityBatch(final AgentSpan span) {
       // TODO: We need to check if we can have an API with more fine-grained semantics on why traces
       // are kept.
       segment.setTagTop(Tags.ASM_KEEP, true);
-      segment.setTagTop(Tags.PROPAGATED_APPSEC, true);
+      segment.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTs.ASM);
       return batch;
     }
 

dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/ReporterTest.groovy

@@ -6,6 +6,7 @@ import com.datadog.iast.model.Vulnerability
 import com.datadog.iast.model.VulnerabilityBatch
 import com.datadog.iast.model.VulnerabilityType
 import datadog.trace.api.Config
+import datadog.trace.api.ProductTs
 import datadog.trace.api.gateway.RequestContext
 import datadog.trace.api.gateway.RequestContextSlot
 import datadog.trace.api.internal.TraceSegment
@@ -85,7 +86,7 @@ class ReporterTest extends DDSpecification {
       ]
     }''', batch.toString(), true)
     1 * traceSegment.setTagTop('asm.keep', true)
-    1 * traceSegment.setTagTop('_dd.p.appsec', true)
+    1 * traceSegment.setTagTop('_dd.p.ts', ProductTs.ASM)
     1 * reqCtx.getOrCreateMetaStructTop('_dd.stack', _)  >> { stackTraceBatch }
     assertStackTrace(stackTraceBatch, v)
     0 * _
@@ -135,7 +136,7 @@ class ReporterTest extends DDSpecification {
       ]
     }''', batch.toString(), true)
     1 * traceSegment.setTagTop('asm.keep', true)
-    1 * traceSegment.setTagTop('_dd.p.appsec', true)
+    1 * traceSegment.setTagTop('_dd.p.ts', ProductTs.ASM)
     0 * _
   }
 
@@ -206,7 +207,7 @@ class ReporterTest extends DDSpecification {
       ]
     }''', batch.toString(), true)
     1 * traceSegment.setTagTop('asm.keep', true)
-    1 * traceSegment.setTagTop('_dd.p.appsec', true)
+    1 * traceSegment.setTagTop('_dd.p.ts', ProductTs.ASM)
     assertStackTrace(stackTraceBatch, [v1, v2] as Vulnerability[])
     0 * _
   }
@@ -331,7 +332,7 @@ class ReporterTest extends DDSpecification {
     1 * traceSegment.getDataTop('iast') >> null
     1 * traceSegment.setDataTop('iast', _ as VulnerabilityBatch)
     1 * traceSegment.setTagTop('asm.keep', true)
-    1 * traceSegment.setTagTop('_dd.p.appsec', true)
+    1 * traceSegment.setTagTop('_dd.p.ts', ProductTs.ASM)
     1 * traceSegment.setTagTop('_dd.iast.enabled', 1)
     1 * reqCtx.getOrCreateMetaStructTop('_dd.stack', _) >> new ConcurrentHashMap<>()
     0 * _

dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java

@@ -27,6 +27,7 @@
 import com.datadog.appsec.report.AppSecEvent;
 import com.datadog.appsec.report.AppSecEventWrapper;
 import datadog.trace.api.Config;
+import datadog.trace.api.ProductTs;
 import datadog.trace.api.UserIdCollectionMode;
 import datadog.trace.api.gateway.Events;
 import datadog.trace.api.gateway.Flow;
@@ -190,7 +191,7 @@ private Flow<Void> onUser(
 
     // span with ASM data
     segment.setTagTop(Tags.ASM_KEEP, true);
-    segment.setTagTop(Tags.PROPAGATED_APPSEC, true);
+    segment.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTs.ASM);
 
     // skip event if we have an SDK one
     if (mode != SDK) {
@@ -251,7 +252,7 @@ private Flow<Void> onLoginEvent(
 
     // span with ASM data
     segment.setTagTop(Tags.ASM_KEEP, true);
-    segment.setTagTop(Tags.PROPAGATED_APPSEC, true);
+    segment.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTs.ASM);
 
     // update span tags
     segment.setTagTop("appsec.events." + eventName + ".track", true, true);
@@ -762,7 +763,7 @@ private NoopFlow onRequestEnded(RequestContext ctx_, IGSpanInfo spanInfo) {
       if (!collectedEvents.isEmpty()) {
         // Set asm keep in case that root span was not available when events are detected
         traceSeg.setTagTop(Tags.ASM_KEEP, true);
-        traceSeg.setTagTop(Tags.PROPAGATED_APPSEC, true);
+        traceSeg.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTs.ASM);
         traceSeg.setTagTop("appsec.event", true);
         traceSeg.setTagTop("network.client.ip", ctx.getPeerAddress());
 

dd-java-agent/appsec/src/main/java/com/datadog/appsec/powerwaf/PowerWAFModule.java

@@ -26,6 +26,7 @@
 import datadog.communication.monitor.Monitoring;
 import datadog.trace.api.Config;
 import datadog.trace.api.ProductActivation;
+import datadog.trace.api.ProductTs;
 import datadog.trace.api.gateway.Flow;
 import datadog.trace.api.telemetry.LogCollector;
 import datadog.trace.api.telemetry.WafMetricCollector;
@@ -494,7 +495,7 @@ public void onDataAvailable(
             // If APM is disabled, inform downstream services that the current
             // distributed trace contains at least one ASM event and must inherit
             // the given force-keep priority
-            activeSpan.getLocalRootSpan().setTag(Tags.PROPAGATED_APPSEC, true);
+            activeSpan.getLocalRootSpan().setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTs.ASM);
           } else {
             // If active span is not available the ASK_KEEP tag will be set in the GatewayBridge
             // when the request ends

dd-smoke-tests/asm-standalone-billing/src/main/java/datadog/smoketest/asmstandalonebilling/AppConfig.java → dd-smoke-tests/apm-tracing-disabled/src/main/java/datadog/smoketest/apmtracingdisabled/AppConfig.java

@@ -1,4 +1,4 @@
-package datadog.smoketest.asmstandalonebilling;
+package datadog.smoketest.apmtracingdisabled;
 
 import java.util.EnumSet;
 import javax.servlet.ServletContext;

dd-smoke-tests/asm-standalone-billing/src/main/java/datadog/smoketest/asmstandalonebilling/Controller.java → dd-smoke-tests/apm-tracing-disabled/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java

@@ -1,4 +1,4 @@
-package datadog.smoketest.asmstandalonebilling;
+package datadog.smoketest.apmtracingdisabled;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.opentracing.Span;

dd-smoke-tests/asm-standalone-billing/src/main/java/datadog/smoketest/asmstandalonebilling/SpringbootApplication.java → dd-smoke-tests/apm-tracing-disabled/src/main/java/datadog/smoketest/apmtracingdisabled/SpringbootApplication.java

@@ -1,4 +1,4 @@
-package datadog.smoketest.asmstandalonebilling;
+package datadog.smoketest.apmtracingdisabled;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

dd-smoke-tests/asm-standalone-billing/src/test/groovy/datadog/smoketest/asmstandalonebilling/AbstractAsmStandaloneBillingSmokeTest.groovy → dd-smoke-tests/apm-tracing-disabled/src/test/groovy/datadog/smoketest/apmtracingdisabled/AbstractApmTracingDisabledSmokeTest.groovy

@@ -1,10 +1,10 @@
-package datadog.smoketest.asmstandalonebilling
+package datadog.smoketest.apmtracingdisabled
 
 import datadog.smoketest.AbstractServerSmokeTest
 import datadog.trace.api.sampling.PrioritySampling
 import datadog.trace.test.agent.decoder.DecodedTrace
 
-abstract class AbstractAsmStandaloneBillingSmokeTest extends AbstractServerSmokeTest {
+abstract class AbstractApmTracingDisabledSmokeTest extends AbstractServerSmokeTest {
 
   @Override
   File createTemporaryFile(int processIndex) {
@@ -67,7 +67,7 @@ abstract class AbstractAsmStandaloneBillingSmokeTest extends AbstractServerSmoke
   }
 
   protected hasAppsecPropagationTag(DecodedTrace trace) {
-    return trace.spans[0].meta['_dd.p.appsec'] == "1"
+    return trace.spans[0].meta['_dd.p.ts'] == "02"
   }
 
   protected hasApmDisabledTag(DecodedTrace trace) {

dd-smoke-tests/asm-standalone-billing/src/test/groovy/datadog/smoketest/asmstandalonebilling/AsmStandaloneBillingMatrixSmokeTest.groovy → dd-smoke-tests/apm-tracing-disabled/src/test/groovy/datadog/smoketest/apmtracingdisabled/ApmTracingDisabledMatrixSmokeTest.groovy

@@ -1,31 +1,31 @@
-package datadog.smoketest.asmstandalonebilling
+package datadog.smoketest.apmtracingdisabled
 
 import datadog.trace.api.sampling.PrioritySampling
 import okhttp3.Request
 
-class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSmokeTest {
+class ApmTracingDisabledMatrixSmokeTest extends AbstractApmTracingDisabledSmokeTest {
 
-  static final String STANDALONE_BILLING_SERVICE_NAME = "asm-standalone-billing-matrix-smoketest-app"
-  static final String STANDALONE_BILLING_SERVICE_NAME_2 = "asm-standalone-billing-matrix-smoketest-app2"
+  static final String APM_TRACING_DISABLED_SERVICE_NAME = "apm-tracing-disabled-matrix-smoketest-app"
+  static final String APM_TRACING_DISABLED_SERVICE_NAME_2 = "apm-tracing-disabled-matrix-smoketest-app2"
   static final String APM_ENABLED_SERVICE_NAME = "apm-enabled-matrix-smoketest-app"
   static final String ASM_ENABLED_SERVICE_NAME = "asm-enabled-matrix-smoketest-app"
 
-  static final String[] STANDALONE_BILLING_PROPERTIES = [
-    "-Ddd.experimental.appsec.standalone.enabled=true",
+  static final String[] APM_TRACING_DISABLED_PROPERTIES = [
+    "-Ddd.apm.tracing.enabled=false",
     "-Ddd.iast.enabled=true",
     "-Ddd.iast.detection.mode=FULL",
     "-Ddd.iast.debug.enabled=true",
     "-Ddd.trace.tracer.metrics.enabled=true",
-    "-Ddd.service.name=${STANDALONE_BILLING_SERVICE_NAME}",
+    "-Ddd.service.name=${APM_TRACING_DISABLED_SERVICE_NAME}",
   ]
 
-  static final String[] STANDALONE_BILLING_PROPERTIES_2 = [
-    "-Ddd.experimental.appsec.standalone.enabled=true",
+  static final String[] APM_TRACING_DISABLED_PROPERTIES_2 = [
+    "-Ddd.apm.tracing.enabled=false",
     "-Ddd.iast.enabled=true",
     "-Ddd.iast.detection.mode=FULL",
     "-Ddd.iast.debug.enabled=true",
     "-Ddd.trace.tracer.metrics.enabled=true",
-    "-Ddd.service.name=${STANDALONE_BILLING_SERVICE_NAME_2}",
+    "-Ddd.service.name=${APM_TRACING_DISABLED_SERVICE_NAME_2}",
   ]
 
   static final String[] APM_ENABLED_PROPERTIES = ["-Ddd.service.name=${APM_ENABLED_SERVICE_NAME}", "-Ddd.trace.tracer.metrics.enabled=true",]
@@ -46,13 +46,13 @@ class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSm
   ProcessBuilder createProcessBuilder(int processIndex) {
     switch (processIndex) {
       case 0:
-        return createProcess(processIndex, STANDALONE_BILLING_PROPERTIES)
+        return createProcess(processIndex, APM_TRACING_DISABLED_PROPERTIES)
       case 1:
         return createProcess(processIndex, APM_ENABLED_PROPERTIES)
       case 2:
         return createProcess(processIndex, ASM_ENABLED_PROPERTIES)
       case 3:
-        return createProcess(processIndex, STANDALONE_BILLING_PROPERTIES_2)
+        return createProcess(processIndex, APM_TRACING_DISABLED_PROPERTIES_2)
       default:
         throw new IllegalArgumentException("Invalid process index: ${processIndex}")
     }
@@ -82,7 +82,7 @@ class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSm
     !hasApmDisabledTag (upstreamTrace)
 
     and:"No ASM events, resulting in the local sampling decision"
-    def standAloneBillingTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME)
+    def standAloneBillingTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME)
     isSampledBySampler(standAloneBillingTrace)
     !hasAppsecPropagationTag (standAloneBillingTrace)
     hasApmDisabledTag (standAloneBillingTrace)
@@ -118,7 +118,7 @@ class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSm
     !hasApmDisabledTag (upstreamTrace)
 
     and:"ASM events"
-    def standAloneBillingTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME)
+    def standAloneBillingTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME)
     checkRootSpanPrioritySampling(standAloneBillingTrace, PrioritySampling.USER_KEEP)
     hasAppsecPropagationTag (standAloneBillingTrace)
     hasApmDisabledTag (standAloneBillingTrace)
@@ -154,7 +154,7 @@ class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSm
     !hasApmDisabledTag (upstreamTrace)
 
     and:"No ASM events, resulting in the local sampling decision"
-    def standAloneBillingTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME)
+    def standAloneBillingTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME)
     isSampledBySampler(standAloneBillingTrace)
     !hasAppsecPropagationTag (standAloneBillingTrace)
     hasApmDisabledTag (standAloneBillingTrace)
@@ -184,13 +184,13 @@ class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSm
     waitForTraceCount(3)
 
     and: "Upstream standalone ASM service having ASM events result in force keep and propagation of the tag"
-    def upstreamTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME_2)
+    def upstreamTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME_2)
     checkRootSpanPrioritySampling(upstreamTrace, PrioritySampling.USER_KEEP)
     hasAppsecPropagationTag (upstreamTrace)
     hasApmDisabledTag (upstreamTrace)
 
     and:"standalone service must keep the local trace with the local sampling priority"
-    def standAloneBillingTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME)
+    def standAloneBillingTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME)
     checkRootSpanPrioritySampling(standAloneBillingTrace, PrioritySampling.USER_KEEP)
     hasAppsecPropagationTag (standAloneBillingTrace)
     hasApmDisabledTag (standAloneBillingTrace)
@@ -224,11 +224,11 @@ class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSm
     def upstreamTraceId = getServiceTrace(APM_ENABLED_SERVICE_NAME).spans[0].traceId
 
     and: 'No ASM events, resulting in the local sampling decision'
-    def standAloneBillingTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME)
+    def standAloneBillingTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME)
     isSampledBySampler(standAloneBillingTrace)
     !hasAppsecPropagationTag (standAloneBillingTrace)
     hasApmDisabledTag (standAloneBillingTrace)
-    def standAloneBillingTraceId = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME).spans[0].traceId
+    def standAloneBillingTraceId = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME).spans[0].traceId
     upstreamTraceId == standAloneBillingTraceId //There is propagation
 
     and: 'Propagation is stopped'
@@ -255,18 +255,18 @@ class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSm
     waitForTraceCount(3)
 
     and: 'Upstream ASM events'
-    def upstreamTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME_2)
+    def upstreamTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME_2)
     checkRootSpanPrioritySampling(upstreamTrace, PrioritySampling.USER_KEEP)
     hasAppsecPropagationTag (upstreamTrace)
     hasApmDisabledTag (upstreamTrace)
-    def upstreamTraceId = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME_2).spans[0].traceId
+    def upstreamTraceId = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME_2).spans[0].traceId
 
     and: 'No ASM events, resulting in the local sampling decision'
-    def standAloneBillingTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME)
+    def standAloneBillingTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME)
     checkRootSpanPrioritySampling(standAloneBillingTrace, PrioritySampling.USER_KEEP)
     hasAppsecPropagationTag (standAloneBillingTrace)
     hasApmDisabledTag (standAloneBillingTrace)
-    def standAloneBillingTraceId = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME).spans[0].traceId
+    def standAloneBillingTraceId = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME).spans[0].traceId
     upstreamTraceId == standAloneBillingTraceId //There is propagation
 
     and: 'Default APM distributed tracing behavior with'
@@ -300,11 +300,11 @@ class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSm
     def upstreamTraceId = getServiceTrace(APM_ENABLED_SERVICE_NAME).spans[0].traceId
 
     and: 'ASM events, resulting in force keep and appsec propagation'
-    def standAloneBillingTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME)
+    def standAloneBillingTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME)
     checkRootSpanPrioritySampling(standAloneBillingTrace, PrioritySampling.USER_KEEP)
     hasAppsecPropagationTag (standAloneBillingTrace)
     hasApmDisabledTag (standAloneBillingTrace)
-    def standAloneBillingTraceId = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME).spans[0].traceId
+    def standAloneBillingTraceId = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME).spans[0].traceId
     upstreamTraceId == standAloneBillingTraceId //There is propagation
 
     and: 'Default APM distributed tracing behavior with'

dd-smoke-tests/asm-standalone-billing/src/test/groovy/datadog/smoketest/asmstandalonebilling/AsmStandaloneBillingSamplingSmokeTest.groovy → dd-smoke-tests/apm-tracing-disabled/src/test/groovy/datadog/smoketest/apmtracingdisabled/ApmTracingDisabledSamplingSmokeTest.groovy

@@ -1,22 +1,22 @@
-package datadog.smoketest.asmstandalonebilling
+package datadog.smoketest.apmtracingdisabled
 
 import datadog.trace.api.sampling.PrioritySampling
 import datadog.trace.test.util.Flaky
 import groovy.json.JsonSlurper
 import okhttp3.Request
 
 @Flaky
-class AsmStandaloneBillingSamplingSmokeTest extends AbstractAsmStandaloneBillingSmokeTest {
+class ApmTracingDisabledSamplingSmokeTest extends AbstractApmTracingDisabledSmokeTest {
 
   @Override
   ProcessBuilder createProcessBuilder(){
     final String[] processProperties = [
-      "-Ddd.experimental.appsec.standalone.enabled=true",
+      "-Ddd.apm.tracing.enabled=false",
       "-Ddd.iast.enabled=true",
       "-Ddd.appsec.enabled=true",
       "-Ddd.iast.detection.mode=FULL",
       "-Ddd.iast.debug.enabled=true",
-      "-Ddd.service.name=asm-standalone-billing-sampling-spring-smoketest-app",
+      "-Ddd.service.name=apm-tracing-disabled-sampling-spring-smoketest-app",
     ]
     return createProcess(processProperties)
   }

dd-smoke-tests/asm-standalone-billing/src/test/groovy/datadog/smoketest/asmstandalonebilling/AsmStandaloneBillingSmokeTest.groovy → dd-smoke-tests/apm-tracing-disabled/src/test/groovy/datadog/smoketest/apmtracingdisabled/ApmTracingDisabledSmokeTest.groovy

@@ -1,20 +1,20 @@
-package datadog.smoketest.asmstandalonebilling
+package datadog.smoketest.apmtracingdisabled
 
 import okhttp3.Request
 
-class AsmStandaloneBillingSmokeTest extends AbstractAsmStandaloneBillingSmokeTest {
+class ApmTracingDisabledSmokeTest extends AbstractApmTracingDisabledSmokeTest {
 
-  private static final String STANDALONE_BILLING_SERVICE_NAME = "asm-standalone-billing-smoketest-app"
+  private static final String APM_TRACING_DISABLED_SERVICE_NAME = "asm-standalone-billing-smoketest-app"
   private static final String APM_ENABLED_SERVICE_NAME = "apm-enabled-smoketest-app"
 
-  static final String[] STANDALONE_BILLING_PROPERTIES = [
-    "-Ddd.experimental.appsec.standalone.enabled=true",
+  static final String[] APM_TRACING_DISABLED_PROPERTIES = [
+    "-Ddd.apm.tracing.enabled=false",
     "-Ddd.iast.enabled=true",
     "-Ddd.iast.detection.mode=FULL",
     "-Ddd.iast.debug.enabled=true",
     "-Ddd.appsec.enabled=true",
     "-Ddd.trace.tracer.metrics.enabled=true",
-    "-Ddd.service.name=${STANDALONE_BILLING_SERVICE_NAME}",
+    "-Ddd.service.name=${APM_TRACING_DISABLED_SERVICE_NAME}",
   ]
 
   static final String[] APM_ENABLED_PROPERTIES = ["-Ddd.service.name=${APM_ENABLED_SERVICE_NAME}", "-Ddd.trace.tracer.metrics.enabled=true",]
@@ -26,7 +26,7 @@ class AsmStandaloneBillingSmokeTest extends AbstractAsmStandaloneBillingSmokeTes
   @Override
   ProcessBuilder createProcessBuilder(int processIndex) {
     if(processIndex == 0){
-      return createProcess(processIndex, STANDALONE_BILLING_PROPERTIES)
+      return createProcess(processIndex, APM_TRACING_DISABLED_PROPERTIES)
     }
     return createProcess(processIndex, APM_ENABLED_PROPERTIES)
   }
@@ -46,7 +46,7 @@ class AsmStandaloneBillingSmokeTest extends AbstractAsmStandaloneBillingSmokeTes
     response1.successful
     response2.successful
     waitForTraceCount(2)
-    hasApmDisabledTag(getServiceTrace(STANDALONE_BILLING_SERVICE_NAME))
+    hasApmDisabledTag(getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME))
     !hasApmDisabledTag(getServiceTrace(APM_ENABLED_SERVICE_NAME))
   }
 
@@ -68,7 +68,7 @@ class AsmStandaloneBillingSmokeTest extends AbstractAsmStandaloneBillingSmokeTes
     isLogPresent { it.contains('datadog.trace.agent.common.metrics.MetricsAggregatorFactory - tracer metrics disabled') }
   }
 
-  void 'test _dd.p.appsec propagation for appsec event'() {
+  void 'test _dd.p.ts propagation for appsec event'() {
     setup:
     final downstreamUrl = "http://localhost:${httpPorts[1]}/rest-api/greetings"
     final url = localUrl + "url=${downstreamUrl}"
@@ -77,7 +77,7 @@ class AsmStandaloneBillingSmokeTest extends AbstractAsmStandaloneBillingSmokeTes
     when: "Request to an endpoint that triggers ASM events and then calls another endpoint"
     final response1 = client.newCall(request).execute()
 
-    then: "Both traces should have a root span with _dd.p.appsec=1 tag"
+    then: "Both traces should have a root span with _dd.p.ts=02 tag"
     response1.successful
     waitForTraceCount(2)
     assert traces.size() == 2