Merge branch 'main' into test_upgrade_only

aws-observability · Dec 6, 2024 · f552f25 · f552f25
2 parents 4dd58f0 + eae57c5
commit f552f25
Show file tree

Hide file tree

Showing 15 changed files with 2,153 additions and 7 deletions.
diff --git a/...c/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/base/AwsSdkBaseTest.java b/...c/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/base/AwsSdkBaseTest.java
diff --git a/...s/src/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/v1/AwsSdkV1Test.java b/...s/src/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/v1/AwsSdkV1Test.java
@@ -76,6 +76,21 @@ protected String getBedrockAgentRuntimeSpanNamePrefix() {
     return "AWSBedrockAgentRuntime";
   }
 
+  @Override
+  protected String getSecretsManagerSpanNamePrefix() {
+    return "AWSSecretsManager";
+  }
+
+  @Override
+  protected String getStepFunctionsSpanNamePrefix() {
+    return "AWSStepFunctions";
+  }
+
+  @Override
+  protected String getSnsSpanNamePrefix() {
+    return "SNS";
+  }
+
   protected String getS3RpcServiceName() {
     return "Amazon S3";
   }
@@ -90,6 +105,21 @@ protected String getSqsRpcServiceName() {
     return "AmazonSQS";
   }
 
+  @Override
+  protected String getSecretsManagerRpcServiceName() {
+    return "AWSSecretsManager";
+  }
+
+  @Override
+  protected String getStepFunctionsRpcServiceName() {
+    return "AWSStepFunctions";
+  }
+
+  @Override
+  protected String getSnsRpcServiceName() {
+    return "AmazonSNS";
+  }
+
   protected String getKinesisRpcServiceName() {
     return "AmazonKinesis";
   }
@@ -260,4 +290,54 @@ void testBedrockAgentRuntimeAgentId() {
   void testBedrockAgentRuntimeKnowledgeBaseId() {
     doTestBedrockAgentRuntimeKnowledgeBaseId();
   }
+
+  @Test
+  void testSecretsManagerDescribeSecret() throws Exception {
+    doTestSecretsManagerDescribeSecret();
+  }
+
+  @Test
+  void testSecretsManagerError() throws Exception {
+    doTestSecretsManagerError();
+  }
+
+  @Test
+  void testSecretsManagerFault() throws Exception {
+    doTestSecretsManagerFault();
+  }
+
+  @Test
+  void testStepFunctionsDescribeStateMachine() throws Exception {
+    doTestStepFunctionsDescribeStateMachine();
+  }
+
+  @Test
+  void testStepFunctionsDescribeActivity() throws Exception {
+    doTestStepFunctionsDescribeActivity();
+  }
+
+  @Test
+  void testStepFunctionsError() throws Exception {
+    doTestStepFunctionsError();
+  }
+
+  @Test
+  void testStepFunctionsFault() throws Exception {
+    doTestStepFunctionsFault();
+  }
+
+  @Test
+  void testSnsGetTopicAttributes() throws Exception {
+    doTestSnsGetTopicAttributes();
+  }
+
+  @Test
+  void testSnsError() throws Exception {
+    doTestStepFunctionsError();
+  }
+
+  @Test
+  void testSnsFault() throws Exception {
+    doTestStepFunctionsFault();
+  }
 }
diff --git a/...s/src/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/v2/AwsSdkV2Test.java b/...s/src/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/v2/AwsSdkV2Test.java
@@ -75,6 +75,21 @@ protected String getBedrockAgentRuntimeSpanNamePrefix() {
     return "BedrockAgentRuntime";
   }
 
+  @Override
+  protected String getSecretsManagerSpanNamePrefix() {
+    return "SecretsManager";
+  }
+
+  @Override
+  protected String getStepFunctionsSpanNamePrefix() {
+    return "Sfn";
+  }
+
+  @Override
+  protected String getSnsSpanNamePrefix() {
+    return "Sns";
+  }
+
   @Override
   protected String getS3RpcServiceName() {
     return "S3";
@@ -114,6 +129,21 @@ protected String getBedrockAgentRuntimeRpcServiceName() {
     return "BedrockAgentRuntime";
   }
 
+  @Override
+  protected String getSecretsManagerRpcServiceName() {
+    return "SecretsManager";
+  }
+
+  @Override
+  protected String getStepFunctionsRpcServiceName() {
+    return "Sfn";
+  }
+
+  @Override
+  protected String getSnsRpcServiceName() {
+    return "Sns";
+  }
+
   @Test
   void testS3CreateBucket() throws Exception {
     doTestS3CreateBucket();
@@ -259,10 +289,58 @@ void testBedrockAgentRuntimeAgentId() {
     doTestBedrockAgentRuntimeAgentId();
   }
 
-  // TODO: Enable testBedrockAgentRuntimeKnowledgeBaseId test after KnowledgeBaseId is supported in
-  // OTEL BedrockAgentRuntime instrumentation
   @Test
   void testBedrockAgentRuntimeKnowledgeBaseId() {
     doTestBedrockAgentRuntimeKnowledgeBaseId();
   }
+
+  @Test
+  void testSecretsManagerDescribeSecret() throws Exception {
+    doTestSecretsManagerDescribeSecret();
+  }
+
+  @Test
+  void testSecretsManagerError() throws Exception {
+    doTestSecretsManagerError();
+  }
+
+  @Test
+  void testSecretsManagerFault() throws Exception {
+    doTestSecretsManagerFault();
+  }
+
+  @Test
+  void testStepFunctionsDescribeStateMachine() throws Exception {
+    doTestStepFunctionsDescribeStateMachine();
+  }
+
+  @Test
+  void testStepFunctionsDescribeActivity() throws Exception {
+    doTestStepFunctionsDescribeActivity();
+  }
+
+  @Test
+  void testStepFunctionsError() throws Exception {
+    doTestStepFunctionsError();
+  }
+
+  @Test
+  void testStepFunctionsFault() throws Exception {
+    doTestStepFunctionsFault();
+  }
+
+  @Test
+  void testSnsGetTopicAttributes() throws Exception {
+    doTestSnsGetTopicAttributes();
+  }
+
+  @Test
+  void testSnsError() throws Exception {
+    doTestStepFunctionsError();
+  }
+
+  @Test
+  void testSnsFault() throws Exception {
+    doTestStepFunctionsFault();
+  }
 }
diff --git a/...rc/test/java/software/amazon/opentelemetry/appsignals/test/utils/AppSignalsConstants.java b/...rc/test/java/software/amazon/opentelemetry/appsignals/test/utils/AppSignalsConstants.java
@@ -31,6 +31,8 @@ public class AppSignalsConstants {
   public static final String AWS_REMOTE_OPERATION = "aws.remote.operation";
   public static final String AWS_REMOTE_RESOURCE_TYPE = "aws.remote.resource.type";
   public static final String AWS_REMOTE_RESOURCE_IDENTIFIER = "aws.remote.resource.identifier";
+  public static final String AWS_CLOUDFORMATION_PRIMARY_IDENTIFIER =
+      "aws.remote.resource.cfn.primary.identifier";
   public static final String AWS_SPAN_KIND = "aws.span.kind";
   public static final String AWS_REMOTE_DB_USER = "aws.remote.db.user";
 

diff --git a/...ava/software/amazon/opentelemetry/appsignals/test/utils/SemanticConventionsConstants.java b/...ava/software/amazon/opentelemetry/appsignals/test/utils/SemanticConventionsConstants.java
@@ -62,13 +62,18 @@ public class SemanticConventionsConstants {
   public static final String AWS_DATA_SOURCE_ID = "aws.bedrock.data_source.id";
   public static final String AWS_AGENT_ID = "aws.bedrock.agent.id";
   public static final String AWS_GUARDRAIL_ID = "aws.bedrock.guardrail.id";
+  public static final String AWS_GUARDRAIL_ARN = "aws.bedrock.guardrail.arn";
   public static final String GEN_AI_REQUEST_MODEL = "gen_ai.request.model";
   public static final String GEN_AI_REQUEST_MAX_TOKENS = "gen_ai.request.max_tokens";
   public static final String GEN_AI_REQUEST_TEMPERATURE = "gen_ai.request.temperature";
   public static final String GEN_AI_REQUEST_TOP_P = "gen_ai.request.top_p";
   public static final String GEN_AI_RESPONSE_FINISH_REASONS = "gen_ai.response.finish_reasons";
   public static final String GEN_AI_USAGE_INPUT_TOKENS = "gen_ai.usage.input_tokens";
   public static final String GEN_AI_USAGE_OUTPUT_TOKENS = "gen_ai.usage.output_tokens";
+  public static final String AWS_SECRET_ARN = "aws.secretsmanager.secret.arn";
+  public static final String AWS_STATE_MACHINE_ARN = "aws.stepfunctions.state_machine.arn";
+  public static final String AWS_ACTIVITY_ARN = "aws.stepfunctions.activity.arn";
+  public static final String AWS_TOPIC_ARN = "aws.sns.topic.arn";
 
   // kafka
   public static final String MESSAGING_CLIENT_ID = "messaging.client_id";

diff --git a/appsignals-tests/images/aws-sdk/aws-sdk-v1/build.gradle.kts b/appsignals-tests/images/aws-sdk/aws-sdk-v1/build.gradle.kts
@@ -33,6 +33,10 @@ dependencies {
   implementation("com.amazonaws:aws-java-sdk-dynamodb")
   implementation("com.amazonaws:aws-java-sdk-sqs")
   implementation("com.amazonaws:aws-java-sdk-kinesis")
+  implementation("com.amazonaws:aws-java-sdk-secretsmanager")
+  implementation("com.amazonaws:aws-java-sdk-iam")
+  implementation("com.amazonaws:aws-java-sdk-stepfunctions")
+  implementation("com.amazonaws:aws-java-sdk-sns")
   implementation("com.amazonaws:aws-java-sdk-bedrock")
   implementation("com.amazonaws:aws-java-sdk-bedrockagent")
   implementation("com.amazonaws:aws-java-sdk-bedrockruntime")