Merge branch 'main' into add-checksum

aws-observability · Dec 9, 2024 · acd0c15 · acd0c15
2 parents 4799cdb + eae57c5
commit acd0c15
Show file tree

Hide file tree

Showing 53 changed files with 6,716 additions and 2,152 deletions.
diff --git a/.github/patches/opentelemetry-java-instrumentation.patch b/.github/patches/opentelemetry-java-instrumentation.patch
diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@
 # permissions and limitations under the License.
 
 # Stage 1: Build the cp-utility binary
-FROM public.ecr.aws/docker/library/rust:1.75 as builder
+FROM public.ecr.aws/docker/library/rust:1.82 as builder
 
 WORKDIR /usr/src/cp-utility
 COPY ./tools/cp-utility .

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ This configuration includes being able to reconfigure the [IdsGenerator](https:/
 which we need to support X-Ray compatible trace IDs. Because the SDK uses SPI, it is sufficient for
 the custom implementation to be on the classpath to be recognized. The AWS distribution of the
 OpenTelemetry Java Agent repackages the upstream agent by simply adding our SPI implementation for
-reconfiguring the ID generator. In addition, it includes [AWS resource providers](https://github.com/open-telemetry/opentelemetry-java/tree/main/sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource) 
+reconfiguring the ID generator. In addition, it includes [AWS resource providers](https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource) 
 by default, and it sets a system property to configure the agent to use multiple trace ID propagators, 
 defaulting to maximum interoperability.