apply pr suggestions

Author: ojproductions

dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/test/groovy/EventBridgeClientTest.groovy

@@ -1,7 +1,6 @@
 import datadog.trace.agent.test.InstrumentationSpecification
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.config.GeneralConfig
-import datadog.trace.api.config.TraceInstrumentationConfig
 import groovy.json.JsonSlurper
 import java.time.Duration
 import java.util.concurrent.CompletableFuture
@@ -498,7 +497,7 @@ class EventBridgeClientTest extends InstrumentationSpecification {
 
   def "datadog context is not injected when eventbridgeInjectDatadogAttribute is disabled"() {
     setup:
-    injectSysConfig(TraceInstrumentationConfig.EVENTBRIDGE_INJECT_DATADOG_ATTRIBUTE_ENABLED, "false")
+    injectSysConfig("eventbridge.inject.datadog.attribute.enabled", "false")
 
     when:
     TEST_WRITER.clear()

dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/test/groovy/SfnClientTest.groovy

@@ -3,7 +3,6 @@ import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
 import datadog.trace.agent.test.naming.VersionedNamingTestBase
 import datadog.trace.agent.test.utils.TraceUtils
 import datadog.trace.api.DDSpanTypes
-import datadog.trace.api.config.TraceInstrumentationConfig
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import groovy.json.JsonSlurper
 import java.time.Duration
@@ -118,7 +117,7 @@ abstract class SfnClientTest extends VersionedNamingTestBase {
 
   def "datadog context is not injected when SfnInjectDatadogAttribute is disabled"() {
     setup:
-    injectSysConfig(TraceInstrumentationConfig.SFN_INJECT_DATADOG_ATTRIBUTE_ENABLED, "false")
+    injectSysConfig("sfn.inject.datadog.attribute.enabled", "false")
 
     when:
     StartExecutionResponse response = sfnClient.startExecution { builder ->

dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/test/groovy/SnsClientTest.groovy

@@ -10,7 +10,6 @@ import datadog.trace.agent.test.utils.TraceUtils
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
 import datadog.trace.api.config.GeneralConfig
-import datadog.trace.api.config.TraceInstrumentationConfig
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.core.datastreams.StatsGroup
 import groovy.json.JsonSlurper
@@ -213,7 +212,7 @@ abstract class SnsClientTest extends VersionedNamingTestBase {
   def "datadog context is not injected when SnsInjectDatadogAttribute is disabled"() {
     setup:
     TEST_WRITER.clear()
-    injectSysConfig(TraceInstrumentationConfig.SNS_INJECT_DATADOG_ATTRIBUTE_ENABLED, "false")
+    injectSysConfig("sns.inject.datadog.attribute.enabled", "false")
 
     when:
     snsClient.publish(testTopicARN, 'sometext')

dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/test/groovy/SnsClientTest.groovy

@@ -3,7 +3,6 @@ import datadog.trace.agent.test.utils.TraceUtils
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
 import datadog.trace.api.config.GeneralConfig
-import datadog.trace.api.config.TraceInstrumentationConfig
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.core.datastreams.StatsGroup
 import datadog.trace.instrumentation.aws.ExpectedQueryParams
@@ -184,7 +183,7 @@ abstract class SnsClientTest extends VersionedNamingTestBase {
   def "datadog context is not injected when SnsInjectDatadogAttribute is disabled"() {
     setup:
     TEST_WRITER.clear()
-    injectSysConfig(TraceInstrumentationConfig.SNS_INJECT_DATADOG_ATTRIBUTE_ENABLED, "false")
+    injectSysConfig("sns.inject.datadog.attribute.enabled", "false")
 
     when:
     snsClient.publish { it.message("sometext").topicArn(testTopicARN)}

dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/groovy/SqsClientTest.groovy

@@ -20,7 +20,6 @@ import datadog.trace.api.DDSpanId
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
 import datadog.trace.api.config.GeneralConfig
-import datadog.trace.api.config.TraceInstrumentationConfig
 import datadog.trace.api.datastreams.DataStreamsTags
 import datadog.trace.api.naming.SpanNaming
 import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
@@ -191,7 +190,7 @@ abstract class SqsClientTest extends VersionedNamingTestBase {
 
   def "dadatog context is not injected if SqsInjectDatadogAttribute is disabled"() {
     setup:
-    injectSysConfig(TraceInstrumentationConfig.SQS_INJECT_DATADOG_ATTRIBUTE_ENABLED, "false")
+    injectSysConfig("sqs.inject.datadog.attribute.enabled", "false")
     def client = AmazonSQSClientBuilder.standard()
     .withEndpointConfiguration(endpoint)
     .withCredentials(credentialsProvider)

dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy

@@ -10,7 +10,6 @@ import datadog.trace.api.DDSpanId
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
 import datadog.trace.api.config.GeneralConfig
-import datadog.trace.api.config.TraceInstrumentationConfig
 import datadog.trace.api.naming.SpanNaming
 import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
@@ -191,7 +190,7 @@ abstract class SqsClientTest extends VersionedNamingTestBase {
 
   def "dadatog context is not injected if SqsInjectDatadogAttribute is disabled"() {
     setup:
-    injectSysConfig(TraceInstrumentationConfig.SQS_INJECT_DATADOG_ATTRIBUTE_ENABLED, "false")
+    injectSysConfig("sqs.inject.datadog.attribute.enabled", "false")
     def client = SqsClient.builder()
       .region(Region.EU_CENTRAL_1)
       .endpointOverride(endpoint)

dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java

@@ -194,14 +194,5 @@ public final class TraceInstrumentationConfig {
   public static final String SQS_BODY_PROPAGATION_ENABLED = "trace.sqs.body.propagation.enabled";
   public static final String ADD_SPAN_POINTERS = "add.span.pointers";
 
-  public static final String SFN_INJECT_DATADOG_ATTRIBUTE_ENABLED =
-      "sfn.inject.datadog.attribute.enabled";
-  public static final String SQS_INJECT_DATADOG_ATTRIBUTE_ENABLED =
-      "sqs.inject.datadog.attribute.enabled";
-  public static final String SNS_INJECT_DATADOG_ATTRIBUTE_ENABLED =
-      "sns.inject.datadog.attribute.enabled";
-  public static final String EVENTBRIDGE_INJECT_DATADOG_ATTRIBUTE_ENABLED =
-      "eventbridge.inject.datadog.attribute.enabled";
-
   private TraceInstrumentationConfig() {}
 }