Merge branch 'main' into logging-silence-out-of-spec-attributes

Author: xrmx

CHANGELOG.md

@@ -29,16 +29,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3819](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3819))
 - `opentelemetry-instrumentation-system-metrics`: Add support for the `OTEL_PYTHON_SYSTEM_METRICS_EXCLUDED_METRICS` environment variable
   ([#3959](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3959))
-- `opentelemetry-instrumentation-httpx`: add ability to capture custom headers 
+- `opentelemetry-instrumentation-httpx`: add ability to capture custom headers
   ([#4047](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4047))
 - `opentelemetry-instrumentation-urllib3`: add ability to capture custom headers
   ([#4050](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4050))
 - `opentelemetry-instrumentation-urllib`: add ability to capture custom headers
   ([#4051](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4051))
+- `opentelemetry-instrumentation-confluent-kafka`: Increase confluent-kafka upper bound to support newer versions (2.13.0)
+  ([#4099](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4099))
 - `opentelemetry-instrumentation-aiohttp-server` Implement new semantic convention opt-in migration
   ([#3980](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3980))
 - `opentelemetry-instrumentation`: add database stability attribute setters in `_semconv` utilities
   ([#4108](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4108))
+- `opentelemetry-instrumentation-tornado`: Implement new semantic convention opt-in migration
+  ([#3993](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3993))
+- `opentelemetry-instrumentation-pyramid` Implement new semantic convention opt-in migration
+  ([#3982](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3982))
 
 ### Fixed
 

CONTRIBUTING.md

@@ -122,6 +122,12 @@ Some packages may require additional system-wide dependencies to be installed. F
 
 For `docs` building, you may need to install `mysql-client` and other required dependencies as necessary. Ensure the Python version used in your local setup matches the version used in the [CI](./.github/workflows/) to maintain compatibility when building the documentation.
 
+If you are using `tox-uv` for tests and have issues with resolving OpenTelemetry dependencies try:
+
+```sh
+uv sync --refresh
+```
+
 ### Benchmarks
 
 Some packages have benchmark tests. To run them, run `tox -f benchmark`. Benchmark tests use `pytest-benchmark` and they output a table with results to the console.

docs-requirements.txt

@@ -24,7 +24,7 @@ botocore~=1.0
 boto3~=1.0
 cassandra-driver~=3.25
 celery>=4.0
-confluent-kafka>= 1.8.2,<= 2.11.0
+confluent-kafka>= 1.8.2,<= 2.13.0
 elasticsearch>=6.0,<9.0
 flask~=2.0
 falcon~=2.0

instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/span_manager.py

@@ -20,7 +20,7 @@
     gen_ai_attributes as GenAI,
 )
 from opentelemetry.semconv.attributes import (
-    error_attributes as ErrorAttributes,
+    error_attributes,
 )
 from opentelemetry.trace import Span, SpanKind, Tracer, set_span_in_context
 from opentelemetry.trace.status import Status, StatusCode
@@ -112,6 +112,6 @@ def handle_error(self, error: BaseException, run_id: UUID):
             return
         span.set_status(Status(StatusCode.ERROR, str(error)))
         span.set_attribute(
-            ErrorAttributes.ERROR_TYPE, type(error).__qualname__
+            error_attributes.ERROR_TYPE, type(error).__qualname__
         )
         self.end_span(run_id)

instrumentation/README.md

@@ -17,7 +17,7 @@
 | [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
-| [opentelemetry-instrumentation-confluent-kafka](./opentelemetry-instrumentation-confluent-kafka) | confluent-kafka >= 1.8.2, <= 2.11.0 | No | development
+| [opentelemetry-instrumentation-confluent-kafka](./opentelemetry-instrumentation-confluent-kafka) | confluent-kafka >= 1.8.2, <= 2.13.0 | No | development
 | [opentelemetry-instrumentation-dbapi](./opentelemetry-instrumentation-dbapi) | dbapi | No | development
 | [opentelemetry-instrumentation-django](./opentelemetry-instrumentation-django) | django >= 2.0 | Yes | development
 | [opentelemetry-instrumentation-elasticsearch](./opentelemetry-instrumentation-elasticsearch) | elasticsearch >= 6.0 | No | development
@@ -38,7 +38,7 @@
 | [opentelemetry-instrumentation-pymongo](./opentelemetry-instrumentation-pymongo) | pymongo >= 3.1, < 5.0 | No | development
 | [opentelemetry-instrumentation-pymssql](./opentelemetry-instrumentation-pymssql) | pymssql >= 2.1.5, < 3 | No | development
 | [opentelemetry-instrumentation-pymysql](./opentelemetry-instrumentation-pymysql) | PyMySQL < 2 | No | development
-| [opentelemetry-instrumentation-pyramid](./opentelemetry-instrumentation-pyramid) | pyramid >= 1.7 | Yes | development
+| [opentelemetry-instrumentation-pyramid](./opentelemetry-instrumentation-pyramid) | pyramid >= 1.7 | Yes | migration
 | [opentelemetry-instrumentation-redis](./opentelemetry-instrumentation-redis) | redis >= 2.6 | No | development
 | [opentelemetry-instrumentation-remoulade](./opentelemetry-instrumentation-remoulade) | remoulade >= 0.50 | No | development
 | [opentelemetry-instrumentation-requests](./opentelemetry-instrumentation-requests) | requests ~= 2.0 | Yes | migration
@@ -47,7 +47,7 @@
 | [opentelemetry-instrumentation-starlette](./opentelemetry-instrumentation-starlette) | starlette >= 0.13 | Yes | development
 | [opentelemetry-instrumentation-system-metrics](./opentelemetry-instrumentation-system-metrics) | psutil >= 5 | No | development
 | [opentelemetry-instrumentation-threading](./opentelemetry-instrumentation-threading) | threading | No | development
-| [opentelemetry-instrumentation-tornado](./opentelemetry-instrumentation-tornado) | tornado >= 5.1.1 | Yes | development
+| [opentelemetry-instrumentation-tornado](./opentelemetry-instrumentation-tornado) | tornado >= 5.1.1 | Yes | migration
 | [opentelemetry-instrumentation-tortoiseorm](./opentelemetry-instrumentation-tortoiseorm) | tortoise-orm >= 0.17.0 | No | development
 | [opentelemetry-instrumentation-urllib](./opentelemetry-instrumentation-urllib) | urllib | Yes | migration
 | [opentelemetry-instrumentation-urllib3](./opentelemetry-instrumentation-urllib3) | urllib3 >= 1.0.0, < 3.0.0 | Yes | migration

instrumentation/opentelemetry-instrumentation-asyncio/tests/test_asyncio_future_cancellation.py

@@ -36,25 +36,20 @@ async def future_cancelled():
             asyncio.run(future_cancelled())
         except asyncio.CancelledError as exc:
             self.assertEqual(isinstance(exc, asyncio.CancelledError), True)
-        spans = self.memory_exporter.get_finished_spans()
+        spans = self.get_finished_spans()
         self.assertEqual(len(spans), 2)
         self.assertEqual(spans[0].name, "root")
         self.assertEqual(spans[1].name, "asyncio future")
 
-        metrics = (
-            self.memory_metrics_reader.get_metrics_data()
-            .resource_metrics[0]
-            .scope_metrics[0]
-            .metrics
-        )
+        metrics = self.get_sorted_metrics()
         self.assertEqual(len(metrics), 2)
 
-        self.assertEqual(metrics[0].name, "asyncio.process.duration")
+        self.assertEqual(metrics[0].name, "asyncio.process.created")
         self.assertEqual(
             metrics[0].data.data_points[0].attributes["state"], "cancelled"
         )
 
-        self.assertEqual(metrics[1].name, "asyncio.process.created")
+        self.assertEqual(metrics[1].name, "asyncio.process.duration")
         self.assertEqual(
             metrics[1].data.data_points[0].attributes["state"], "cancelled"
         )

instrumentation/opentelemetry-instrumentation-celery/tests/test_metrics.py

@@ -71,43 +71,22 @@ def test_basic_metric(self):
     def test_metric_uninstrument(self):
         CeleryInstrumentor().instrument()
 
-        self.get_metrics()
+        metrics = self.get_metrics()
         self.assertEqual(
-            (
-                self.memory_metrics_reader.get_metrics_data()
-                .resource_metrics[0]
-                .scope_metrics[0]
-                .metrics[0]
-                .data.data_points[0]
-                .bucket_counts[1]
-            ),
+            metrics[0].data.data_points[0].bucket_counts[1],
             1,
         )
 
-        self.get_metrics()
+        metrics = self.get_metrics()
         self.assertEqual(
-            (
-                self.memory_metrics_reader.get_metrics_data()
-                .resource_metrics[0]
-                .scope_metrics[0]
-                .metrics[0]
-                .data.data_points[0]
-                .bucket_counts[1]
-            ),
+            metrics[0].data.data_points[0].bucket_counts[1],
             2,
         )
 
         CeleryInstrumentor().uninstrument()
 
-        self.get_metrics()
+        metrics = self.get_metrics()
         self.assertEqual(
-            (
-                self.memory_metrics_reader.get_metrics_data()
-                .resource_metrics[0]
-                .scope_metrics[0]
-                .metrics[0]
-                .data.data_points[0]
-                .bucket_counts[1]
-            ),
+            metrics[0].data.data_points[0].bucket_counts[1],
             2,
         )

instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml

@@ -32,7 +32,7 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = [
-  "confluent-kafka >= 1.8.2, <= 2.11.0",
+  "confluent-kafka >= 1.8.2, <= 2.13.0",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

instrumentation/opentelemetry-instrumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/package.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-_instruments = ("confluent-kafka >= 1.8.2, <= 2.11.0",)
+_instruments = ("confluent-kafka >= 1.8.2, <= 2.13.0",)

instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt

@@ -1,5 +1,5 @@
 asgiref==3.8.1
-confluent-kafka==2.11.0
+confluent-kafka==2.13.0
 Deprecated==1.2.14
 iniconfig==2.0.0
 packaging==24.0