From 23452b33540ff531c780388d20e23e54ae5ae331 Mon Sep 17 00:00:00 2001 From: Dennis Kliban Date: Fri, 10 May 2024 10:33:48 -0400 Subject: [PATCH] Patch opentelemetry-python-contrib Due to an issue https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2513 We can remove the patch once https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2514 is released. --- Dockerfile | 6 ++++++ images/assets/otel-aiohttp.patch | 13 +++++++++++++ images/assets/otel-django.patch | 13 +++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 images/assets/otel-aiohttp.patch create mode 100644 images/assets/otel-django.patch diff --git a/Dockerfile b/Dockerfile index 0e1ab087..9eda0ed3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -126,4 +126,10 @@ RUN chown :root /var/lib/pulp/{scripts,media,tmp,assets} RUN dnf install -y patch && dnf clean all +COPY images/assets/otel-aiohttp.patch /tmp/otel-aiohttp.patch +RUN patch -p1 -d /usr/local/lib/python3.9/site-packages/ < /tmp/otel-aiohttp.patch || /bin/true + +COPY images/assets/otel-aiohttp.patch /tmp/otel-django.patch +RUN patch -p1 -d /usr/local/lib/python3.9/site-packages/ < /tmp/otel-django.patch || /bin/true + EXPOSE 80 diff --git a/images/assets/otel-aiohttp.patch b/images/assets/otel-aiohttp.patch new file mode 100644 index 00000000..7a5a2952 --- /dev/null +++ b/images/assets/otel-aiohttp.patch @@ -0,0 +1,13 @@ +diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/__init__.py b/instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/__init__.py +index c1ab960818..0cf8599b15 100644 +--- a/instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/__init__.py ++++ b/instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/__init__.py +@@ -213,7 +213,7 @@ async def middleware(request, handler): + active_requests_counter = meter.create_up_down_counter( + name=MetricInstruments.HTTP_SERVER_ACTIVE_REQUESTS, + unit="requests", +- description="measures the number of concurrent HTTP requests those are currently in flight", ++ description="measures the number of concurrent HTTP requests that are currently in-flight", + ) + + with tracer.start_as_current_span( diff --git a/images/assets/otel-django.patch b/images/assets/otel-django.patch new file mode 100644 index 00000000..493b9d61 --- /dev/null +++ b/images/assets/otel-django.patch @@ -0,0 +1,13 @@ +diff --git a/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/__init__.py b/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/__init__.py +index 37ac760283..b0b73168b3 100644 +--- a/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/__init__.py ++++ b/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/__init__.py +@@ -327,7 +327,7 @@ def _instrument(self, **kwargs): + _DjangoMiddleware._active_request_counter = meter.create_up_down_counter( + name=MetricInstruments.HTTP_SERVER_ACTIVE_REQUESTS, + unit="requests", +- description="measures the number of concurrent HTTP requests those are currently in flight", ++ description="measures the number of concurrent HTTP requests that are currently in-flight", + ) + # This can not be solved, but is an inherent problem of this approach: + # the order of middleware entries matters, and here you have no control