Adding aws_sdk_2 trace suffic

aws-observability · Nov 15, 2023 · 87a5d64 · 87a5d64
1 parent f7aa645
commit 87a5d64
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/validator/src/main/java/com/amazon/aoc/fileconfigs/PredefinedExpectedTemplate.java b/validator/src/main/java/com/amazon/aoc/fileconfigs/PredefinedExpectedTemplate.java
@@ -60,6 +60,8 @@ public enum PredefinedExpectedTemplate implements FileConfig {
       "/expected-data-template/springboot/springbootAppExpectedHTTPTrace.mustache"),
   SPRINGBOOT_SDK_AWSSDK_EXPECTED_TRACE(
       "/expected-data-template/springboot/springbootAppExpectedAWSSDKTrace.mustache"),
+  SPRINGBOOT_SDK_AWSSDK_2_EXPECTED_TRACE(
+          "/expected-data-template/springboot/springbootAppExpectedAWSSDK2Trace.mustache"),
   GO_SDK_HTTP_EXPECTED_TRACE("/expected-data-template/go/goAppExpectedHTTPTrace.mustache"),
   GO_SDK_AWSSDK_EXPECTED_TRACE("/expected-data-template/go/goAppExpectedAWSSDKTrace.mustache"),
   JS_SDK_HTTP_EXPECTED_TRACE("/expected-data-template/js/jsAppExpectedHTTPTrace.mustache"),

diff --git a/...in/resources/expected-data-template/springboot/springbootAppExpectedAWSSDK2Trace.mustache b/...in/resources/expected-data-template/springboot/springbootAppExpectedAWSSDK2Trace.mustache
@@ -0,0 +1,31 @@
+[{
+  "name": "aws-otel-integ-test",
+  "http": {
+    "request": {
+      "url": "{{endpoint}}/aws-sdk-call",
+      "method": "GET"
+    },
+    "response": {
+      "status": 200
+    }
+  },
+  "subsegments": [
+    {
+      "subsegments": [
+        {
+          "name": "AWS.SDK.S3",
+          "http": {
+            "request": {
+              "url": "https://s3\\.{{region}}\\.amazonaws\\.com/",
+              "method": "GET"
+            },
+            "response": {
+              "status": 200
+            }
+          },
+          "namespace": "aws"
+        }
+      ]
+    }
+  ]
+}]
diff --git a/validator/src/main/resources/validations/springboot-otel-trace-metric-validation.yml b/validator/src/main/resources/validations/springboot-otel-trace-metric-validation.yml
@@ -15,5 +15,5 @@
   httpPath: "/aws-sdk-call"
   httpMethod: "get"
   callingType: "http"
-  expectedTraceTemplate: "SPRINGBOOT_SDK_AWSSDK_EXPECTED_TRACE"
+  expectedTraceTemplate: "SPRINGBOOT_SDK_AWSSDK_2_EXPECTED_TRACE"