Skip to content

Commit 49fd02e

Browse files
jandro996jandro996
committed
add new config property apm sampling enabled and move to _dd.p.ts
1 parent b9533be commit 49fd02e

File tree

41 files changed

+389
-266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+389
-266
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.datadog.iast.model.VulnerabilityBatch;
99
import com.datadog.iast.taint.TaintedObjects;
1010
import datadog.trace.api.Config;
11+
import datadog.trace.api.ProductTs;
1112
import datadog.trace.api.gateway.RequestContext;
1213
import datadog.trace.api.gateway.RequestContextSlot;
1314
import datadog.trace.api.internal.TraceSegment;
@@ -125,7 +126,7 @@ private VulnerabilityBatch getOrCreateVulnerabilityBatch(final AgentSpan span) {
125126
// TODO: We need to check if we can have an API with more fine-grained semantics on why traces
126127
// are kept.
127128
segment.setTagTop(Tags.ASM_KEEP, true);
128-
segment.setTagTop(Tags.PROPAGATED_APPSEC, true);
129+
segment.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTs.ASM);
129130
return batch;
130131
}
131132

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.datadog.iast.model.Vulnerability
66
import com.datadog.iast.model.VulnerabilityBatch
77
import com.datadog.iast.model.VulnerabilityType
88
import datadog.trace.api.Config
9+
import datadog.trace.api.ProductTs
910
import datadog.trace.api.gateway.RequestContext
1011
import datadog.trace.api.gateway.RequestContextSlot
1112
import datadog.trace.api.internal.TraceSegment
@@ -85,7 +86,7 @@ class ReporterTest extends DDSpecification {
8586
]
8687
}''', batch.toString(), true)
8788
1 * traceSegment.setTagTop('asm.keep', true)
88-
1 * traceSegment.setTagTop('_dd.p.appsec', true)
89+
1 * traceSegment.setTagTop('_dd.p.ts', ProductTs.ASM)
8990
1 * reqCtx.getOrCreateMetaStructTop('_dd.stack', _) >> { stackTraceBatch }
9091
assertStackTrace(stackTraceBatch, v)
9192
0 * _
@@ -135,7 +136,7 @@ class ReporterTest extends DDSpecification {
135136
]
136137
}''', batch.toString(), true)
137138
1 * traceSegment.setTagTop('asm.keep', true)
138-
1 * traceSegment.setTagTop('_dd.p.appsec', true)
139+
1 * traceSegment.setTagTop('_dd.p.ts', ProductTs.ASM)
139140
0 * _
140141
}
141142

@@ -206,7 +207,7 @@ class ReporterTest extends DDSpecification {
206207
]
207208
}''', batch.toString(), true)
208209
1 * traceSegment.setTagTop('asm.keep', true)
209-
1 * traceSegment.setTagTop('_dd.p.appsec', true)
210+
1 * traceSegment.setTagTop('_dd.p.ts', ProductTs.ASM)
210211
assertStackTrace(stackTraceBatch, [v1, v2] as Vulnerability[])
211212
0 * _
212213
}
@@ -331,7 +332,7 @@ class ReporterTest extends DDSpecification {
331332
1 * traceSegment.getDataTop('iast') >> null
332333
1 * traceSegment.setDataTop('iast', _ as VulnerabilityBatch)
333334
1 * traceSegment.setTagTop('asm.keep', true)
334-
1 * traceSegment.setTagTop('_dd.p.appsec', true)
335+
1 * traceSegment.setTagTop('_dd.p.ts', ProductTs.ASM)
335336
1 * traceSegment.setTagTop('_dd.iast.enabled', 1)
336337
1 * reqCtx.getOrCreateMetaStructTop('_dd.stack', _) >> new ConcurrentHashMap<>()
337338
0 * _

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.datadog.appsec.report.AppSecEvent;
2828
import com.datadog.appsec.report.AppSecEventWrapper;
2929
import datadog.trace.api.Config;
30+
import datadog.trace.api.ProductTs;
3031
import datadog.trace.api.UserIdCollectionMode;
3132
import datadog.trace.api.gateway.Events;
3233
import datadog.trace.api.gateway.Flow;
@@ -214,7 +215,7 @@ private Flow<Void> onUser(
214215

215216
// span with ASM data
216217
segment.setTagTop(Tags.ASM_KEEP, true);
217-
segment.setTagTop(Tags.PROPAGATED_APPSEC, true);
218+
segment.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTs.ASM);
218219

219220
// skip event if we have an SDK one
220221
if (mode != SDK) {
@@ -275,7 +276,7 @@ private Flow<Void> onLoginEvent(
275276

276277
// span with ASM data
277278
segment.setTagTop(Tags.ASM_KEEP, true);
278-
segment.setTagTop(Tags.PROPAGATED_APPSEC, true);
279+
segment.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTs.ASM);
279280

280281
// update span tags
281282
segment.setTagTop("appsec.events." + eventName + ".track", true, true);
@@ -786,7 +787,7 @@ private NoopFlow onRequestEnded(RequestContext ctx_, IGSpanInfo spanInfo) {
786787
if (!collectedEvents.isEmpty()) {
787788
// Set asm keep in case that root span was not available when events are detected
788789
traceSeg.setTagTop(Tags.ASM_KEEP, true);
789-
traceSeg.setTagTop(Tags.PROPAGATED_APPSEC, true);
790+
traceSeg.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTs.ASM);
790791
traceSeg.setTagTop("appsec.event", true);
791792
traceSeg.setTagTop("network.client.ip", ctx.getPeerAddress());
792793

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import datadog.communication.monitor.Monitoring;
2727
import datadog.trace.api.Config;
2828
import datadog.trace.api.ProductActivation;
29+
import datadog.trace.api.ProductTs;
2930
import datadog.trace.api.gateway.Flow;
3031
import datadog.trace.api.telemetry.LogCollector;
3132
import datadog.trace.api.telemetry.WafMetricCollector;
@@ -503,7 +504,7 @@ public void onDataAvailable(
503504
// If APM is disabled, inform downstream services that the current
504505
// distributed trace contains at least one ASM event and must inherit
505506
// the given force-keep priority
506-
activeSpan.getLocalRootSpan().setTag(Tags.PROPAGATED_APPSEC, true);
507+
activeSpan.getLocalRootSpan().setTag(Tags.PROPAGATED_TRACE_SOURCE, ProductTs.ASM);
507508
} else {
508509
// If active span is not available the ASK_KEEP tag will be set in the GatewayBridge
509510
// when the request ends

‎dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/GatewayBridgeSpecification.groovy

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import com.datadog.appsec.event.data.DataBundle
88
import com.datadog.appsec.event.data.KnownAddresses
99
import com.datadog.appsec.report.AppSecEvent
1010
import com.datadog.appsec.report.AppSecEventWrapper
11+
import datadog.trace.api.ProductTs
1112
import datadog.trace.api.UserIdCollectionMode
1213
import datadog.trace.api.appsec.LoginEventCallback
1314
import datadog.trace.api.function.TriConsumer
@@ -1112,7 +1113,7 @@ class GatewayBridgeSpecification extends DDSpecification {
11121113
1 * traceSegment.setTagTop('appsec.events.users.signup.track', true, true)
11131114
1 * traceSegment.setTagTop('appsec.events.users.signup', ['key1': 'value1', 'key2': 'value2'], true)
11141115
1 * traceSegment.setTagTop('asm.keep', true)
1115-
1 * traceSegment.setTagTop('_dd.p.appsec', true)
1116+
1 * traceSegment.setTagTop('_dd.p.ts', ProductTs.ASM)
11161117
1 * eventDispatcher.publishDataEvent(nonEmptyDsInfo, ctx.data, _ as DataBundle, _ as GatewayContext) >> { a, b, DataBundle db, GatewayContext gw ->
11171118
if (mode == SDK) {
11181119
assert db.get(KnownAddresses.USER_ID) == expectedUser
@@ -1151,7 +1152,7 @@ class GatewayBridgeSpecification extends DDSpecification {
11511152
1 * traceSegment.setTagTop('appsec.events.users.login.success.track', true, true)
11521153
1 * traceSegment.setTagTop('appsec.events.users.login.success', ['key1': 'value1', 'key2': 'value2'], true)
11531154
1 * traceSegment.setTagTop('asm.keep', true)
1154-
1 * traceSegment.setTagTop('_dd.p.appsec', true)
1155+
1 * traceSegment.setTagTop('_dd.p.ts', ProductTs.ASM)
11551156
1 * eventDispatcher.publishDataEvent(nonEmptyDsInfo, ctx.data, _ as DataBundle, _ as GatewayContext) >> { a, b, DataBundle db, GatewayContext gw ->
11561157
if (mode == SDK) {
11571158
assert db.get(KnownAddresses.USER_ID) == expectedUser
@@ -1192,7 +1193,7 @@ class GatewayBridgeSpecification extends DDSpecification {
11921193
1 * traceSegment.setTagTop('appsec.events.users.login.failure.usr.exists', false, true)
11931194
1 * traceSegment.setTagTop('appsec.events.users.login.failure', ['key1': 'value1', 'key2': 'value2'], true)
11941195
1 * traceSegment.setTagTop('asm.keep', true)
1195-
1 * traceSegment.setTagTop('_dd.p.appsec', true)
1196+
1 * traceSegment.setTagTop('_dd.p.ts', ProductTs.ASM)
11961197
1 * eventDispatcher.publishDataEvent(nonEmptyDsInfo, ctx.data, _ as DataBundle, _ as GatewayContext) >> { a, b, DataBundle db, GatewayContext gw ->
11971198
if (mode == SDK) {
11981199
assert db.get(KnownAddresses.USER_ID) == expectedUser
@@ -1221,7 +1222,7 @@ class GatewayBridgeSpecification extends DDSpecification {
12211222
1 * traceSegment.setTagTop('appsec.events.my.event.track', true, true)
12221223
1 * traceSegment.setTagTop('appsec.events.my.event', ['key1': 'value1', 'key2': 'value2'], true)
12231224
1 * traceSegment.setTagTop('asm.keep', true)
1224-
1 * traceSegment.setTagTop('_dd.p.appsec', true)
1225+
1 * traceSegment.setTagTop('_dd.p.ts', ProductTs.ASM)
12251226
0 * eventDispatcher.publishDataEvent
12261227
}
12271228

‎dd-smoke-tests/asm-standalone-billing/build.gradle renamed to ‎dd-smoke-tests/apm-tracing-disabled/build.gradle

File renamed without changes.

‎dd-smoke-tests/asm-standalone-billing/gradle.lockfile renamed to ‎dd-smoke-tests/apm-tracing-disabled/gradle.lockfile

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.smoketest.asmstandalonebilling;
1+
package datadog.smoketest.apmtracingdisabled;
22

33
import java.util.EnumSet;
44
import javax.servlet.ServletContext;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.smoketest.asmstandalonebilling;
1+
package datadog.smoketest.apmtracingdisabled;
22

33
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
44
import io.opentracing.Span;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.smoketest.asmstandalonebilling;
1+
package datadog.smoketest.apmtracingdisabled;
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package datadog.smoketest.asmstandalonebilling
1+
package datadog.smoketest.apmtracingdisabled
22

33
import datadog.smoketest.AbstractServerSmokeTest
44
import datadog.trace.api.sampling.PrioritySampling
55
import datadog.trace.test.agent.decoder.DecodedTrace
66

7-
abstract class AbstractAsmStandaloneBillingSmokeTest extends AbstractServerSmokeTest {
7+
abstract class AbstractApmTracingDisabledSmokeTest extends AbstractServerSmokeTest {
88

99
@Override
1010
File createTemporaryFile(int processIndex) {
@@ -67,7 +67,7 @@ abstract class AbstractAsmStandaloneBillingSmokeTest extends AbstractServerSmoke
6767
}
6868

6969
protected hasAppsecPropagationTag(DecodedTrace trace) {
70-
return trace.spans[0].meta['_dd.p.appsec'] == "1"
70+
return trace.spans[0].meta['_dd.p.ts'] == "02"
7171
}
7272

7373
protected hasApmDisabledTag(DecodedTrace trace) {

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
package datadog.smoketest.asmstandalonebilling
1+
package datadog.smoketest.apmtracingdisabled
22

33
import datadog.trace.api.sampling.PrioritySampling
44
import okhttp3.Request
55

6-
class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSmokeTest {
6+
class ApmTracingDisabledMatrixSmokeTest extends AbstractApmTracingDisabledSmokeTest {
77

8-
static final String STANDALONE_BILLING_SERVICE_NAME = "asm-standalone-billing-matrix-smoketest-app"
9-
static final String STANDALONE_BILLING_SERVICE_NAME_2 = "asm-standalone-billing-matrix-smoketest-app2"
8+
static final String APM_TRACING_DISABLED_SERVICE_NAME = "apm-tracing-disabled-matrix-smoketest-app"
9+
static final String APM_TRACING_DISABLED_SERVICE_NAME_2 = "apm-tracing-disabled-matrix-smoketest-app2"
1010
static final String APM_ENABLED_SERVICE_NAME = "apm-enabled-matrix-smoketest-app"
1111
static final String ASM_ENABLED_SERVICE_NAME = "asm-enabled-matrix-smoketest-app"
1212

13-
static final String[] STANDALONE_BILLING_PROPERTIES = [
14-
"-Ddd.experimental.appsec.standalone.enabled=true",
13+
static final String[] APM_TRACING_DISABLED_PROPERTIES = [
14+
"-Ddd.apm.tracing.enabled=false",
1515
"-Ddd.iast.enabled=true",
1616
"-Ddd.iast.detection.mode=FULL",
1717
"-Ddd.iast.debug.enabled=true",
1818
"-Ddd.trace.tracer.metrics.enabled=true",
19-
"-Ddd.service.name=${STANDALONE_BILLING_SERVICE_NAME}",
19+
"-Ddd.service.name=${APM_TRACING_DISABLED_SERVICE_NAME}",
2020
]
2121

22-
static final String[] STANDALONE_BILLING_PROPERTIES_2 = [
23-
"-Ddd.experimental.appsec.standalone.enabled=true",
22+
static final String[] APM_TRACING_DISABLED_PROPERTIES_2 = [
23+
"-Ddd.apm.tracing.enabled=false",
2424
"-Ddd.iast.enabled=true",
2525
"-Ddd.iast.detection.mode=FULL",
2626
"-Ddd.iast.debug.enabled=true",
2727
"-Ddd.trace.tracer.metrics.enabled=true",
28-
"-Ddd.service.name=${STANDALONE_BILLING_SERVICE_NAME_2}",
28+
"-Ddd.service.name=${APM_TRACING_DISABLED_SERVICE_NAME_2}",
2929
]
3030

3131
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
4646
ProcessBuilder createProcessBuilder(int processIndex) {
4747
switch (processIndex) {
4848
case 0:
49-
return createProcess(processIndex, STANDALONE_BILLING_PROPERTIES)
49+
return createProcess(processIndex, APM_TRACING_DISABLED_PROPERTIES)
5050
case 1:
5151
return createProcess(processIndex, APM_ENABLED_PROPERTIES)
5252
case 2:
5353
return createProcess(processIndex, ASM_ENABLED_PROPERTIES)
5454
case 3:
55-
return createProcess(processIndex, STANDALONE_BILLING_PROPERTIES_2)
55+
return createProcess(processIndex, APM_TRACING_DISABLED_PROPERTIES_2)
5656
default:
5757
throw new IllegalArgumentException("Invalid process index: ${processIndex}")
5858
}
@@ -82,7 +82,7 @@ class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSm
8282
!hasApmDisabledTag (upstreamTrace)
8383

8484
and:"No ASM events, resulting in the local sampling decision"
85-
def standAloneBillingTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME)
85+
def standAloneBillingTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME)
8686
isSampledBySampler(standAloneBillingTrace)
8787
!hasAppsecPropagationTag (standAloneBillingTrace)
8888
hasApmDisabledTag (standAloneBillingTrace)
@@ -118,7 +118,7 @@ class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSm
118118
!hasApmDisabledTag (upstreamTrace)
119119

120120
and:"ASM events"
121-
def standAloneBillingTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME)
121+
def standAloneBillingTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME)
122122
checkRootSpanPrioritySampling(standAloneBillingTrace, PrioritySampling.USER_KEEP)
123123
hasAppsecPropagationTag (standAloneBillingTrace)
124124
hasApmDisabledTag (standAloneBillingTrace)
@@ -154,7 +154,7 @@ class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSm
154154
!hasApmDisabledTag (upstreamTrace)
155155

156156
and:"No ASM events, resulting in the local sampling decision"
157-
def standAloneBillingTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME)
157+
def standAloneBillingTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME)
158158
isSampledBySampler(standAloneBillingTrace)
159159
!hasAppsecPropagationTag (standAloneBillingTrace)
160160
hasApmDisabledTag (standAloneBillingTrace)
@@ -184,13 +184,13 @@ class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSm
184184
waitForTraceCount(3)
185185

186186
and: "Upstream standalone ASM service having ASM events result in force keep and propagation of the tag"
187-
def upstreamTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME_2)
187+
def upstreamTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME_2)
188188
checkRootSpanPrioritySampling(upstreamTrace, PrioritySampling.USER_KEEP)
189189
hasAppsecPropagationTag (upstreamTrace)
190190
hasApmDisabledTag (upstreamTrace)
191191

192192
and:"standalone service must keep the local trace with the local sampling priority"
193-
def standAloneBillingTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME)
193+
def standAloneBillingTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME)
194194
checkRootSpanPrioritySampling(standAloneBillingTrace, PrioritySampling.USER_KEEP)
195195
hasAppsecPropagationTag (standAloneBillingTrace)
196196
hasApmDisabledTag (standAloneBillingTrace)
@@ -224,11 +224,11 @@ class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSm
224224
def upstreamTraceId = getServiceTrace(APM_ENABLED_SERVICE_NAME).spans[0].traceId
225225

226226
and: 'No ASM events, resulting in the local sampling decision'
227-
def standAloneBillingTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME)
227+
def standAloneBillingTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME)
228228
isSampledBySampler(standAloneBillingTrace)
229229
!hasAppsecPropagationTag (standAloneBillingTrace)
230230
hasApmDisabledTag (standAloneBillingTrace)
231-
def standAloneBillingTraceId = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME).spans[0].traceId
231+
def standAloneBillingTraceId = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME).spans[0].traceId
232232
upstreamTraceId == standAloneBillingTraceId //There is propagation
233233

234234
and: 'Propagation is stopped'
@@ -255,18 +255,18 @@ class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSm
255255
waitForTraceCount(3)
256256
257257
and: 'Upstream ASM events'
258-
def upstreamTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME_2)
258+
def upstreamTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME_2)
259259
checkRootSpanPrioritySampling(upstreamTrace, PrioritySampling.USER_KEEP)
260260
hasAppsecPropagationTag (upstreamTrace)
261261
hasApmDisabledTag (upstreamTrace)
262-
def upstreamTraceId = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME_2).spans[0].traceId
262+
def upstreamTraceId = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME_2).spans[0].traceId
263263
264264
and: 'No ASM events, resulting in the local sampling decision'
265-
def standAloneBillingTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME)
265+
def standAloneBillingTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME)
266266
checkRootSpanPrioritySampling(standAloneBillingTrace, PrioritySampling.USER_KEEP)
267267
hasAppsecPropagationTag (standAloneBillingTrace)
268268
hasApmDisabledTag (standAloneBillingTrace)
269-
def standAloneBillingTraceId = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME).spans[0].traceId
269+
def standAloneBillingTraceId = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME).spans[0].traceId
270270
upstreamTraceId == standAloneBillingTraceId //There is propagation
271271
272272
and: 'Default APM distributed tracing behavior with'
@@ -300,11 +300,11 @@ class AsmStandaloneBillingMatrixSmokeTest extends AbstractAsmStandaloneBillingSm
300300
def upstreamTraceId = getServiceTrace(APM_ENABLED_SERVICE_NAME).spans[0].traceId
301301
302302
and: 'ASM events, resulting in force keep and appsec propagation'
303-
def standAloneBillingTrace = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME)
303+
def standAloneBillingTrace = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME)
304304
checkRootSpanPrioritySampling(standAloneBillingTrace, PrioritySampling.USER_KEEP)
305305
hasAppsecPropagationTag (standAloneBillingTrace)
306306
hasApmDisabledTag (standAloneBillingTrace)
307-
def standAloneBillingTraceId = getServiceTrace(STANDALONE_BILLING_SERVICE_NAME).spans[0].traceId
307+
def standAloneBillingTraceId = getServiceTrace(APM_TRACING_DISABLED_SERVICE_NAME).spans[0].traceId
308308
upstreamTraceId == standAloneBillingTraceId //There is propagation
309309
310310
and: 'Default APM distributed tracing behavior with'

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
package datadog.smoketest.asmstandalonebilling
1+
package datadog.smoketest.apmtracingdisabled
22

33
import datadog.trace.api.sampling.PrioritySampling
44
import datadog.trace.test.util.Flaky
55
import groovy.json.JsonSlurper
66
import okhttp3.Request
77

88
@Flaky
9-
class AsmStandaloneBillingSamplingSmokeTest extends AbstractAsmStandaloneBillingSmokeTest {
9+
class ApmTracingDisabledSamplingSmokeTest extends AbstractApmTracingDisabledSmokeTest {
1010

1111
@Override
1212
ProcessBuilder createProcessBuilder(){
1313
final String[] processProperties = [
14-
"-Ddd.experimental.appsec.standalone.enabled=true",
14+
"-Ddd.apm.tracing.enabled=false",
1515
"-Ddd.iast.enabled=true",
1616
"-Ddd.appsec.enabled=true",
1717
"-Ddd.iast.detection.mode=FULL",
1818
"-Ddd.iast.debug.enabled=true",
19-
"-Ddd.service.name=asm-standalone-billing-sampling-spring-smoketest-app",
19+
"-Ddd.service.name=apm-tracing-disabled-sampling-spring-smoketest-app",
2020
]
2121
return createProcess(processProperties)
2222
}

0 commit comments

Comments
 (0)