Merge branch 'main' into main

aws-observability · Oct 8, 2024 · ee43a86 · ee43a86
2 parents 5cd249b + 445031b
commit ee43a86
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Install ADOT nodejs instrumentation in the /operator-build folder
-FROM node:20 AS build
+FROM public.ecr.aws/docker/library/node:20 AS build
 
 # Build the ADOT JS SDK Tarball: aws-aws-distro-opentelemetry-node-autoinstrumentation-x.y.z.tgz
 WORKDIR /adot-js-build
@@ -18,7 +18,7 @@ RUN npm install aws-aws-distro-opentelemetry-node-autoinstrumentation-$(node -p
 RUN npm install
 
 # Stage 2: Build the cp-utility binary
-FROM rust:1.75 as builder
+FROM public.ecr.aws/docker/library/rust:1.75 as builder
 
 WORKDIR /usr/src/cp-utility
 COPY ./tools/cp-utility .

diff --git a/aws-distro-opentelemetry-node-autoinstrumentation/src/aws-opentelemetry-configurator.ts b/aws-distro-opentelemetry-node-autoinstrumentation/src/aws-opentelemetry-configurator.ts
@@ -257,7 +257,10 @@ export class AwsOpentelemetryConfigurator {
     // Register BatchUnsampledSpanProcessor to export unsampled traces in Lambda
     // when Application Signals enabled
     if (isLambdaEnvironment() && !hasCustomOtlpTraceEndpoint()) {
-      const udpSpanExporter = new OTLPUdpSpanExporter(getXrayDaemonEndpoint(), FORMAT_OTEL_UNSAMPLED_TRACES_BINARY_PREFIX);
+      const udpSpanExporter = new OTLPUdpSpanExporter(
+        getXrayDaemonEndpoint(),
+        FORMAT_OTEL_UNSAMPLED_TRACES_BINARY_PREFIX
+      );
       const configuredExporter = AwsMetricAttributesSpanExporterBuilder.create(udpSpanExporter, resource).build();
       spanProcessors.push(
         new AwsBatchUnsampledSpanProcessor(configuredExporter, {

diff --git a/contract-tests/images/applications/aws-sdk/Dockerfile b/contract-tests/images/applications/aws-sdk/Dockerfile
@@ -1,6 +1,5 @@
 # Use an official Node.js runtime as the base image
-FROM node:20-alpine
-#FROM node:20
+FROM public.ecr.aws/docker/library/node:20-alpine
 
 # Set the working directory inside the container
 WORKDIR /aws-sdk

diff --git a/contract-tests/images/applications/http/Dockerfile b/contract-tests/images/applications/http/Dockerfile
@@ -1,6 +1,5 @@
 # Use an official Node.js runtime as the base image
-FROM node:20-alpine
-#FROM node:20
+FROM public.ecr.aws/docker/library/node:20-alpine
 
 # Set the working directory inside the container
 WORKDIR /http

diff --git a/contract-tests/images/applications/mongodb/Dockerfile b/contract-tests/images/applications/mongodb/Dockerfile
@@ -1,5 +1,5 @@
 # Use an official Node.js runtime as the base image
-FROM node:20-alpine
+FROM public.ecr.aws/docker/library/node:20-alpine
 
 # Set the working directory inside the container
 WORKDIR /mongodb

diff --git a/contract-tests/images/applications/mongoose/Dockerfile b/contract-tests/images/applications/mongoose/Dockerfile
@@ -1,5 +1,5 @@
 # Use an official Node.js runtime as the base image
-FROM node:20-alpine
+FROM public.ecr.aws/docker/library/node:20-alpine
 #FROM node:20
 
 # Set the working directory inside the container

diff --git a/contract-tests/images/applications/mysql2/Dockerfile b/contract-tests/images/applications/mysql2/Dockerfile
@@ -1,5 +1,5 @@
 # Use an official Node.js runtime as the base image
-FROM node:20-alpine
+FROM public.ecr.aws/docker/library/node:20-alpine
 
 # Set the working directory inside the container
 WORKDIR /mysql2