Update Java Contract Tests

appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/v1/AwsSdkV1Test.java

@@ -76,6 +76,16 @@ protected String getBedrockAgentRuntimeSpanNamePrefix() {
     return "AWSBedrockAgentRuntime";
   }
 
+  @Override
+  protected String getSecretsManagerSpanNamePrefix() {
+    return "AWSSecretsManager";
+  }
+
+  @Override
+  protected String getStepFunctionsSpanNamePrefix() {
+    return "AWSStepFunctions";
+  }
+
   protected String getS3RpcServiceName() {
     return "Amazon S3";
   }
@@ -90,6 +100,16 @@ protected String getSqsRpcServiceName() {
     return "AmazonSQS";
   }
 
+  @Override
+  protected String getSecretsManagerRpcServiceName() {
+    return "AWSSecretsManager";
+  }
+
+  @Override
+  protected String getStepFunctionsRpcServiceName() {
+    return "AWSStepFunctions";
+  }
+
   protected String getKinesisRpcServiceName() {
     return "AmazonKinesis";
   }
@@ -235,4 +255,39 @@ 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();
+  }
 }

appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/v2/AwsSdkV2Test.java

@@ -75,6 +75,16 @@ protected String getBedrockAgentRuntimeSpanNamePrefix() {
     return "BedrockAgentRuntime";
   }
 
+  @Override
+  protected String getSecretsManagerSpanNamePrefix() {
+    return "SecretsManager";
+  }
+
+  @Override
+  protected String getStepFunctionsSpanNamePrefix() {
+    return "Sfn";
+  }
+
   @Override
   protected String getS3RpcServiceName() {
     return "S3";
@@ -114,6 +124,16 @@ protected String getBedrockAgentRuntimeRpcServiceName() {
     return "BedrockAgentRuntime";
   }
 
+  @Override
+  protected String getSecretsManagerRpcServiceName() {
+    return "SecretsManager";
+  }
+
+  @Override
+  protected String getStepFunctionsRpcServiceName() {
+    return "Sfn";
+  }
+
   @Test
   void testS3CreateBucket() throws Exception {
     doTestS3CreateBucket();
@@ -240,4 +260,39 @@ 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();
+  }
 }

appsignals-tests/contract-tests/src/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";
 

appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/utils/SemanticConventionsConstants.java

@@ -62,7 +62,11 @@ 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 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";
 
   // kafka
   public static final String MESSAGING_CLIENT_ID = "messaging.client_id";

appsignals-tests/images/aws-sdk/aws-sdk-v1/build.gradle.kts

@@ -37,6 +37,9 @@ dependencies {
   implementation("com.amazonaws:aws-java-sdk-bedrockagent")
   implementation("com.amazonaws:aws-java-sdk-bedrockruntime")
   implementation("com.amazonaws:aws-java-sdk-bedrockagentruntime")
+  implementation("com.amazonaws:aws-java-sdk-secretsmanager")
+  implementation("com.amazonaws:aws-java-sdk-iam")
+  implementation("com.amazonaws:aws-java-sdk-stepfunctions")
   implementation("commons-logging:commons-logging")
   implementation("com.linecorp.armeria:armeria")
   implementation("com.fasterxml.jackson.core:jackson-databind:2.13.3")