Skip to content

Commit 309b6ed

Browse files
committed
Update shared.bash
1 parent 4d45d6e commit 309b6ed

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

lib/shared.bash

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -296,26 +296,18 @@ function run_docker_compose() {
296296

297297
if [[ "$disable_otel_config" == "true" ]]; then
298298
# Disable docker-compose OTEL tracing by clearing environment variables
299-
# Note: Containers will still receive OTEL vars via the 'environment' plugin config
299+
# builkite-agent spans will still be created, but this will elminate docker-compose cli/run etc spans
300300
(
301301
unset TRACEPARENT
302302
unset TRACESTATE
303303
unset OTEL_EXPORTER_OTLP_ENDPOINT
304304
unset OTEL_EXPORTER_OTLP_HEADERS
305305
unset OTEL_EXPORTER_OTLP_PROTOCOL
306306
unset OTEL_SERVICE_NAME
307-
307+
308308
plugin_prompt_and_run "${command[@]}" "$@"
309309
)
310310
else
311-
# Enable docker-compose OTEL tracing
312-
# Docker Compose will create spans under service name "compose" (separate from agent traces)
313-
314-
# Set TRACEPARENT from Buildkite if available (for container span linking)
315-
if [[ -n "${BUILDKITE_TRACING_TRACEPARENT:-}" ]] && [[ -z "${TRACEPARENT:-}" ]]; then
316-
export TRACEPARENT="$BUILDKITE_TRACING_TRACEPARENT"
317-
fi
318-
319311
plugin_prompt_and_run "${command[@]}" "$@"
320312
fi
321313
}

0 commit comments

Comments
 (0)