Merge branch 'main' into uv

Author: emdneto

.github/workflows/instrumentations_0.yml

@@ -66,7 +66,6 @@ jobs:
           - "redis"
           - "remoulade"
           - "requests"
-          - "sklearn"
           - "sqlalchemy"
           - "sqlite3"
           - "starlette"
@@ -75,14 +74,6 @@ jobs:
           - "tortoiseorm"
         os: [ubuntu-20.04]
         exclude:
-          - python-version: py39
-            package: "sklearn"
-          - python-version: py310
-            package: "sklearn"
-          - python-version: py311
-            package: "sklearn"
-          - python-version: py312
-            package: "sklearn"
           - python-version: py312
             package: "boto"
           - python-version: py312
@@ -103,8 +94,6 @@ jobs:
             package: "remoulade"
           - python-version: pypy3
             package: "requests"
-          - python-version: pypy3
-            package: "sklearn"
           - python-version: pypy3
             package: "confluent-kafka"
           - python-version: pypy3

.github/workflows/lint.yml

@@ -93,31 +93,3 @@ jobs:
           key: v7-build-tox-cache-${{ matrix.package }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
       - name: run tox
         run: tox -e lint-${{ matrix.package }}
-
-  lint-3_8:
-    strategy:
-      fail-fast: false  # ensures the entire test matrix is run, even if one permutation fails
-      matrix:
-        package:
-          - "instrumentation-sklearn"
-        os: [ubuntu-20.04]
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.8
-      - name: Install tox
-        run: pip install tox
-      - name: Cache tox environment
-        # Preserves .tox directory between runs for faster installs
-        uses: actions/cache@v4
-        with:
-          path: |
-            .tox
-            ~/.cache/pip
-          key: v7-build-tox-cache-${{ matrix.package }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
-      - name: run tox
-        run: tox -e lint-${{ matrix.package }}

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- `opentelemetry-instrumentation-sklearn` Deprecated the sklearn instrumentation
+  ([#2708](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2708))
 - `opentelemetry-instrumentation-pyramid` Record exceptions raised when serving a request
   ([#2622](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2622))
 - `opentelemetry-sdk-extension-aws` Add AwsXrayLambdaPropagator
@@ -29,8 +31,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2630](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2630))
 - `opentelemetry-instrumentation-system-metrics` Add support for capture open file descriptors
   ([#2652](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2652))
+- `opentelemetry-instrumentation-httpx` Add support for instrument client with proxy
+  ([#2664](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2664))
 - `opentelemetry-instrumentation-aiohttp-client` Implement new semantic convention opt-in migration
   ([#2673](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2673))
+- `opentelemetry-instrumentation-django` Add `http.target` to Django duration metric attributes
+  ([#2624](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2624))
 
 ### Breaking changes
 
@@ -59,7 +65,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `opentelemetry-instrumentation-asgi` Fix generation of `http.target` and `http.url` attributes for ASGI apps
   using sub apps
   ([#2477](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2477))
-- `opentelemetry-instrumentation-aws-lambda` Bugfix: AWS Lambda event source key incorrect for SNS in instrumentation library. 
+- `opentelemetry-instrumentation-aws-lambda` Bugfix: AWS Lambda event source key incorrect for SNS in instrumentation library.
   ([#2612](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2612))
 - `opentelemetry-instrumentation-asyncio` instrumented `asyncio.wait_for` properly raises `asyncio.TimeoutError` as expected
   ([#2637](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2637))

eachdist.ini

@@ -54,7 +54,6 @@ packages=
 [lintroots]
 extraroots=examples/*,scripts/
 subglob=*.py,tests/,test/,src/*,examples/*
-ignore=sklearn
 
 [testroots]
 extraroots=examples/*,tests/

instrumentation/README.md

@@ -38,7 +38,6 @@
 | [opentelemetry-instrumentation-redis](./opentelemetry-instrumentation-redis) | redis >= 2.6 | No | experimental
 | [opentelemetry-instrumentation-remoulade](./opentelemetry-instrumentation-remoulade) | remoulade >= 0.50 | No | experimental
 | [opentelemetry-instrumentation-requests](./opentelemetry-instrumentation-requests) | requests ~= 2.0 | Yes | migration
-| [opentelemetry-instrumentation-sklearn](./opentelemetry-instrumentation-sklearn) | scikit-learn ~= 0.24.0 | No | experimental
 | [opentelemetry-instrumentation-sqlalchemy](./opentelemetry-instrumentation-sqlalchemy) | sqlalchemy | Yes | experimental
 | [opentelemetry-instrumentation-sqlite3](./opentelemetry-instrumentation-sqlite3) | sqlite3 | No | experimental
 | [opentelemetry-instrumentation-starlette](./opentelemetry-instrumentation-starlette) | starlette ~= 0.13.0 | Yes | experimental

instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt

@@ -4,7 +4,6 @@ async-timeout==4.0.3
 Deprecated==1.2.14
 importlib-metadata==6.11.0
 iniconfig==2.0.0
-install==1.3.5
 packaging==24.0
 pluggy==1.5.0
 psycopg2-binary==2.9.9

instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/middleware/otel_middleware.py

@@ -315,6 +315,12 @@ def process_view(self, request, view_func, *args, **kwargs):
                     route = getattr(match, "route", None)
                     if route:
                         span.set_attribute(SpanAttributes.HTTP_ROUTE, route)
+                        duration_attrs = request.META[
+                            self._environ_duration_attr_key
+                        ]
+                        # Metrics currently use the 1.11.0 schema, which puts the route in `http.target`.
+                        # TODO: use `http.route` when the user sets `OTEL_SEMCONV_STABILITY_OPT_IN`.
+                        duration_attrs[SpanAttributes.HTTP_TARGET] = route
 
     def process_exception(self, request, exception):
         if self._excluded_urls.url_disabled(request.build_absolute_uri("?")):

instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py

@@ -480,7 +480,8 @@ def test_wsgi_metrics(self):
         ]
         _recommended_attrs = {
             "http.server.active_requests": _active_requests_count_attrs,
-            "http.server.duration": _duration_attrs,
+            "http.server.duration": _duration_attrs
+            | {SpanAttributes.HTTP_TARGET},
         }
         start = default_timer()
         for _ in range(3):

instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry/instrumentation/httpx/__init__.py

@@ -640,6 +640,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         self._original_transport = self._transport
+        self._original_mounts = self._mounts.copy()
         self._is_instrumented_by_opentelemetry = True
 
         self._transport = SyncOpenTelemetryTransport(
@@ -648,6 +649,21 @@ def __init__(self, *args, **kwargs):
             request_hook=_InstrumentedClient._request_hook,
             response_hook=_InstrumentedClient._response_hook,
         )
+        self._mounts.update(
+            {
+                url_pattern: (
+                    SyncOpenTelemetryTransport(
+                        transport,
+                        tracer_provider=_InstrumentedClient._tracer_provider,
+                        request_hook=_InstrumentedClient._request_hook,
+                        response_hook=_InstrumentedClient._response_hook,
+                    )
+                    if transport is not None
+                    else transport
+                )
+                for url_pattern, transport in self._original_mounts.items()
+            }
+        )
 
 
 class _InstrumentedAsyncClient(httpx.AsyncClient):
@@ -659,6 +675,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         self._original_transport = self._transport
+        self._original_mounts = self._mounts.copy()
         self._is_instrumented_by_opentelemetry = True
 
         self._transport = AsyncOpenTelemetryTransport(
@@ -668,6 +685,22 @@ def __init__(self, *args, **kwargs):
             response_hook=_InstrumentedAsyncClient._response_hook,
         )
 
+        self._mounts.update(
+            {
+                url_pattern: (
+                    AsyncOpenTelemetryTransport(
+                        transport,
+                        tracer_provider=_InstrumentedAsyncClient._tracer_provider,
+                        request_hook=_InstrumentedAsyncClient._request_hook,
+                        response_hook=_InstrumentedAsyncClient._response_hook,
+                    )
+                    if transport is not None
+                    else transport
+                )
+                for url_pattern, transport in self._original_mounts.items()
+            }
+        )
+
 
 class HTTPXClientInstrumentor(BaseInstrumentor):
     # pylint: disable=protected-access,attribute-defined-outside-init
@@ -752,6 +785,7 @@ def instrument_client(
         if not client._is_instrumented_by_opentelemetry:
             if isinstance(client, httpx.Client):
                 client._original_transport = client._transport
+                client._original_mounts = client._mounts.copy()
                 transport = client._transport or httpx.HTTPTransport()
                 client._transport = SyncOpenTelemetryTransport(
                     transport,
@@ -760,15 +794,47 @@ def instrument_client(
                     response_hook=response_hook,
                 )
                 client._is_instrumented_by_opentelemetry = True
+                client._mounts.update(
+                    {
+                        url_pattern: (
+                            SyncOpenTelemetryTransport(
+                                transport,
+                                tracer_provider=tracer_provider,
+                                request_hook=request_hook,
+                                response_hook=response_hook,
+                            )
+                            if transport is not None
+                            else transport
+                        )
+                        for url_pattern, transport in client._original_mounts.items()
+                    }
+                )
+
             if isinstance(client, httpx.AsyncClient):
                 transport = client._transport or httpx.AsyncHTTPTransport()
+                client._original_mounts = client._mounts.copy()
                 client._transport = AsyncOpenTelemetryTransport(
                     transport,
                     tracer_provider=tracer_provider,
                     request_hook=request_hook,
                     response_hook=response_hook,
                 )
                 client._is_instrumented_by_opentelemetry = True
+                client._mounts.update(
+                    {
+                        url_pattern: (
+                            AsyncOpenTelemetryTransport(
+                                transport,
+                                tracer_provider=tracer_provider,
+                                request_hook=request_hook,
+                                response_hook=response_hook,
+                            )
+                            if transport is not None
+                            else transport
+                        )
+                        for url_pattern, transport in client._original_mounts.items()
+                    }
+                )
         else:
             _logger.warning(
                 "Attempting to instrument Httpx client while already instrumented"
@@ -787,6 +853,9 @@ def uninstrument_client(
             client._transport = client._original_transport
             del client._original_transport
             client._is_instrumented_by_opentelemetry = False
+        if hasattr(client, "_original_mounts"):
+            client._mounts = client._original_mounts.copy()
+            del client._original_mounts
         else:
             _logger.warning(
                 "Attempting to uninstrument Httpx "