add step functions activity contract tests

Author: yiyuan-he

appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/base/AwsSdkBaseTest.java

@@ -2381,4 +2381,41 @@ protected void doTestStepFunctionsDescribeStateMachine() throws Exception {
         cloudformationIdentifier,
         0.0);
   }
+
+  protected void doTestStepFunctionsDescribeActivity() throws Exception {
+    appClient.get("/sfn/describeactivity/test-activity").aggregate().join();
+    var traces = mockCollectorClient.getTraces();
+    var metrics = mockCollectorClient.getMetrics(
+        Set.of(
+            AppSignalsConstants.ERROR_METRIC,
+            AppSignalsConstants.FAULT_METRIC,
+            AppSignalsConstants.LATENCY_METRIC));
+
+    var localService = getApplicationOtelServiceName();
+    var localOperation = "GET /sfn/describeactivity/:name";
+    var type = "AWS::StepFunctions::Activity";
+    var identifier = "test-activity";
+    var cloudformationIdentifier = "arn:aws:states:us-west-2:000000000000:activity:test-activity";
+
+    assertSpanClientAttributes(
+        traces,
+        stepFunctionsSpanName("DescribeActivity"),
+        getStepFunctionsRpcServiceName(),
+        localService,
+        localOperation,
+        getStepFunctionsServiceName(),
+        "DescribeActivity",
+        type,
+        identifier,
+        cloudformationIdentifier,
+        "localstack",
+        4566,
+        "http://localstack:4566",
+        200,
+        List.of(
+            assertAttribute(
+                SemanticConventionsConstants.AWS_ACTIVITY_ARN,
+                "arn:aws:states:us-west-2:000000000000:activity:test-activity")));
+
+  }
 }

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

@@ -265,4 +265,9 @@ void testSecretsManagerDescribeSecret() throws Exception {
   void testStepFunctionsDescribeStateMachine() throws Exception {
     doTestStepFunctionsDescribeStateMachine();
   }
+
+  @Test
+  void testStepFunctionsDescribeActivity() throws Exception {
+    doTestStepFunctionsDescribeActivity();
+  }
 }

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

@@ -270,4 +270,9 @@ void testSecretsManagerDescribeSecret() throws Exception {
   void testStepFunctionsDescribeStateMachine() throws Exception {
     doTestStepFunctionsDescribeStateMachine();
   }
+
+  @Test
+  void testStepFunctionsDescribeActivity() throws Exception {
+    doTestStepFunctionsDescribeActivity();
+  }
 }

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

@@ -66,6 +66,7 @@ public class SemanticConventionsConstants {
   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/src/main/java/com/amazon/sampleapp/App.java

@@ -700,14 +700,18 @@ private static void setupStepFunctions() {
 
     var sfnName = "test-state-machine";
     String existingStateMachineArn = null;
-    var listRequest = new ListStateMachinesRequest();
-    var listResponse = stepFunctionsClient.listStateMachines(listRequest);
-    existingStateMachineArn =
-        listResponse.getStateMachines().stream()
-            .filter(machine -> machine.getName().equals(sfnName))
-            .findFirst()
-            .map(StateMachineListItem::getStateMachineArn)
-            .orElse(null);
+    try {
+      var listRequest = new ListStateMachinesRequest();
+      var listResponse = stepFunctionsClient.listStateMachines(listRequest);
+      existingStateMachineArn =
+          listResponse.getStateMachines().stream()
+              .filter(machine -> machine.getName().equals(sfnName))
+              .findFirst()
+              .map(StateMachineListItem::getStateMachineArn)
+              .orElse(null);
+    } catch (Exception e) {
+      logger.error("Error listing state machines", e);
+    }
 
     if (existingStateMachineArn != null) {
       logger.info("State machine already exists, skipping creation");
@@ -774,15 +778,48 @@ private static void setupStepFunctions() {
       existingStateMachineArn = createResponse.getStateMachineArn();
     }
 
+    var activityName = "test-activity";
+    String existingActivityArn = null;
+
+    // List existing activities
+    try {
+      var listRequest = new ListActivitiesRequest();
+      var listResponse = stepFunctionsClient.listActivities(listRequest);
+      existingActivityArn = listResponse.getActivities().stream()
+          .filter(activity -> activity.getName().equals(activityName))
+          .findFirst()
+          .map(ActivityListItem::getActivityArn)
+          .orElse(null);
+    } catch (Exception e) {
+      logger.error("Error listing activities", e);
+    }
+
+    if (existingActivityArn != null) {
+      logger.info("Activity already exists, skipping creation");
+    } else {
+      logger.info("Activity not found, creating a new one");
+      var createRequest = new CreateActivityRequest().withName(activityName);
+      var createResponse = stepFunctionsClient.createActivity(createRequest);
+      existingActivityArn = createResponse.getActivityArn();
+    }
+
     String finalExistingStateMachineArn = existingStateMachineArn;
     get(
         "/sfn/describestatemachine/:name",
         (req, res) -> {
-          var name = req.params(":name");
           var describeRequest =
               new DescribeStateMachineRequest().withStateMachineArn(finalExistingStateMachineArn);
           stepFunctionsClient.describeStateMachine(describeRequest);
           return "";
         });
+
+    String finalExistingActivityArn = existingActivityArn;
+    get(
+        "/sfn/describeactivity/:name",
+        (req, res) -> {
+          var describeRequest = new DescribeActivityRequest().withActivityArn(finalExistingActivityArn);
+          stepFunctionsClient.describeActivity(describeRequest);
+          return "";
+        });
   }
 }

appsignals-tests/images/aws-sdk/aws-sdk-v2/src/main/java/com/amazon/sampleapp/App.java

@@ -737,7 +737,7 @@ private static void setupStepFunctions() {
               .map(StateMachineListItem::stateMachineArn)
               .orElse(null);
     } catch (Exception e) {
-      logger.error("Error listing secrets", e);
+      logger.error("Error listing state machines", e);
     }
 
     if (existingStateMachineArn != null) {
@@ -809,17 +809,48 @@ private static void setupStepFunctions() {
       existingStateMachineArn = sfnClient.createStateMachine(sfnRequest).stateMachineArn();
     }
 
+    var activityName = "test-activity";
+    String existingActivityArn = null;
+
+    try {
+      var listRequest = ListActivitiesRequest.builder().build();
+      var listResponse = sfnClient.listActivities(listRequest);
+      existingActivityArn = listResponse.activities().stream()
+          .filter(activity -> activity.name().equals(activityName))
+          .findFirst()
+          .map(ActivityListItem::activityArn)
+          .orElse(null);
+    } catch (Exception e) {
+      logger.error("Error listing activities", e);
+    }
+
+    if (existingActivityArn != null) {
+      logger.info("Activity already exists, skipping creation");
+    } else {
+      logger.info("Activity not found, creating a new one");
+      var createRequest = CreateActivityRequest.builder().name(activityName).build();
+      existingActivityArn = sfnClient.createActivity(createRequest).activityArn();
+    }
+
     String finalExistingStateMachineArn = existingStateMachineArn;
     get(
         "/sfn/describestatemachine/:name",
         (req, res) -> {
-          var name = req.params(":name");
           var describeRequest =
               DescribeStateMachineRequest.builder()
                   .stateMachineArn(finalExistingStateMachineArn)
                   .build();
           sfnClient.describeStateMachine(describeRequest);
           return "";
         });
+
+    String finalExistingActivityArn = existingActivityArn;
+    get(
+        "/sfn/describeactivity/:name",
+        (req, res) -> {
+          var describeRequest = DescribeActivityRequest.builder().activityArn(finalExistingActivityArn).build();
+          sfnClient.describeActivity(describeRequest);
+          return "";
+        });
   }
 }