Upgrade to OTel Python 1.41.0/0.62b0

dev-requirements.txt

@@ -1,6 +1,6 @@
-opentelemetry-test-utils==0.61b0
-opentelemetry-instrumentation-flask==0.61b0
-opentelemetry-instrumentation-requests==0.61b0
+opentelemetry-test-utils==0.62b0
+opentelemetry-instrumentation-flask==0.62b0
+opentelemetry-instrumentation-requests==0.62b0
 pytest
 pytest-cov
 pytest-mock

image/requirements.txt

@@ -1,65 +1,65 @@
 # Install most APM Python deps
-opentelemetry-api==1.40.0
-opentelemetry-sdk==1.40.0
-opentelemetry-instrumentation==0.61b0
+opentelemetry-api==1.41.0
+opentelemetry-sdk==1.41.0
+opentelemetry-instrumentation==0.62b0
 
 urllib3 < 2.7.0
 # We don't use the otlp_proto_grpc option 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.40.0
-opentelemetry-exporter-prometheus==0.61b0
+opentelemetry-exporter-otlp-proto-http==1.41.0
+opentelemetry-exporter-prometheus==0.62b0
 
-opentelemetry-propagator-b3==1.40.0
-opentelemetry-propagator-jaeger==1.40.0
+opentelemetry-propagator-b3==1.41.0
+opentelemetry-propagator-jaeger==1.41.0
 opentelemetry-propagator-aws-xray==1.0.2
 
-opentelemetry-propagator-ot-trace==0.61b0
+opentelemetry-propagator-ot-trace==0.62b0
 
 # Copied in from https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation
-opentelemetry-instrumentation-aio-pika==0.61b0
-opentelemetry-instrumentation-aiohttp-client==0.61b0
-opentelemetry-instrumentation-aiohttp-server==0.61b0
-opentelemetry-instrumentation-aiokafka==0.61b0
-opentelemetry-instrumentation-aiopg==0.61b0
-opentelemetry-instrumentation-asgi==0.61b0
-opentelemetry-instrumentation-asyncio==0.61b0
-opentelemetry-instrumentation-asyncpg==0.61b0
-opentelemetry-instrumentation-aws-lambda==0.61b0
-opentelemetry-instrumentation-boto3sqs==0.61b0
-opentelemetry-instrumentation-botocore==0.61b0
-opentelemetry-instrumentation-cassandra==0.61b0
-opentelemetry-instrumentation-celery==0.61b0
-opentelemetry-instrumentation-click==0.61b0
-opentelemetry-instrumentation-confluent-kafka==0.61b0
-opentelemetry-instrumentation-dbapi==0.61b0
-opentelemetry-instrumentation-django==0.61b0
-opentelemetry-instrumentation-elasticsearch==0.61b0
-opentelemetry-instrumentation-falcon==0.61b0
-opentelemetry-instrumentation-fastapi==0.61b0
-opentelemetry-instrumentation-flask==0.61b0
-opentelemetry-instrumentation-grpc==0.61b0
-opentelemetry-instrumentation-httpx==0.61b0
-opentelemetry-instrumentation-jinja2==0.61b0
-opentelemetry-instrumentation-kafka-python==0.61b0
-opentelemetry-instrumentation-logging==0.61b0
-opentelemetry-instrumentation-mysql==0.61b0
-opentelemetry-instrumentation-mysqlclient==0.61b0
-opentelemetry-instrumentation-pika==0.61b0
-opentelemetry-instrumentation-psycopg==0.61b0
-opentelemetry-instrumentation-psycopg2==0.61b0
-opentelemetry-instrumentation-pymemcache==0.61b0
-opentelemetry-instrumentation-pymongo==0.61b0
-opentelemetry-instrumentation-pymysql==0.61b0
-opentelemetry-instrumentation-pyramid==0.61b0
-opentelemetry-instrumentation-redis==0.61b0
-opentelemetry-instrumentation-remoulade==0.61b0
-opentelemetry-instrumentation-requests==0.61b0
-opentelemetry-instrumentation-sqlalchemy==0.61b0
-opentelemetry-instrumentation-sqlite3==0.61b0
-opentelemetry-instrumentation-starlette==0.61b0
-opentelemetry-instrumentation-threading==0.61b0
-opentelemetry-instrumentation-tornado==0.61b0
-opentelemetry-instrumentation-tortoiseorm==0.61b0
-opentelemetry-instrumentation-urllib==0.61b0
-opentelemetry-instrumentation-urllib3==0.61b0
-opentelemetry-instrumentation-wsgi==0.61b0
+opentelemetry-instrumentation-aio-pika==0.62b0
+opentelemetry-instrumentation-aiohttp-client==0.62b0
+opentelemetry-instrumentation-aiohttp-server==0.62b0
+opentelemetry-instrumentation-aiokafka==0.62b0
+opentelemetry-instrumentation-aiopg==0.62b0
+opentelemetry-instrumentation-asgi==0.62b0
+opentelemetry-instrumentation-asyncio==0.62b0
+opentelemetry-instrumentation-asyncpg==0.62b0
+opentelemetry-instrumentation-aws-lambda==0.62b0
+opentelemetry-instrumentation-boto3sqs==0.62b0
+opentelemetry-instrumentation-botocore==0.62b0
+opentelemetry-instrumentation-cassandra==0.62b0
+opentelemetry-instrumentation-celery==0.62b0
+opentelemetry-instrumentation-click==0.62b0
+opentelemetry-instrumentation-confluent-kafka==0.62b0
+opentelemetry-instrumentation-dbapi==0.62b0
+opentelemetry-instrumentation-django==0.62b0
+opentelemetry-instrumentation-elasticsearch==0.62b0
+opentelemetry-instrumentation-falcon==0.62b0
+opentelemetry-instrumentation-fastapi==0.62b0
+opentelemetry-instrumentation-flask==0.62b0
+opentelemetry-instrumentation-grpc==0.62b0
+opentelemetry-instrumentation-httpx==0.62b0
+opentelemetry-instrumentation-jinja2==0.62b0
+opentelemetry-instrumentation-kafka-python==0.62b0
+opentelemetry-instrumentation-logging==0.62b0
+opentelemetry-instrumentation-mysql==0.62b0
+opentelemetry-instrumentation-mysqlclient==0.62b0
+opentelemetry-instrumentation-pika==0.62b0
+opentelemetry-instrumentation-psycopg==0.62b0
+opentelemetry-instrumentation-psycopg2==0.62b0
+opentelemetry-instrumentation-pymemcache==0.62b0
+opentelemetry-instrumentation-pymongo==0.62b0
+opentelemetry-instrumentation-pymysql==0.62b0
+opentelemetry-instrumentation-pyramid==0.62b0
+opentelemetry-instrumentation-redis==0.62b0
+opentelemetry-instrumentation-remoulade==0.62b0
+opentelemetry-instrumentation-requests==0.62b0
+opentelemetry-instrumentation-sqlalchemy==0.62b0
+opentelemetry-instrumentation-sqlite3==0.62b0
+opentelemetry-instrumentation-starlette==0.62b0
+opentelemetry-instrumentation-threading==0.62b0
+opentelemetry-instrumentation-tornado==0.62b0
+opentelemetry-instrumentation-tortoiseorm==0.62b0
+opentelemetry-instrumentation-urllib==0.62b0
+opentelemetry-instrumentation-urllib3==0.62b0
+opentelemetry-instrumentation-wsgi==0.62b0

lambda/requirements-nodeps.txt

@@ -1,4 +1,4 @@
 # TODO: move these dependencies to requirements.txt when they stopped relying on a pinned version of
 # opentelemetry-propagator-aws-xray
-opentelemetry-instrumentation-aws-lambda==0.61b0
-opentelemetry-instrumentation-botocore==0.61b0
+opentelemetry-instrumentation-aws-lambda==0.62b0
+opentelemetry-instrumentation-botocore==0.62b0

lambda/requirements.txt

@@ -1,39 +1,39 @@
-opentelemetry-sdk==1.40.0
-opentelemetry-exporter-otlp-proto-http==1.40.0
+opentelemetry-sdk==1.41.0
+opentelemetry-exporter-otlp-proto-http==1.41.0
 # Exclude default opentelemetry-distro
-opentelemetry-instrumentation==0.61b0
-opentelemetry-semantic-conventions==0.61b0
+opentelemetry-instrumentation==0.62b0
+opentelemetry-semantic-conventions==0.62b0
 opentelemetry-propagator-aws-xray==1.0.2
 
 # Instrumentation dependencies
-opentelemetry-instrumentation-aiohttp-client==0.61b0
-opentelemetry-util-http==0.61b0
-opentelemetry-instrumentation-asgi==0.61b0
-opentelemetry-instrumentation-asyncpg==0.61b0
-opentelemetry-instrumentation-boto3sqs==0.61b0
-opentelemetry-instrumentation-celery==0.61b0
-opentelemetry-instrumentation-dbapi==0.61b0
-opentelemetry-instrumentation-django==0.61b0
-opentelemetry-instrumentation-elasticsearch==0.61b0
-opentelemetry-instrumentation-fastapi==0.61b0
-opentelemetry-instrumentation-falcon==0.61b0
-opentelemetry-instrumentation-flask==0.61b0
-opentelemetry-instrumentation-jinja2==0.61b0
-opentelemetry-instrumentation-mysql==0.61b0
-opentelemetry-instrumentation-psycopg2==0.61b0
-opentelemetry-instrumentation-pymemcache==0.61b0
-opentelemetry-instrumentation-pymongo==0.61b0
-opentelemetry-instrumentation-pymysql==0.61b0
-opentelemetry-instrumentation-pyramid==0.61b0
-opentelemetry-instrumentation-redis==0.61b0
-opentelemetry-instrumentation-requests==0.61b0
-opentelemetry-instrumentation-sqlalchemy==0.61b0
-opentelemetry-instrumentation-sqlite3==0.61b0
-opentelemetry-instrumentation-starlette==0.61b0
-opentelemetry-instrumentation-tornado==0.61b0
-opentelemetry-instrumentation-wsgi==0.61b0
+opentelemetry-instrumentation-aiohttp-client==0.62b0
+opentelemetry-util-http==0.62b0
+opentelemetry-instrumentation-asgi==0.62b0
+opentelemetry-instrumentation-asyncpg==0.62b0
+opentelemetry-instrumentation-boto3sqs==0.62b0
+opentelemetry-instrumentation-celery==0.62b0
+opentelemetry-instrumentation-dbapi==0.62b0
+opentelemetry-instrumentation-django==0.62b0
+opentelemetry-instrumentation-elasticsearch==0.62b0
+opentelemetry-instrumentation-fastapi==0.62b0
+opentelemetry-instrumentation-falcon==0.62b0
+opentelemetry-instrumentation-flask==0.62b0
+opentelemetry-instrumentation-jinja2==0.62b0
+opentelemetry-instrumentation-mysql==0.62b0
+opentelemetry-instrumentation-psycopg2==0.62b0
+opentelemetry-instrumentation-pymemcache==0.62b0
+opentelemetry-instrumentation-pymongo==0.62b0
+opentelemetry-instrumentation-pymysql==0.62b0
+opentelemetry-instrumentation-pyramid==0.62b0
+opentelemetry-instrumentation-redis==0.62b0
+opentelemetry-instrumentation-requests==0.62b0
+opentelemetry-instrumentation-sqlalchemy==0.62b0
+opentelemetry-instrumentation-sqlite3==0.62b0
+opentelemetry-instrumentation-starlette==0.62b0
+opentelemetry-instrumentation-tornado==0.62b0
+opentelemetry-instrumentation-wsgi==0.62b0
 
 # Additional APM dependencies
-opentelemetry-instrumentation-botocore==0.61b0
-opentelemetry-instrumentation-logging==0.61b0
+opentelemetry-instrumentation-botocore==0.62b0
+opentelemetry-instrumentation-logging==0.62b0
 opentelemetry-sdk-extension-aws == 2.1.0

lambda/tests/requirements.txt

@@ -1,2 +1,2 @@
-opentelemetry-instrumentation-aws-lambda == 0.61b0
+opentelemetry-instrumentation-aws-lambda == 0.62b0
 opentelemetry-propagator-aws-xray == 1.0.2

pyproject.toml

@@ -36,14 +36,14 @@ classifiers = [
 ]
 requires-python = ">=3.9"
 dependencies = [
-    'opentelemetry-api == 1.40.0',
-    'opentelemetry-sdk == 1.40.0',
-    'opentelemetry-exporter-otlp == 1.40.0',
-    'opentelemetry-instrumentation == 0.61b0',
-    'opentelemetry-instrumentation-logging == 0.61b0',
+    'opentelemetry-api == 1.41.0',
+    'opentelemetry-sdk == 1.41.0',
+    'opentelemetry-exporter-otlp == 1.41.0',
+    'opentelemetry-instrumentation == 0.62b0',
+    'opentelemetry-instrumentation-logging == 0.62b0',
     'opentelemetry-sdk-extension-aws == 2.1.0',
     'opentelemetry-resource-detector-azure == 0.1.5',
-    'opentelemetry-resource-detector-containerid == 0.61b0',
+    'opentelemetry-resource-detector-containerid == 0.62b0',
 ]
 
 [project.urls]

tests/unit/test_oboe/test_oboe_sampler.py

@@ -75,12 +75,18 @@ def make_request_headers(options=MakeRequestHeaders()) -> RequestHeaders:
 def check_counters(sampler, counter_names):
     counters = set(counter_names)
     sampler.metric_reader.collect()
+    metrics_data = sampler.metric_reader.get_metrics_data()
     if counters == set():
-        assert sampler.metric_reader.get_metrics_data() is None
+        assert metrics_data is None
     else:
-        assert len(sampler.metric_reader.get_metrics_data().resource_metrics) == 1
-        assert len(sampler.metric_reader.get_metrics_data().resource_metrics[0].scope_metrics) == 1
-        scope_metrics_data = sampler.metric_reader.get_metrics_data().resource_metrics[0].scope_metrics[0].metrics
+        assert metrics_data is not None
+        assert len(metrics_data.resource_metrics) == 1
+        scope_metrics = metrics_data.resource_metrics[0].scope_metrics
+        sampling_scope_metrics = [
+            sm for sm in scope_metrics if sm.scope.name == "sw.apm.sampling.metrics"
+        ]
+        assert len(sampling_scope_metrics) == 1
+        scope_metrics_data = sampling_scope_metrics[0].metrics
         assert len(counter_names) == len(scope_metrics_data)
         for m in scope_metrics_data:
             assert m.name in counters