From e8a9c9395eb4a10acb395601c61f5bdbe81be96c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jan 2026 02:05:28 +0000 Subject: [PATCH 1/3] chore(deps): bump otel/opentelemetry-collector-contrib Bumps otel/opentelemetry-collector-contrib from 0.110.0 to 0.144.0. --- updated-dependencies: - dependency-name: otel/opentelemetry-collector-contrib dependency-version: 0.144.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- services/otel-gateway/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/otel-gateway/Dockerfile b/services/otel-gateway/Dockerfile index 1db2661..fda928c 100644 --- a/services/otel-gateway/Dockerfile +++ b/services/otel-gateway/Dockerfile @@ -4,7 +4,7 @@ # # https://github.com/open-telemetry/opentelemetry-collector-releases/blob/main/distributions/otelcol/Dockerfile # -FROM otel/opentelemetry-collector-contrib:0.110.0 +FROM otel/opentelemetry-collector-contrib:0.144.0 LABEL org.opencontainers.image.authors="tech@opensafely.org" \ org.opencontainers.image.url="opensafely.org" \ From fdf0d50abdaa9166d6877d72b85d314fd8608499 Mon Sep 17 00:00:00 2001 From: Alice Wong Date: Fri, 30 Jan 2026 19:12:08 +0000 Subject: [PATCH 2/3] Tidy up imports in test file --- services/otel-gateway/tests.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/otel-gateway/tests.py b/services/otel-gateway/tests.py index 7d9d0f5..41ac38e 100644 --- a/services/otel-gateway/tests.py +++ b/services/otel-gateway/tests.py @@ -1,9 +1,8 @@ import json -import os import time from pathlib import Path -from opentelemetry import metrics, trace +from opentelemetry import trace from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter from opentelemetry.metrics import ( From 6cc5a4ae73ed4408ae1bec4d66a2fa09394d0a2b Mon Sep 17 00:00:00 2001 From: Alice Wong Date: Fri, 30 Jan 2026 19:12:22 +0000 Subject: [PATCH 3/3] Replace deprecated logging exporter As of v0.111.0 of otel-collector, instead of the `logging` exporter with a `loglevel`, we have to use a `debug` exporter with a `verbosity`. They had provided a translation table: **`loglevel` value** **Equivalent `verbosity` level** `debug` `detailed` `info` `normal` `warn` `basic` `error` `basic` `dpanic` `basic` `panic` `basic` `fatal` `basic` --- services/otel-gateway/Dockerfile | 1 + services/otel-gateway/config.yaml | 8 ++++---- services/otel-gateway/justfile | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/services/otel-gateway/Dockerfile b/services/otel-gateway/Dockerfile index fda928c..3b76e94 100644 --- a/services/otel-gateway/Dockerfile +++ b/services/otel-gateway/Dockerfile @@ -15,6 +15,7 @@ LABEL org.opencontainers.image.authors="tech@opensafely.org" \ ENV HONEYCOMB_ENDPOINT="https://api.honeycomb.io" ENV METRICS_DATASET="jobrunner-metrics" ENV LOG_LEVEL="info" +ENV VERBOSITY="normal" # these must be provided at runtime # ENV HONEYCOMB_KEY diff --git a/services/otel-gateway/config.yaml b/services/otel-gateway/config.yaml index 37a2ead..6f23106 100644 --- a/services/otel-gateway/config.yaml +++ b/services/otel-gateway/config.yaml @@ -18,8 +18,8 @@ processors: batch: exporters: - logging: - loglevel: "${LOG_LEVEL}" + debug: + verbosity: "${VERBOSITY}" otlphttp/traces: endpoint: "${HONEYCOMB_ENDPOINT}" @@ -44,8 +44,8 @@ service: traces: receivers: [otlp] processors: [batch] - exporters: [otlphttp/traces, logging] + exporters: [otlphttp/traces, debug] metrics: receivers: [otlp] processors: [batch] - exporters: [otlphttp/metrics, logging] + exporters: [otlphttp/metrics, debug] diff --git a/services/otel-gateway/justfile b/services/otel-gateway/justfile index 98f4749..9a7d8e5 100644 --- a/services/otel-gateway/justfile +++ b/services/otel-gateway/justfile @@ -32,7 +32,7 @@ test-integration: venv #!/bin/bash set -euo pipefail - {{ just_executable() }} run -d -e LOG_LEVEL=debug -p 4318:4318 + {{ just_executable() }} run -d -e LOG_LEVEL=debug -e VERBOSITY=detailed -p 4318:4318 {{ just_executable() }} run-python tests.py echo "Data sent to honeycomb" echo "https://ui.honeycomb.io/bennett-institute-for-applied-data-science/environments/development/datasets/otel-gateway-tests?query=%7B%22time_range%22%3A600%2C%22granularity%22%3A0%2C%22breakdowns%22%3A%5B%5D%2C%22calculations%22%3A%5B%5D%2C%22orders%22%3A%5B%5D%2C%22havings%22%3A%5B%5D%2C%22limit%22%3A100%7D" @@ -67,6 +67,7 @@ test-ci: venv _mock_honeycomb_start && _mock_honeycomb_stop {{ just_executable() }} run -d \ -e HONEYCOMB_ENDPOINT \ -e LOG_LEVEL=debug \ + -e VERBOSITY=detailed \ -p 4318:4318 \ --add-host=host.docker.internal:host-gateway