Skip to content

Commit acd0c15

Browse files
authored
Merge branch 'main' into add-checksum
2 parents 4799cdb + eae57c5 commit acd0c15

File tree

53 files changed

+6716
-2152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+6716
-2152
lines changed

.github/patches/opentelemetry-java-instrumentation.patch

Lines changed: 917 additions & 2030 deletions
Large diffs are not rendered by default.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# permissions and limitations under the License.
1414

1515
# Stage 1: Build the cp-utility binary
16-
FROM public.ecr.aws/docker/library/rust:1.75 as builder
16+
FROM public.ecr.aws/docker/library/rust:1.82 as builder
1717

1818
WORKDIR /usr/src/cp-utility
1919
COPY ./tools/cp-utility .

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ This configuration includes being able to reconfigure the [IdsGenerator](https:/
2929
which we need to support X-Ray compatible trace IDs. Because the SDK uses SPI, it is sufficient for
3030
the custom implementation to be on the classpath to be recognized. The AWS distribution of the
3131
OpenTelemetry Java Agent repackages the upstream agent by simply adding our SPI implementation for
32-
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)
32+
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)
3333
by default, and it sets a system property to configure the agent to use multiple trace ID propagators,
3434
defaulting to maximum interoperability.
3535

0 commit comments

Comments
 (0)