add telemetry to citestwheel and fix interpolation

rapidsai · Oct 10, 2024 · 5850eed · 5850eed
1 parent 20a4c05
commit 5850eed
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile
@@ -226,8 +226,8 @@ rm -rf gh_*
 
 # Install OpenTelemetry instrumentation
 pip install opentelemetry-distro[otlp] opentelemetry-exporter-prometheus
-curl -L -o otel-cli-${ CPU_ARCH }.tar.gz https://github.com/equinix-labs/otel-cli/releases/download/v0.4.5/otel-cli_0.4.5_linux_${ CPU_ARCH }.tar.gz
-tar -zxf  otel-cli-${ CPU_ARCH }.tar.gz
+curl -L -o "otel-cli-${CPU_ARCH}.tar.gz" https://github.com/equinix-labs/otel-cli/releases/download/v0.4.5/otel-cli_0.4.5_linux_${CPU_ARCH}.tar.gz
+tar -zxf  "otel-cli-${CPU_ARCH}.tar.gz"
 mv otel-cli /usr/local/bin/
 git clone -b add-conda-build-instrumentation https://github.com/msarahan/opentelemetry-python-contrib
 pip install -e ./opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-conda-build

diff --git a/ci-wheel.Dockerfile b/ci-wheel.Dockerfile
@@ -158,8 +158,8 @@ COPY pip.conf /etc/xdg/pip/pip.conf
 RUN <<EOF
 # Install OpenTelemetry instrumentation
 pip install opentelemetry-distro[otlp] opentelemetry-exporter-prometheus
-curl -L -o otel-cli-${ CPU_ARCH }.tar.gz https://github.com/equinix-labs/otel-cli/releases/download/v0.4.5/otel-cli_0.4.5_linux_${ CPU_ARCH }.tar.gz
-tar -zxf  otel-cli-${ CPU_ARCH }.tar.gz
+curl -L -o "otel-cli-${CPU_ARCH}.tar.gz" https://github.com/equinix-labs/otel-cli/releases/download/v0.4.5/otel-cli_0.4.5_linux_${CPU_ARCH}.tar.gz
+tar -zxf  "otel-cli-${CPU_ARCH}.tar.gz"
 mv otel-cli /usr/local/bin/
 git clone -b add-conda-build-instrumentation https://github.com/msarahan/opentelemetry-python-contrib
 pip install -e ./opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-conda-build

diff --git a/citestwheel.Dockerfile b/citestwheel.Dockerfile
@@ -11,6 +11,7 @@ FROM ${BASE_IMAGE}
 ARG CUDA_VER=notset
 ARG LINUX_VER=notset
 ARG PYTHON_VER=notset
+ARG CPU_ARCH=notset
 
 # Set RAPIDS versions env variables
 ENV RAPIDS_CUDA_VERSION="${CUDA_VER}"
@@ -91,6 +92,17 @@ python -m pip install "rapids-dependency-file-generator==1.*"
 pyenv rehash
 EOF
 
+RUN <<EOF
+# Install OpenTelemetry instrumentation
+pip install opentelemetry-distro[otlp] opentelemetry-exporter-prometheus
+curl -L -o "otel-cli-${CPU_ARCH}.tar.gz" https://github.com/equinix-labs/otel-cli/releases/download/v0.4.5/otel-cli_0.4.5_linux_${CPU_ARCH}.tar.gz
+tar -zxf  "otel-cli-${CPU_ARCH}.tar.gz"
+mv otel-cli /usr/local/bin/
+git clone -b add-conda-build-instrumentation https://github.com/msarahan/opentelemetry-python-contrib
+pip install -e ./opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-conda-build
+opentelemetry-bootstrap -a install
+EOF
+
 # Install latest gha-tools
 RUN wget https://github.com/rapidsai/gha-tools/releases/latest/download/tools.tar.gz -O - \
   | tar -xz -C /usr/local/bin