Merge branch 'main' into exclude-opamp-dir-from-release

xrmx · web-flow · commit ddafd0cea82d · 2026-06-17T10:52:46.000+02:00
diff --git a/.changelog/4601.added b/.changelog/4601.added
@@ -0,0 +1 @@
+`opentelemetry-instrumentation-botocore`: loosen aiobotocore version constraints to allow for 3.x
diff --git a/.changelog/4666.fixed b/.changelog/4666.fixed
@@ -0,0 +1 @@
+`opentelemetry-instrumentation-tornado`: reduce cardinality of `http.target` metrics attribute with old semantic conventions
diff --git a/instrumentation-genai/opentelemetry-instrumentation-google-genai/CHANGELOG.md b/instrumentation-genai/opentelemetry-instrumentation-google-genai/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -Add `gen_ai.usage.reasoning.output_tokens` attribute to capture thinking tokens on spans/events when the experimental sem conv flag is set. Add thinking tokens to output tokens. ([#4313](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4313))
 -Add `gen_ai.usage.cache_read.input_tokens` attribute to capture cached tokens on spans/events when the experimental sem conv flag is set. ([#4313](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4313))
 
+## Version 0.7b1 (2026-05-19)
 ## Version 0.7b0 (2026-02-20)
 - Fix bug in how tokens are counted when using the streaming `generateContent` method.  ([#4152](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4152)).
 - Add `gen_ai.tool.definitions` attribute to `gen_ai.client.inference.operation.details` log event ([#4142](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4142)).
diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/callback_handler.py b/instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/callback_handler.py
@@ -105,7 +105,7 @@ def on_chat_model_start(
         for sub_messages in messages:
             for message in sub_messages:
                 # Cast to Any to avoid type checking issues with LangChain's complex content type
-                raw_content: Any = message.content  # type: ignore[misc]
+                raw_content: Any = message.content
                 role = message.type
                 parts: list[Text] = []
 
diff --git a/instrumentation/README.md b/instrumentation/README.md
@@ -12,7 +12,7 @@
 | [opentelemetry-instrumentation-asyncpg](./opentelemetry-instrumentation-asyncpg) | asyncpg >= 0.12.0 | No | development
 | [opentelemetry-instrumentation-aws-lambda](./opentelemetry-instrumentation-aws-lambda) | aws_lambda | No | development
 | [opentelemetry-instrumentation-boto3sqs](./opentelemetry-instrumentation-boto3sqs) | boto3 ~= 1.0 | No | development
-| [opentelemetry-instrumentation-botocore](./opentelemetry-instrumentation-botocore) | botocore~=1.0,aiobotocore~=2.0 | No | development
+| [opentelemetry-instrumentation-botocore](./opentelemetry-instrumentation-botocore) | botocore~=1.0,aiobotocore>=2.0,<4.0 | No | development
 | [opentelemetry-instrumentation-cassandra](./opentelemetry-instrumentation-cassandra) | cassandra-driver ~= 3.25,scylla-driver ~= 3.25 | No | development
 | [opentelemetry-instrumentation-celery](./opentelemetry-instrumentation-celery) | celery >= 4.0, < 6.0 | No | development
 | [opentelemetry-instrumentation-click](./opentelemetry-instrumentation-click) | click >= 8.1.3, < 9.0.0 | No | development
diff --git a/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml b/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml
@@ -36,7 +36,7 @@ dependencies = [
 instruments = []
 instruments-any = [
   "botocore ~= 1.0",
-  "aiobotocore ~= 2.0",
+  "aiobotocore >= 2.0, < 4.0"
 ]
 
 [project.entry-points.opentelemetry_instrumentor]
diff --git a/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/package.py b/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/package.py
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 _instruments_botocore = ("botocore~=1.0",)
-_instruments_aiobotocore = ("aiobotocore~=2.0",)
+_instruments_aiobotocore = ("aiobotocore>=2.0,<4.0",)
 
 _instruments = ()
 _instruments_any = (*_instruments_botocore, *_instruments_aiobotocore)
diff --git a/instrumentation/opentelemetry-instrumentation-botocore/test-requirements-3.txt b/instrumentation/opentelemetry-instrumentation-botocore/test-requirements-3.txt
@@ -1,9 +1,8 @@
 asgiref==3.8.1
 aws-xray-sdk==2.12.1
-boto3==1.35.16
-botocore==1.35.16
-aiobotocore==2.15.0
-aiohttp==3.9.3 #TODO: https://github.com/open-telemetry/opentelemetry-python-contrib/issues/4645 - fix issue with aiohttp in a better way.
+boto3==1.43.0
+botocore==1.43.0
+aiobotocore==3.7.0
 certifi==2024.7.4
 cffi==1.17.0
 charset-normalizer==3.3.2
@@ -27,10 +26,10 @@ pytz==2024.1
 PyYAML==6.0.1
 requests==2.33.1
 responses==0.25.0
-s3transfer==0.10.0
+s3transfer==0.17.0
 six==1.16.0
 tomli==2.0.1
-typing_extensions==4.12.2
+typing_extensions==4.15.0
 urllib3==1.26.19
 Werkzeug==3.0.6
 wrapt==1.16.0
diff --git a/instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py b/instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py
@@ -4,6 +4,7 @@
 import os
 from importlib.metadata import EntryPoint
 from unittest.mock import ANY, Mock, call, patch
+from urllib.parse import urlparse
 
 import botocore.session
 from botocore.exceptions import ParamValidationError
@@ -342,7 +343,7 @@ def test_sts_client(self):
         span = self.assert_only_span()
         expected = self._default_span_attributes("STS", "GetCallerIdentity")
         expected["aws.request_id"] = ANY
-        expected[SERVER_ADDRESS] = "sts.amazonaws.com"
+        expected[SERVER_ADDRESS] = urlparse(sts.meta.endpoint_url).hostname
         # check for exact attribute set to make sure not to leak any sts secrets
         self.assertEqual(expected, dict(span.attributes))
 
diff --git a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py
@@ -838,7 +838,7 @@ def _record_prepare_metrics(server_histograms, handler, sem_conv_opt_in_mode):
             request_size, attributes=metric_attributes_old
         )
         active_requests_attributes_old = (
-            _create_active_requests_attributes_old(handler.request)
+            _create_active_requests_attributes_old(handler)
         )
         server_histograms["active_requests"].add(
             1, attributes=active_requests_attributes_old
@@ -890,7 +890,7 @@ def _record_on_finish_metrics(
         )
 
         active_requests_attributes_old = (
-            _create_active_requests_attributes_old(handler.request)
+            _create_active_requests_attributes_old(handler)
         )
         server_histograms["active_requests"].add(
             -1, attributes=active_requests_attributes_old
@@ -919,15 +919,21 @@ def _record_on_finish_metrics(
             )
 
 
-def _create_active_requests_attributes_old(request):
+def _create_active_requests_attributes_old(handler):
     """Create metric attributes for active requests using old semconv."""
+    request = handler.request
     metric_attributes = {
         HTTP_METHOD: request.method,
         HTTP_SCHEME: request.protocol,
         HTTP_FLAVOR: request.version,
         HTTP_HOST: request.host,
     }
-    metric_attributes[HTTP_TARGET] = request.path
+
+    if rule := find_matched_rule(handler):
+        route = route_from_rule(rule, handler)
+
+        if route is not None:
+            metric_attributes[HTTP_TARGET] = route
     return metric_attributes
 
 
@@ -944,7 +950,7 @@ def _create_active_requests_attributes_new(request):
 
 def _create_metric_attributes_old(handler):
     """Create metric attributes using old semconv."""
-    metric_attributes = _create_active_requests_attributes_old(handler.request)
+    metric_attributes = _create_active_requests_attributes_old(handler)
     metric_attributes[HTTP_STATUS_CODE] = handler.get_status()
     return metric_attributes
 
diff --git a/instrumentation/opentelemetry-instrumentation-tornado/tests/test_metrics_instrumentation.py b/instrumentation/opentelemetry-instrumentation-tornado/tests/test_metrics_instrumentation.py
@@ -3,6 +3,7 @@
 
 
 import asyncio
+import platform
 from timeit import default_timer
 from unittest.mock import patch
 
@@ -238,34 +239,41 @@ async def test_metrics_concurrent_requests(self):
         )
 
         # Server and client durations should be similar (adjusting for msecs vs secs)
+
+        # Give bigger delta for PyPy coarse timers
+        def metrics_delta(delta):
+            return (
+                0.05 if platform.python_implementation() == "PyPy" else delta
+            )
+
         self.assertAlmostEqual(
             abs(
                 req1_server_duration_data_point.sum / 1000.0
                 - req1_client_duration_data_point.sum
             ),
             0.0,
-            delta=0.01,
+            delta=metrics_delta(0.01),
         )
         self.assertAlmostEqual(
             abs(
                 req2_server_duration_data_point.sum / 1000.0
                 - req2_client_duration_data_point.sum
             ),
             0.0,
-            delta=0.02,
+            delta=metrics_delta(0.02),
         )
 
         # Make sure duration is roughly equivalent to expected (req1/slow) should be around 1 second
         self.assertAlmostEqual(
             req1_server_duration_data_point.sum / 1000.0,
             1.0,
-            delta=0.1,
+            delta=metrics_delta(0.1),
             msg="Should have been about 1 second",
         )
         self.assertAlmostEqual(
             req2_server_duration_data_point.sum / 1000.0,
             0.0,
-            delta=0.1,
+            delta=metrics_delta(0.1),
             msg="Should have been really short",
         )
 
@@ -373,8 +381,8 @@ def test_client_span_attributes_old_semconv(self):
 
     def test_server_metrics_old_semconv(self):
         """Test that server metrics use old semantic conventions by default."""
-        response = self.fetch("/")
-        self.assertEqual(response.code, 201)
+        response = self.fetch("/parametrized/hello/?foo=bar")
+        self.assertEqual(response.code, 200)
         metrics = self.get_sorted_metrics(SCOPE)
 
         # Find old semconv metrics
@@ -390,6 +398,15 @@ def test_server_metrics_old_semconv(self):
                 self.assertEqual(metric.unit, "ms")
             elif metric.name == "http.server.request.duration":
                 new_duration_found = True
+
+            for data_point in metric.data.data_points:
+                attributes = dict(data_point.attributes)
+
+                self.assertIn(HTTP_TARGET, attributes)
+                self.assertEqual(
+                    attributes[HTTP_TARGET], "/parametrized/{message}/"
+                )
+
         self.assertTrue(old_duration_found, "Old semconv metric not found")
         self.assertFalse(
             new_duration_found, "New semconv metric should not be present"
diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
@@ -54,7 +54,7 @@
         "instrumentation": "opentelemetry-instrumentation-botocore==0.64b0.dev",
     },
     {
-        "library": "aiobotocore ~= 2.0",
+        "library": "aiobotocore >= 2.0, < 4.0",
         "instrumentation": "opentelemetry-instrumentation-botocore==0.64b0.dev",
     },
     {
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+`opentelemetry-instrumentation-botocore`: loosen aiobotocore version constraints to allow for 3.x
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+`opentelemetry-instrumentation-tornado`: reduce cardinality of `http.target` metrics attribute with old semantic conventions
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ dependencies = [`
`36`	`36`	`instruments = []`
`37`	`37`	`instruments-any = [`
`38`	`38`	`"botocore ~= 1.0",`
`39`		`- "aiobotocore ~= 2.0",`
	`39`	`+ "aiobotocore >= 2.0, < 4.0"`
`40`	`40`	`]`
`41`	`41`
`42`	`42`	`[project.entry-points.opentelemetry_instrumentor]`