Bump OpenTelemetry SDK to 1.37.0/0.58b0 (#389)

xrmx · web-flow · commit 582be473d184 · 2025-09-19T08:18:58.000Z
* Bump OpenTelemetry SDK to 1.37.0/0.58b0

* Handle new cpython metrics

* Remove TODO after 1.37.0 rebase
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ With EDOT Python you have access to all the features of the OpenTelemetry Python
 
 ## Configuration
 
-The distribution supports all the configuration variables from OpenTelemetry Python project version 1.36.0.
+The distribution supports all the configuration variables from OpenTelemetry Python project version 1.37.0.
 
 See [Configuration](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/python/configuration.html) for more details.
 
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -18,7 +18,7 @@ googleapis-common-protos==1.70.0
     # via
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-exporter-otlp-proto-http
-grpcio==1.74.0
+grpcio==1.75.0
     # via
     #   opentelemetry-exporter-otlp-proto-grpc
     #   oteltest
@@ -32,7 +32,7 @@ iniconfig==2.1.0
     # via pytest
 leb128==1.0.8
     # via elastic-opentelemetry (pyproject.toml)
-opentelemetry-api==1.36.0
+opentelemetry-api==1.37.0
     # via
     #   elastic-opentelemetry (pyproject.toml)
     #   opentelemetry-exporter-otlp-proto-grpc
@@ -43,35 +43,35 @@ opentelemetry-api==1.36.0
     #   opentelemetry-sdk
     #   opentelemetry-semantic-conventions
     #   oteltest
-opentelemetry-exporter-otlp==1.36.0
+opentelemetry-exporter-otlp==1.37.0
     # via elastic-opentelemetry (pyproject.toml)
-opentelemetry-exporter-otlp-proto-common==1.36.0
+opentelemetry-exporter-otlp-proto-common==1.37.0
     # via
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-exporter-otlp-proto-http
-opentelemetry-exporter-otlp-proto-grpc==1.36.0
+opentelemetry-exporter-otlp-proto-grpc==1.37.0
     # via opentelemetry-exporter-otlp
-opentelemetry-exporter-otlp-proto-http==1.36.0
+opentelemetry-exporter-otlp-proto-http==1.37.0
     # via opentelemetry-exporter-otlp
-opentelemetry-instrumentation==0.57b0
+opentelemetry-instrumentation==0.58b0
     # via
     #   elastic-opentelemetry (pyproject.toml)
     #   opentelemetry-instrumentation-system-metrics
-opentelemetry-instrumentation-system-metrics==0.57b0
+opentelemetry-instrumentation-system-metrics==0.58b0
     # via elastic-opentelemetry (pyproject.toml)
-opentelemetry-proto==1.36.0
+opentelemetry-proto==1.37.0
     # via
     #   opentelemetry-exporter-otlp-proto-common
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-exporter-otlp-proto-http
     #   oteltest
 opentelemetry-resource-detector-azure==0.1.5
     # via elastic-opentelemetry (pyproject.toml)
-opentelemetry-resource-detector-containerid==0.57b0
+opentelemetry-resource-detector-containerid==0.58b0
     # via elastic-opentelemetry (pyproject.toml)
 opentelemetry-resourcedetector-gcp==1.8.0a0
     # via elastic-opentelemetry (pyproject.toml)
-opentelemetry-sdk==1.36.0
+opentelemetry-sdk==1.37.0
     # via
     #   elastic-opentelemetry (pyproject.toml)
     #   opentelemetry-exporter-otlp-proto-grpc
@@ -82,7 +82,7 @@ opentelemetry-sdk==1.36.0
     #   opentelemetry-sdk-extension-aws
 opentelemetry-sdk-extension-aws==2.1.0
     # via elastic-opentelemetry (pyproject.toml)
-opentelemetry-semantic-conventions==0.57b0
+opentelemetry-semantic-conventions==0.58b0
     # via
     #   elastic-opentelemetry (pyproject.toml)
     #   opentelemetry-instrumentation
@@ -99,12 +99,12 @@ pip-tools==7.5.0
     # via elastic-opentelemetry (pyproject.toml)
 pluggy==1.6.0
     # via pytest
-protobuf==6.32.0
+protobuf==6.32.1
     # via
     #   googleapis-common-protos
     #   opentelemetry-proto
     #   oteltest
-psutil==7.0.0
+psutil==7.1.0
     # via opentelemetry-instrumentation-system-metrics
 pygments==2.19.2
     # via pytest
@@ -123,9 +123,10 @@ tomli==2.2.1
     #   build
     #   pip-tools
     #   pytest
-typing-extensions==4.14.1
+typing-extensions==4.15.0
     # via
     #   exceptiongroup
+    #   grpcio
     #   opentelemetry-api
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-exporter-otlp-proto-http
diff --git a/operator/requirements.txt b/operator/requirements.txt
@@ -1,59 +1,59 @@
-opentelemetry-exporter-prometheus==0.57b0
+opentelemetry-exporter-prometheus==0.58b0
 
 opentelemetry-propagator-aws-xray==1.0.2
-opentelemetry-propagator-b3==1.36.0
-opentelemetry-propagator-jaeger==1.36.0
-opentelemetry-propagator-ot-trace==0.57b0
+opentelemetry-propagator-b3==1.37.0
+opentelemetry-propagator-jaeger==1.37.0
+opentelemetry-propagator-ot-trace==0.58b0
 
-opentelemetry-instrumentation-aio-pika==0.57b0
-opentelemetry-instrumentation-aiohttp-client==0.57b0
-opentelemetry-instrumentation-aiohttp-server==0.57b0
-opentelemetry-instrumentation-aiokafka==0.57b0
-opentelemetry-instrumentation-aiopg==0.57b0
-opentelemetry-instrumentation-asgi==0.57b0
-opentelemetry-instrumentation-asyncclick==0.57b0
-opentelemetry-instrumentation-asyncio==0.57b0
-opentelemetry-instrumentation-asyncpg==0.57b0
-opentelemetry-instrumentation-boto==0.57b0
-opentelemetry-instrumentation-boto3sqs==0.57b0
-opentelemetry-instrumentation-botocore==0.57b0
-opentelemetry-instrumentation-cassandra==0.57b0
-opentelemetry-instrumentation-celery==0.57b0
-opentelemetry-instrumentation-click==0.57b0
-opentelemetry-instrumentation-confluent-kafka==0.57b0
-opentelemetry-instrumentation-dbapi==0.57b0
-opentelemetry-instrumentation-django==0.57b0
-opentelemetry-instrumentation-elasticsearch==0.57b0
-opentelemetry-instrumentation-falcon==0.57b0
-opentelemetry-instrumentation-fastapi==0.57b0
-opentelemetry-instrumentation-flask==0.57b0
-opentelemetry-instrumentation-grpc==0.57b0
-opentelemetry-instrumentation-httpx==0.57b0
-opentelemetry-instrumentation-jinja2==0.57b0
-opentelemetry-instrumentation-kafka-python==0.57b0
-opentelemetry-instrumentation-logging==0.57b0
-opentelemetry-instrumentation-mysql==0.57b0
-opentelemetry-instrumentation-mysqlclient==0.57b0
-opentelemetry-instrumentation-pika==0.57b0
-opentelemetry-instrumentation-psycopg==0.57b0
-opentelemetry-instrumentation-psycopg2==0.57b0
-opentelemetry-instrumentation-pymemcache==0.57b0
-opentelemetry-instrumentation-pymongo==0.57b0
-opentelemetry-instrumentation-pymysql==0.57b0
-opentelemetry-instrumentation-pymssql==0.57b0
-opentelemetry-instrumentation-pyramid==0.57b0
-opentelemetry-instrumentation-redis==0.57b0
-opentelemetry-instrumentation-remoulade==0.57b0
-opentelemetry-instrumentation-requests==0.57b0
-opentelemetry-instrumentation-sqlalchemy==0.57b0
-opentelemetry-instrumentation-sqlite3==0.57b0
-opentelemetry-instrumentation-starlette==0.57b0
-opentelemetry-instrumentation-system-metrics==0.57b0
-opentelemetry-instrumentation-threading==0.57b0
-opentelemetry-instrumentation-tornado==0.57b0
-opentelemetry-instrumentation-tortoiseorm==0.57b0
-opentelemetry-instrumentation-urllib==0.57b0
-opentelemetry-instrumentation-urllib3==0.57b0
-opentelemetry-instrumentation-wsgi==0.57b0
+opentelemetry-instrumentation-aio-pika==0.58b0
+opentelemetry-instrumentation-aiohttp-client==0.58b0
+opentelemetry-instrumentation-aiohttp-server==0.58b0
+opentelemetry-instrumentation-aiokafka==0.58b0
+opentelemetry-instrumentation-aiopg==0.58b0
+opentelemetry-instrumentation-asgi==0.58b0
+opentelemetry-instrumentation-asyncclick==0.58b0
+opentelemetry-instrumentation-asyncio==0.58b0
+opentelemetry-instrumentation-asyncpg==0.58b0
+opentelemetry-instrumentation-boto==0.58b0
+opentelemetry-instrumentation-boto3sqs==0.58b0
+opentelemetry-instrumentation-botocore==0.58b0
+opentelemetry-instrumentation-cassandra==0.58b0
+opentelemetry-instrumentation-celery==0.58b0
+opentelemetry-instrumentation-click==0.58b0
+opentelemetry-instrumentation-confluent-kafka==0.58b0
+opentelemetry-instrumentation-dbapi==0.58b0
+opentelemetry-instrumentation-django==0.58b0
+opentelemetry-instrumentation-elasticsearch==0.58b0
+opentelemetry-instrumentation-falcon==0.58b0
+opentelemetry-instrumentation-fastapi==0.58b0
+opentelemetry-instrumentation-flask==0.58b0
+opentelemetry-instrumentation-grpc==0.58b0
+opentelemetry-instrumentation-httpx==0.58b0
+opentelemetry-instrumentation-jinja2==0.58b0
+opentelemetry-instrumentation-kafka-python==0.58b0
+opentelemetry-instrumentation-logging==0.58b0
+opentelemetry-instrumentation-mysql==0.58b0
+opentelemetry-instrumentation-mysqlclient==0.58b0
+opentelemetry-instrumentation-pika==0.58b0
+opentelemetry-instrumentation-psycopg==0.58b0
+opentelemetry-instrumentation-psycopg2==0.58b0
+opentelemetry-instrumentation-pymemcache==0.58b0
+opentelemetry-instrumentation-pymongo==0.58b0
+opentelemetry-instrumentation-pymysql==0.58b0
+opentelemetry-instrumentation-pymssql==0.58b0
+opentelemetry-instrumentation-pyramid==0.58b0
+opentelemetry-instrumentation-redis==0.58b0
+opentelemetry-instrumentation-remoulade==0.58b0
+opentelemetry-instrumentation-requests==0.58b0
+opentelemetry-instrumentation-sqlalchemy==0.58b0
+opentelemetry-instrumentation-sqlite3==0.58b0
+opentelemetry-instrumentation-starlette==0.58b0
+opentelemetry-instrumentation-system-metrics==0.58b0
+opentelemetry-instrumentation-threading==0.58b0
+opentelemetry-instrumentation-tornado==0.58b0
+opentelemetry-instrumentation-tortoiseorm==0.58b0
+opentelemetry-instrumentation-urllib==0.58b0
+opentelemetry-instrumentation-urllib3==0.58b0
+opentelemetry-instrumentation-wsgi==0.58b0
 
 elastic-opentelemetry-instrumentation-openai==1.1.1
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,16 +26,16 @@ classifiers = [
 ]
 
 dependencies = [
-    "opentelemetry-api == 1.36.0",
-    "opentelemetry-exporter-otlp == 1.36.0",
-    "opentelemetry-instrumentation == 0.57b0",
-    "opentelemetry-instrumentation-system-metrics == 0.57b0",
+    "opentelemetry-api == 1.37.0",
+    "opentelemetry-exporter-otlp == 1.37.0",
+    "opentelemetry-instrumentation == 0.58b0",
+    "opentelemetry-instrumentation-system-metrics == 0.58b0",
     "opentelemetry-resourcedetector-gcp ~= 1.8.0a0",
     "opentelemetry-resource-detector-azure ~= 0.1.5",
-    "opentelemetry-resource-detector-containerid == 0.57b0",
-    "opentelemetry-sdk == 1.36.0",
+    "opentelemetry-resource-detector-containerid == 0.58b0",
+    "opentelemetry-sdk == 1.37.0",
     "opentelemetry-sdk-extension-aws ~= 2.1.0",
-    "opentelemetry-semantic-conventions == 0.57b0",
+    "opentelemetry-semantic-conventions == 0.58b0",
     "packaging",
     "uuid-utils",
 ]
diff --git a/src/elasticotel/distro/__init__.py b/src/elasticotel/distro/__init__.py
@@ -86,9 +86,6 @@ def _configure(self, **kwargs):
             HTTPOTLPMetricExporter: otlp_http_exporter_options,
             HTTPOTLPSpanExporter: otlp_http_exporter_options,
         }
-        # TODO: Remove the following line after rebasing on top of upstream 1.37.0
-        _OTLP_HTTP_HEADERS["User-Agent"] = otlp_http_exporter_options["headers"]["User-Agent"]
-
         super()._configure(**kwargs)
 
         enable_opamp = False
@@ -138,7 +135,9 @@ def load_instrumentor(self, entry_point: EntryPoint, **kwargs):
             system_metrics_enabled = system_metrics_configuration.lower() == "true"
             if not system_metrics_enabled:
                 instrumentor_kwargs["config"] = {
-                    k: v for k, v in SYSTEM_METRICS_DEFAULT_CONFIG.items() if k.startswith("process.runtime")
+                    k: v
+                    for k, v in SYSTEM_METRICS_DEFAULT_CONFIG.items()
+                    if k.startswith("process.runtime") or k.startswith("cpython")
                 }
         instrumentor_class(**instrumentor_kwargs).instrument(**kwargs)  # type: ignore[reportCallIssue]
 
diff --git a/tests/distro/test_distro.py b/tests/distro/test_distro.py
@@ -85,6 +85,9 @@ def test_load_instrumentor_call_with_default_kwargs_for_SystemMetricsInstrumento
                 "process.runtime.memory": ["rss", "vms"],
                 "process.runtime.cpu.time": ["user", "system"],
                 "process.runtime.gc_count": None,
+                "cpython.gc.collections": None,
+                "cpython.gc.collected_objects": None,
+                "cpython.gc.uncollectable_objects": None,
                 "process.runtime.thread_count": None,
                 "process.runtime.cpu.utilization": None,
                 "process.runtime.context_switches": ["involuntary", "voluntary"],
diff --git a/tests/integration/test_integration.py b/tests/integration/test_integration.py
@@ -91,6 +91,9 @@ def test_metrics_default_does_not_contain_system_metrics(self):
                 "process.runtime.cpython.memory",
                 "process.runtime.cpython.cpu_time",
                 "process.runtime.cpython.gc_count",
+                "cpython.gc.collections",
+                "cpython.gc.collected_objects",
+                "cpython.gc.uncollectable_objects",
                 "process.runtime.cpython.thread_count",
                 "process.runtime.cpython.cpu.utilization",
                 "process.runtime.cpython.context_switches",
@@ -137,6 +140,9 @@ def test_metrics_with_system_metrics(self):
                 "process.runtime.cpython.memory",
                 "process.runtime.cpython.cpu_time",
                 "process.runtime.cpython.gc_count",
+                "cpython.gc.collections",
+                "cpython.gc.collected_objects",
+                "cpython.gc.uncollectable_objects",
                 "process.runtime.cpython.thread_count",
                 "process.runtime.cpython.cpu.utilization",
                 "process.runtime.cpython.context_switches",
