Merge de847b1 into 1de43b0

ministryofjustice · Jan 21, 2025 · c50f77c · c50f77c
2 parents 1de43b0 + de847b1
commit c50f77c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/cmd/trigger_build b/cmd/trigger_build
@@ -0,0 +1 @@
+trigger a build
diff --git a/docker/adot-collector/extensions/collector b/docker/adot-collector/extensions/collector
diff --git a/docker/create-s3-replication-job/Dockerfile b/docker/create-s3-replication-job/Dockerfile
@@ -1,3 +1,13 @@
+FROM golang:bullseye AS adot-builder
+WORKDIR /app
+RUN apt-get update && apt-get -y --no-install-recommends install \
+  git=1:2.30.2-1+deb11u3 \
+  zip=3.0-12 \
+  unzip=6.0-26+deb11u1 && \
+  git clone --recurse-submodules https://github.com/aws-observability/aws-otel-lambda.git
+WORKDIR /app/aws-otel-lambda/go
+RUN ./build.sh
+
 FROM golang:1.23.5-alpine AS build
 
 WORKDIR /app
@@ -17,6 +27,8 @@ WORKDIR /app
 COPY --from=build /app/create-s3-replication-job /var/task/create-s3-replication-job
 COPY --link lang ./lang
 COPY --link ./docker/adot-collector/ /opt
+COPY --from=adot-builder /app/aws-otel-lambda/opentelemetry-lambda/collector/build/extensions/collector /opt/extensions/collector
+
 COPY --link docker/aws-lambda-rie ./aws-lambda-rie
 
 ENV AWS_LAMBDA_EXEC_WRAPPER=/opt/otel-handler
@@ -35,6 +47,7 @@ RUN chmod +x "/app/install_lambda_insights.sh" \
 COPY --from=build /app/create-s3-replication-job ./create-s3-replication-job
 COPY --link lang ./lang
 COPY --link ./docker/adot-collector/ /opt
+COPY --from=adot-builder /app/aws-otel-lambda/opentelemetry-lambda/collector/build/extensions/collector /opt/extensions/collector
 
 RUN chmod 755 /opt/config/config.yaml