fix merge conflict

smola · smola · commit b41b3210d72a · 2025-03-25T18:13:36.000+01:00
diff --git a/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/config/AppSecConfigServiceImplSpecification.groovy b/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/config/AppSecConfigServiceImplSpecification.groovy
@@ -592,7 +592,6 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {
       listeners.savedFeaturesListener = it[2]
     }
     1 * poller.addConfigurationEndListener(_) >> { listeners.savedConfEndListener = it[0] }
-    1 * poller.addCapabilities(CAPABILITY_ASM_API_SECURITY_SAMPLE_RATE)
     1 * poller.addCapabilities(CAPABILITY_ASM_AUTO_USER_INSTRUM_MODE)
     1 * poller.addCapabilities(CAPABILITY_ASM_DD_RULES
       | CAPABILITY_ASM_IP_BLOCKING

Original file line number	Diff line number	Diff line change
`@@ -592,7 +592,6 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {`
`592`	`592`	`listeners.savedFeaturesListener = it[2]`
`593`	`593`	`}`
`594`	`594`	`1 * poller.addConfigurationEndListener(_) >> { listeners.savedConfEndListener = it[0] }`
`595`		`- 1 * poller.addCapabilities(CAPABILITY_ASM_API_SECURITY_SAMPLE_RATE)`
`596`	`595`	`1 * poller.addCapabilities(CAPABILITY_ASM_AUTO_USER_INSTRUM_MODE)`
`597`	`596`	`1 * poller.addCapabilities(CAPABILITY_ASM_DD_RULES`
`598`	`597`	`\| CAPABILITY_ASM_IP_BLOCKING`