Merge branch 'main' into fix-gunicorn

Author: harrryr

.codespellrc

@@ -1,4 +1,4 @@
 [codespell]
 # skipping auto generated folders
 skip = ./.tox,./.mypy_cache,./target,*/LICENSE,./venv,*/sql_dialect_keywords.json
-ignore-words-list = afterall,assertIn
+ignore-words-list = afterall,assertIn, crate

Dockerfile

@@ -3,6 +3,8 @@
 #   The packages are installed in the `/autoinstrumentation` directory. This is required as when instrumenting the pod by CWOperator,
 #   one init container will be created to copy all the content in `/autoinstrumentation` directory to app's container. Then
 #   update the `PYTHONPATH` environment variable accordingly. Then in the second stage, copy the directory to `/autoinstrumentation`.
+
+# Stage 1: Install ADOT Python in the /operator-build folder
 FROM python:3.11 AS build
 
 WORKDIR /operator-build
@@ -18,11 +20,42 @@ RUN sed -i "/opentelemetry-exporter-otlp-proto-grpc/d" ./aws-opentelemetry-distr
 
 RUN mkdir workspace && pip install --target workspace ./aws-opentelemetry-distro
 
-FROM public.ecr.aws/amazonlinux/amazonlinux:minimal
+# Stage 2: Build the cp-utility binary
+FROM rust:1.75 as builder
+
+WORKDIR /usr/src/cp-utility
+COPY ./tools/cp-utility .
+
+## TARGETARCH is defined by buildx
+# https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
+ARG TARGETARCH
+
+# Run validations and audit only on amd64 because it is faster and those two steps
+# are only used to validate the source code and don't require anything that is
+# architecture specific.
+
+# Validations
+# Validate formatting
+RUN if [ $TARGETARCH = "amd64" ]; then rustup component add rustfmt && cargo fmt --check ; fi
+
+# Audit dependencies
+RUN if [ $TARGETARCH = "amd64" ]; then cargo install cargo-audit && cargo audit ; fi
+
+
+# Cross-compile based on the target platform.
+RUN if [ $TARGETARCH = "amd64" ]; then export ARCH="x86_64" ; \
+    elif [ $TARGETARCH = "arm64" ]; then export ARCH="aarch64" ; \
+    else false; \
+    fi \
+    && rustup target add ${ARCH}-unknown-linux-musl \
+    && cargo test  --target ${ARCH}-unknown-linux-musl \
+    && cargo install --target ${ARCH}-unknown-linux-musl --path . --root .
+
+# Stage 3: Build the distribution image by copying the THIRD-PARTY-LICENSES, the custom built cp command from stage 2, and the installed ADOT Python from stage 1 to their respective destinations
+FROM scratch
 
 # Required to copy attribute files to distributed docker images
 ADD THIRD-PARTY-LICENSES ./THIRD-PARTY-LICENSES
 
+COPY --from=builder /usr/src/cp-utility/bin/cp-utility /bin/cp
 COPY --from=build /operator-build/workspace /autoinstrumentation
-
-RUN chmod -R go+r /autoinstrumentation

tools/cp-utility/.cargo/config.toml

@@ -0,0 +1,3 @@
+# Use git CLI to fetch the source code instead of relying on the rust git implementation
+[net]
+git-fetch-with-cli = true

tools/cp-utility/Cargo.lock

@@ -0,0 +1,22 @@
+[package]
+name = "cp-utility"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+# No dependencies here
+
+[dev-dependencies]
+# dependencies only used during tests
+tempfile = "3.9.0"
+uuid = { version = "1.5.0", features = ["v4", "fast-rng"] }
+
+[profile.release]
+# Levers to optimize the binary for size
+strip = true # Strip symbols
+opt-level = "z" # Size optimization
+lto = true # linking time optimizations
+
+

tools/cp-utility/Cargo.toml

@@ -0,0 +1,57 @@
+# Introduction
+
+This copy utility is intended to be used as a base image for OpenTelemetry Operator 
+autoinstrumentation images. The copy utility will allow the ADOT Java agent jar to be 
+copied from the init container to the final destination volume.
+
+## Development
+
+### Pre-requirements
+* Install rust
+
+```
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+```
+
+* Install rustfmt
+
+```
+rustup component add rustfmt
+```
+
+### Development
+
+* Auto formatting the code
+
+This step is important and it might fail the build if the files are not properly
+formatted.
+
+```
+cargo fmt
+```
+
+* Testing the code
+```
+cargo test
+```
+
+* Building the code
+
+```
+cargo build
+```
+
+NOTE: this will build the code for tests locally. It will not statically link the libc used by it.
+
+
+* Building the code statically linked
+
+```
+cargo build --target x86_64-unknown-linux-musl
+```
+
+
+### Docker image
+
+In the root of this project, there is a Dockerfile that is supposed to be used during release.
+This Dockerfile can be used with buildx to generate images for the arm64 and x86_64 platforms.