Revert "Log object key name to spans for AWS s3" (#6529)

Author: bm1549

dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java

@@ -106,7 +106,6 @@ public AgentSpan onSdkRequest(
 
     // S3
     request.getValueForField("Bucket", String.class).ifPresent(name -> setBucketName(span, name));
-    request.getValueForField("Key", String.class).ifPresent(key -> setObjectKey(span, key));
     request
         .getValueForField("StorageClass", String.class)
         .ifPresent(
@@ -216,10 +215,6 @@ private static void setBucketName(AgentSpan span, String name) {
     setPeerService(span, InstrumentationTags.AWS_BUCKET_NAME, name);
   }
 
-  private static void setObjectKey(AgentSpan span, String objectKey) {
-    span.setTag(InstrumentationTags.AWS_OBJECT_KEY, objectKey);
-  }
-
   private static void setQueueName(AgentSpan span, String name) {
     span.setTag(InstrumentationTags.AWS_QUEUE_NAME, name);
     span.setTag(InstrumentationTags.QUEUE_NAME, name);

dd-java-agent/instrumentation/aws-java-sdk-2.2/src/test/groovy/Aws2ClientTest.groovy

@@ -140,9 +140,6 @@ abstract class Aws2ClientTest extends VersionedNamingTestBase {
               if (operation == "PutObject") {
                 "aws.storage.class" "GLACIER"
               }
-              if (operation == "PutObject" || operation == "GetObject") {
-                "aws.object.key" "somekey"
-              }
               peerServiceFrom("aws.bucket.name")
               checkPeerService = true
             } else if (service == "Sqs" && operation == "CreateQueue") {
@@ -273,9 +270,6 @@ abstract class Aws2ClientTest extends VersionedNamingTestBase {
             if (service == "S3") {
               "aws.bucket.name" "somebucket"
               "bucketname" "somebucket"
-              if (operation == "PutObject" || operation == "GetObject") {
-                "aws.object.key" "somekey"
-              }
               peerServiceFrom("aws.bucket.name")
               checkPeerService = true
             } else if (service == "Sqs" && operation == "CreateQueue") {
@@ -401,7 +395,6 @@ abstract class Aws2ClientTest extends VersionedNamingTestBase {
             "aws.agent" "java-aws-sdk"
             "aws.bucket.name" "somebucket"
             "bucketname" "somebucket"
-            "aws.object.key" "somekey"
             errorTags SdkClientException, "Unable to execute HTTP request: Read timed out"
             peerServiceFrom("aws.bucket.name")
             defaultTags()

dd-java-agent/instrumentation/aws-java-sdk-2.2/src/test/groovy/LegacyAws2ClientForkedTest.groovy

@@ -130,9 +130,6 @@ class LegacyAws2ClientForkedTest extends AgentTestRunner {
               if (operation == "PutObject") {
                 "aws.storage.class" "GLACIER"
               }
-              if (operation == "PutObject" || operation == "GetObject") {
-                "aws.object.key" "somekey"
-              }
             } else if (service == "Sqs" && operation == "CreateQueue") {
               "aws.queue.name" "somequeue"
               "queuename" "somequeue"
@@ -268,9 +265,6 @@ class LegacyAws2ClientForkedTest extends AgentTestRunner {
             if (service == "S3") {
               "aws.bucket.name" "somebucket"
               "bucketname" "somebucket"
-              if (operation == "PutObject" || operation == "GetObject") {
-                "aws.object.key" "somekey"
-              }
             } else if (service == "Sqs" && operation == "CreateQueue") {
               "aws.queue.name" "somequeue"
               "queuename" "somequeue"
@@ -406,7 +400,6 @@ class LegacyAws2ClientForkedTest extends AgentTestRunner {
             "aws.agent" "java-aws-sdk"
             "aws.bucket.name" "somebucket"
             "bucketname" "somebucket"
-            "aws.object.key" "somekey"
             errorTags SdkClientException, "Unable to execute HTTP request: Read timed out"
             defaultTags()
           }

internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InstrumentationTags.java

@@ -22,7 +22,6 @@ public class InstrumentationTags {
   public static final String AWS_ENDPOINT = "aws.endpoint";
   public static final String AWS_BUCKET_NAME = "aws.bucket.name";
   public static final String BUCKET_NAME = "bucketname";
-  public static final String AWS_OBJECT_KEY = "aws.object.key";
   public static final String AWS_QUEUE_URL = "aws.queue.url";
 
   public static final String AWS_QUEUE_NAME = "aws.queue.name";