From fe338f6964c4f6d1313204ca9e00f234f55e91ab Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 13 Feb 2025 14:54:37 -0800 Subject: [PATCH 1/3] Add urllib3 upper limit for Python auto-instrumentation --- autoinstrumentation/python/requirements.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/autoinstrumentation/python/requirements.txt b/autoinstrumentation/python/requirements.txt index 8b07e1e1f0..1d04b2f876 100644 --- a/autoinstrumentation/python/requirements.txt +++ b/autoinstrumentation/python/requirements.txt @@ -1,4 +1,9 @@ opentelemetry-distro==0.50b0 + +# We add a cap to urllib3 version else Python 3.8 support is dropped. +# TODO: Update autoinstrumentation image builds to support all supported Python versions +# https://github.com/open-telemetry/opentelemetry-operator/issues/3712 +urllib3 < 2.3.0 # We don't use the distro[otlp] option which automatically includes exporters since gRPC is not appropriate for # injected auto-instrumentation, where it has a strict dependency on the OS / Python version the artifact is built for. opentelemetry-exporter-otlp-proto-http==1.29.0 From 89400df26ec1dc6d6659c9b1e9de142e7e8232eb Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 13 Feb 2025 14:56:55 -0800 Subject: [PATCH 2/3] Changelog --- .chloggen/cap-urllib3-for-py38-support.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 .chloggen/cap-urllib3-for-py38-support.yaml diff --git a/.chloggen/cap-urllib3-for-py38-support.yaml b/.chloggen/cap-urllib3-for-py38-support.yaml new file mode 100755 index 0000000000..6e59b36ac6 --- /dev/null +++ b/.chloggen/cap-urllib3-for-py38-support.yaml @@ -0,0 +1,16 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'bug_fix' + +# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action) +component: auto-instrumentation + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: add upper version limit to Python dependency urllib3 + +# One or more tracking issues related to the change +issues: [3616] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: From 72af392fbb2e7242e0b10c4579cea28f1a3c7981 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Thu, 13 Feb 2025 15:46:44 -0800 Subject: [PATCH 3/3] Reword comment --- autoinstrumentation/python/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoinstrumentation/python/requirements.txt b/autoinstrumentation/python/requirements.txt index 1d04b2f876..33dc416bfd 100644 --- a/autoinstrumentation/python/requirements.txt +++ b/autoinstrumentation/python/requirements.txt @@ -1,6 +1,6 @@ opentelemetry-distro==0.50b0 -# We add a cap to urllib3 version else Python 3.8 support is dropped. +# We add an upper limit to urllib3 version else Python 3.8 support is dropped. # TODO: Update autoinstrumentation image builds to support all supported Python versions # https://github.com/open-telemetry/opentelemetry-operator/issues/3712 urllib3 < 2.3.0