handle RAPIDS_OTEL_ATTRS in upload conda script

rapidsai · Oct 3, 2024 · 8978303 · 8978303
1 parent 46916e9
commit 8978303
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/tools/rapids-otel-wrap b/tools/rapids-otel-wrap
@@ -85,6 +85,9 @@ type otel-cli >/dev/null 2>&1 && {
         --start "$start" --end "$(date ${TIME_FORMAT})" \
         --protocol http/protobuf \
         --status-code "${RETURN_STATUS}" \
+        --tls-ca-cert ${OTEL_EXPORTER_OTLP_CERTIFICATE} \
+        --tls-client-cert ${OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE} \
+        --tls-client-key ${OTEL_EXPORTER_OTLP_CLIENT_KEY} \
         ${attrs} ${headers}
 }
 cleanup "$@"

diff --git a/tools/rapids-upload-conda-to-s3 b/tools/rapids-upload-conda-to-s3
@@ -30,5 +30,5 @@ pkg_name="$(rapids-package-name "$pkg_type")"
 # Where conda build artifacts are output
 path_to_tar_up="${RAPIDS_CONDA_BLD_OUTPUT_DIR}"
 
-RAPIDS_OTEL_ATTRS="${RAPIDS_OTEL_ATTRS},rapids_task=upload,rapids_package_name=${pkg_name}" \
-    rapids-otel-wrap rapids-upload-to-s3 "${pkg_name}" "${path_to_tar_up}"
+export RAPIDS_OTEL_ATTRS="${RAPIDS_OTEL_ATTRS:-},rapids_task=upload,rapids_package_name=${pkg_name}"
+rapids-otel-wrap rapids-upload-to-s3 "${pkg_name}" "${path_to_tar_up}"