pr changes

Author: zarirhamza

dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWS1ClientTest.groovy

@@ -469,8 +469,7 @@ abstract class AWS1ClientTest extends VersionedNamingTestBase {
     }
 
     cleanup:
-    // Clean up the environment variable
-    removeEnvConfig("AWS_LAMBDA_FUNCTION_NAME", false)
+
     if (jsonPointerStr != null) {
       jsonPointer.set(null)
     }

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

@@ -208,7 +208,7 @@ public AgentSpan onSdkRequest(
       }
     }
 
-    // Set peer.service based on environment for serverless functions
+    // Set peer.service based on Config for serverless functions
     if (Config.get().isAwsServerless()) {
       URI uri = httpRequest.getUri();
       String hostname = uri.getHost();

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

@@ -518,10 +518,6 @@ abstract class Aws2ClientTest extends VersionedNamingTestBase {
       }
     }
 
-    cleanup:
-    // Clean up the environment variable
-    removeEnvConfig("AWS_LAMBDA_FUNCTION_NAME", false)
-
     where:
     service    | operation      | method | path                  | builder                  | call                                                                                                              | body                                                                                                                               | requestId
     "S3"       | "CreateBucket" | "PUT"  | "/test-bucket"        | S3Client.builder()       | { c -> c.createBucket(CreateBucketRequest.builder().bucket("test-bucket").build()) }                              | ""                                                                                                                                 | "UNKNOWN"