feat: Add unit tests for SNS, SecretsManager, and Lambda changes in V2 SDK

Author: yiyuan-he

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts

@@ -86,6 +86,7 @@ dependencies {
   testLibrary("software.amazon.awssdk:ses:2.2.0")
   testLibrary("software.amazon.awssdk:sfn:2.2.0")
   testLibrary("software.amazon.awssdk:secretsmanager:2.2.0")
+  testLibrary("software.amazon.awssdk:lambda:2.2.0")
 
   // last version that does not use json protocol
   latestDepTestLibrary("software.amazon.awssdk:sqs:2.21.17")

instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts

@@ -23,6 +23,7 @@ dependencies {
   testLibrary("software.amazon.awssdk:sns:2.2.0")
   testLibrary("software.amazon.awssdk:sfn:2.2.0")
   testLibrary("software.amazon.awssdk:secretsmanager:2.2.0")
+  testLibrary("software.amazon.awssdk:lambda:2.2.0")
 
   // last version that does not use json protocol
   latestDepTestLibrary("software.amazon.awssdk:sqs:2.21.17")

instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts

@@ -21,6 +21,7 @@ dependencies {
   testLibrary("software.amazon.awssdk:ses:2.2.0")
   testLibrary("software.amazon.awssdk:sfn:2.2.0")
   testLibrary("software.amazon.awssdk:secretsmanager:2.2.0")
+  testLibrary("software.amazon.awssdk:lambda:2.2.0")
 
   // last version that does not use json protocol
   latestDepTestLibrary("software.amazon.awssdk:sqs:2.21.17")

instrumentation/aws-sdk/aws-sdk-2.2/testing/build.gradle.kts

@@ -20,6 +20,8 @@ dependencies {
   compileOnly("software.amazon.awssdk:sns:2.2.0")
   compileOnly("software.amazon.awssdk:ses:2.2.0")
   compileOnly("software.amazon.awssdk:sfn:2.2.0")
+  compileOnly("software.amazon.awssdk:lambda:2.2.0")
+  compileOnly("software.amazon.awssdk:secretsmanager:2.2.0")
 
   // needed for SQS - using emq directly as localstack references emq v0.15.7 ie WITHOUT AWS trace header propagation
   implementation("org.elasticmq:elasticmq-rest-sqs_2.12:1.0.0")

instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy

@@ -36,8 +36,16 @@ import software.amazon.awssdk.services.sqs.model.SendMessageRequest
 import software.amazon.awssdk.services.sfn.SfnClient
 import software.amazon.awssdk.services.sfn.model.DescribeStateMachineRequest
 import software.amazon.awssdk.services.sfn.model.DescribeActivityRequest
+import software.amazon.awssdk.services.lambda.LambdaClient
+import software.amazon.awssdk.services.lambda.model.GetFunctionRequest
+import software.amazon.awssdk.services.lambda.model.GetEventSourceMappingRequest;
+import software.amazon.awssdk.services.sns.SnsClient;
+import software.amazon.awssdk.services.sns.model.PublishRequest;
+import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
+import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueRequest;
 import spock.lang.Unroll
 
+
 import java.time.Duration
 import java.util.concurrent.Future
 
@@ -138,6 +146,14 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest {
               "aws.stepfunctions.state_machine.arn" "stateMachineArn"
             } else if (service == "Sfn" && operation == "DescribeActivity") {
               "aws.stepfunctions.activity.arn" "activityArn"
+            } else if (service == "Lambda" && operation == "GetFunction") {
+              "aws.lambda.function.name" "functionName"
+            } else if (service == "Lambda" && operation == "GetEventSourceMapping") {
+              "aws.lambda.resource_mapping.id" "sourceEventId"
+            } else if (service == "Sns") {
+              "aws.sns.topic.arn" "topicArn"
+            } else if (service == "SecretsManager") {
+              "aws.secretsmanager.secret.arn" "someSecretArn"
             }
 
           }
@@ -187,6 +203,35 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest {
     "Sfn" | "DescribeActivity" | "POST" | "UNKNOWN" | SfnClient.builder()
     | { c -> c.describeActivity(DescribeActivityRequest.builder().activityArn("activityArn").build()) }
     | ""
+    "Lambda" | "GetFunction" | "GET" | "UNKNOWN" | LambdaClient.builder()
+    | { c -> c.getFunction(GetFunctionRequest.builder().functionName("functionName").build()) }
+    | ""
+    "Lambda" | "GetEventSourceMapping" | "GET" |"UNKNOWN" | LambdaClient.builder()
+    | { c -> c.getEventSourceMapping(GetEventSourceMappingRequest.builder().uuid("sourceEventId").build()) }
+    | ""
+    "Sns" | "Publish" | "POST" | "d74b8436-ae13-5ab4-a9ff-ce54dfea72a0" | SnsClient.builder()
+    | { c -> c.publish(PublishRequest.builder().topicArn("topicArn").message("message").build()) }
+    | """
+      <PublishResponse xmlns="https://sns.amazonaws.com/doc/2010-03-31/">
+          <PublishResult>
+              <MessageId>567910cd-659e-55d4-8ccb-5aaf14679dc0</MessageId>
+          </PublishResult>
+          <ResponseMetadata>
+              <RequestId>d74b8436-ae13-5ab4-a9ff-ce54dfea72a0</RequestId>
+          </ResponseMetadata>
+      </PublishResponse>
+    """
+    "SecretsManager" | "GetSecretValue" | "POST" | "UNKNOWN" | SecretsManagerClient.builder()
+    | { c -> c.getSecretValue(GetSecretValueRequest.builder().secretId("someSecret1").build()) }
+    | """
+      {
+        "ARN":"someSecretArn",
+        "CreatedDate":1.523477145713E9,
+        "Name":"MyTestDatabaseSecret",
+        "SecretString":"{\\n  \\"username\\":\\"david\\",\\n  \\"password\\":\\"EXAMPLE-PASSWORD\\"\\n}\\n",
+        "VersionId":"EXAMPLE1-90ab-cdef-fedc-ba987SECRET1"
+      }
+    """
   }
 
   def "send #operation async request with builder #builder.class.getName() mocked response"() {