aws-observability
diff --git a/‎instrumentation/aws-sdk/README.md‎
Lines changed: 6 additions & 10 deletions b/‎instrumentation/aws-sdk/README.md‎
Lines changed: 6 additions & 10 deletions
diff --git a/‎instrumentation/aws-sdk/build.gradle.kts‎
Lines changed: 0 additions & 1 deletion b/‎instrumentation/aws-sdk/build.gradle.kts‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎instrumentation/aws-sdk/src/test/groovy/software/amazon/opentelemetry/javaagent/instrumentation/awssdk_v1_11/BedrockJsonParserTest.groovy‎
Lines changed: 0 additions & 117 deletions b/‎instrumentation/aws-sdk/src/test/groovy/software/amazon/opentelemetry/javaagent/instrumentation/awssdk_v1_11/BedrockJsonParserTest.groovy‎
Lines changed: 0 additions & 117 deletions
diff --git a/‎instrumentation/aws-sdk/src/test/groovy/software/amazon/opentelemetry/javaagent/instrumentation/awssdk_v2_2/BedrockJsonParserTest.groovy‎
Lines changed: 0 additions & 117 deletions b/‎instrumentation/aws-sdk/src/test/groovy/software/amazon/opentelemetry/javaagent/instrumentation/awssdk_v2_2/BedrockJsonParserTest.groovy‎
Lines changed: 0 additions & 117 deletions
diff --git a/‎instrumentation/aws-sdk/src/test/java/software/amazon/opentelemetry/javaagent/instrumentation/awssdk_v1_11/BedrockJsonParserTest.java‎
Lines changed: 112 additions & 0 deletions b/‎instrumentation/aws-sdk/src/test/java/software/amazon/opentelemetry/javaagent/instrumentation/awssdk_v1_11/BedrockJsonParserTest.java‎
Lines changed: 112 additions & 0 deletions
@@ -150,23 +150,14 @@ _Class Functionalities:_
 - `BedrockJasonParser`
   - Parses and extracts specific attributes from Bedrock LLM responses for GenAI telemetry
 
-### Commands for Running Groovy Tests
+### Commands for Running Java Tests
 
 #### aws-sdk v1.11
 To run the `BedrockJsonParserTest`:
 ````
 ./gradlew :instrumentation:aws-sdk:test --tests "software.amazon.opentelemetry.javaagent.instrumentation.awssdk_v1_11.BedrockJsonParserTest"
 ````
 
-#### aws-sdk v2.2
-To run the `BedrockJsonParserTest`:
-````
-./gradlew :instrumentation:aws-sdk:test --tests "software.amazon.opentelemetry.javaagent.instrumentation.awssdk_v2_2.BedrockJsonParserTest"
-````
-
-### Commands for Running Java Tests
-
-#### aws-sdk v1.11
 To run the `AwsSdkExperimentalAttributesInjectionTest`:
 ````
 ./gradlew :instrumentation:aws-sdk:test --tests "software.amazon.opentelemetry.javaagent.instrumentation.awssdk_v1_11.AwsSdkExperimentalAttributesInjectionTest"
@@ -178,6 +169,11 @@ To run the `AdotAwsSdkClientAdviceTest`:
 ````
 
 #### aws-sdk v2.2
+To run the `BedrockJsonParserTest`:
+````
+./gradlew :instrumentation:aws-sdk:test --tests "software.amazon.opentelemetry.javaagent.instrumentation.awssdk_v2_2.BedrockJsonParserTest"
+````
+
 To run the `AwsSdkExperimentalAttributesInjectionTest`:
 ````
 ./gradlew :instrumentation:aws-sdk:test --tests "software.amazon.opentelemetry.javaagent.instrumentation.awssdk_v2_2.AwsSdkExperimentalAttributesInjectionTest"
@@ -16,7 +16,6 @@
 plugins {
   java
   id("com.gradleup.shadow")
-  id("groovy")
 }
 
 base.archivesBaseName = "aws-instrumentation-aws-sdk"
 
@@ -0,0 +1,112 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.opentelemetry.javaagent.instrumentation.awssdk_v1_11;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+class BedrockJsonParserTest {
+
+  @Test
+  void shouldParseSimpleJsonObject() {
+    String json = "{\"key\":\"value\"}";
+
+    Map<String, Object> actual = BedrockJsonParser.parse(json).getJsonBody();
+    Map<String, Object> expected = Map.of("key", "value");
+
+    assertThat(actual).isEqualTo(expected);
+  }
+
+  @Test
+  void shouldParseNestedJsonObject() {
+    String json = "{\"parent\":{\"child\":\"value\"}}";
+
+    Map<String, Object> actual = BedrockJsonParser.parse(json).getJsonBody();
+    Map<String, Object> expected = Map.of("parent", Map.of("child", "value"));
+
+    assertThat(actual).isEqualTo(expected);
+  }
+
+  @Test
+  void shouldParseJsonArray() {
+    String json = "{\"array\":[1, \"two\", 1.0]}";
+
+    Map<String, Object> actual = BedrockJsonParser.parse(json).getJsonBody();
+    Map<String, Object> expected = Map.of("array", List.of(1, "two", 1.0));
+
+    assertThat(actual).isEqualTo(expected);
+  }
+
+  @Test
+  void shouldParseEscapeSequences() {
+    String json =
+        "{\"escaped\":\"Line1\\nLine2\\tTabbed\\\"Quoted\\\"\\bBackspace\\fFormfeed\\rCarriageReturn\\\\Backslash\\/Slash\\u0041\"}";
+
+    Map<String, Object> actual = BedrockJsonParser.parse(json).getJsonBody();
+    Map<String, Object> expected =
+        Map.of(
+            "escaped",
+            "Line1\nLine2\tTabbed\"Quoted\"\bBackspace\fFormfeed\rCarriageReturn\\Backslash/SlashA");
+
+    assertThat(actual).isEqualTo(expected);
+  }
+
+  @Test
+  void shouldThrowExceptionForMalformedJson() {
+    String malformedJson = "{\"key\":value}";
+
+    assertThatThrownBy(() -> BedrockJsonParser.parse(malformedJson))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Unexpected character");
+  }
+
+  @Test
+  void shouldResolvePathInJsonObject() {
+    String json = "{\"parent\":{\"child\":{\"key\":\"value\"}}}";
+
+    BedrockJsonParser.LlmJson parsedJson = BedrockJsonParser.parse(json);
+    Object resolvedValue =
+        BedrockJsonParser.JsonPathResolver.resolvePath(parsedJson, "/parent/child/key");
+
+    assertThat(resolvedValue).isEqualTo("value");
+  }
+
+  @Test
+  void shouldResolvePathInJsonArray() {
+    String json = "{\"array\":[{\"key\":\"value1\"}, {\"key\":\"value2\"}]}";
+
+    BedrockJsonParser.LlmJson parsedJson = BedrockJsonParser.parse(json);
+    Object resolvedValue =
+        BedrockJsonParser.JsonPathResolver.resolvePath(parsedJson, "/array/1/key");
+
+    assertThat(resolvedValue).isEqualTo("value2");
+  }
+
+  @Test
+  void shouldReturnNullForInvalidPathResolution() {
+    String json = "{\"parent\":{\"child\":{\"key\":\"value\"}}}";
+
+    BedrockJsonParser.LlmJson parsedJson = BedrockJsonParser.parse(json);
+    Object resolvedValue =
+        BedrockJsonParser.JsonPathResolver.resolvePath(parsedJson, "/invalid/path");
+
+    assertThat(resolvedValue).isNull();
+  }
+}
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`plugins {`
`17`	`17`	`java`
`18`	`18`	`id("com.gradleup.shadow")`
`19`		`- id("groovy")`
`20`	`19`	`}`
`21`	`20`
`22`	`21`	`base.archivesBaseName = "aws-instrumentation-aws-sdk"`