Merge branch 'main' into semcon-httplib-dev

Author: lzchen

.github/workflows/instrumentations_0.yml

@@ -126,5 +126,5 @@ jobs:
  .tox
  ~/.cache/pip
  key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
- - name: run tox
- run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-json=${{ env.RUN_MATRIX_COMBINATION }}-benchmark.json
+ - name: run pytest without --benchmark-skip
+ run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra

.github/workflows/instrumentations_1.yml

@@ -25,17 +25,18 @@ jobs:
  matrix:
  python-version: [py38, py39, py310, py311, py312, pypy3]
  package:
+ # Only add here packages that do not have benchmark tests
  - "urllib"
  - "urllib3"
  - "wsgi"
  - "distro"
  - "richconsole"
  - "psycopg"
  - "prometheus-remote-write"
- - "sdk-extension-aws"
- - "propagator-aws-xray"
  - "propagator-ot-trace"
+ - "resource-detector-azure"
  - "resource-detector-container"
+ - "util-http"
  os: [ubuntu-20.04]
  exclude:
  - python-version: pypy3
@@ -57,5 +58,5 @@ jobs:
  .tox
  ~/.cache/pip
  key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
- - name: run tox
- run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-json=${{ env.RUN_MATRIX_COMBINATION }}-benchmark.json
+ - name: run pytest without --benchmark-skip
+ run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra

.github/workflows/instrumentations_2.yml

@@ -0,0 +1,50 @@
+name: Contrib Repo Tests
+
+on:
+ push:
+ branches-ignore:
+ - 'release/*'
+ pull_request:
+env:
+ CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
+
+jobs:
+ instrumentations-2:
+ env:
+ # We use these variables to convert between tox and GHA version literals
+ py38: 3.8
+ py39: 3.9
+ py310: "3.10"
+ py311: "3.11"
+ py312: "3.12"
+ pypy3: pypy-3.8
+ RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}
+ runs-on: ${{ matrix.os }}
+ strategy:
+ fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
+ matrix:
+ python-version: [py38, py39, py310, py311, py312, pypy3]
+ package:
+ # Only add here packages that have benchmark tests
+ - "sdk-extension-aws"
+ - "propagator-aws-xray"
+ os: [ubuntu-20.04]
+ steps:
+ - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
+ uses: actions/checkout@v4
+ - name: Set up Python ${{ env[matrix.python-version] }}
+ uses: actions/setup-python@v5
+ with:
+ python-version: ${{ env[matrix.python-version] }}
+ - 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-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
+ - name: run pytest with --benchmark-skip
+ run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-skip

.github/workflows/lint.yml

@@ -68,8 +68,10 @@ jobs:
  - "processor-baggage"
  - "propagator-aws-xray"
  - "propagator-ot-trace"
+ - "resource-detector-azure"
  - "resource-detector-container"
  - "sdk-extension-aws"
+ - "util-http"
  os: [ubuntu-20.04]
  runs-on: ubuntu-20.04
  steps:

CHANGELOG.md

@@ -7,11 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-- `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-system-metrics` Permit to use psutil 6.0+.
- ([#2630](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2630))
-
 ### Added
 
 - `opentelemetry-instrumentation-httplib` Implement new semantic convention opt-in migration with stable http semantic conventions
@@ -22,13 +17,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  ([#2573](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2573))
 - `opentelemetry-instrumentation-confluent-kafka` Add support for version 2.4.0 of confluent_kafka
  ([#2616](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2616))
+- `opentelemetry-instrumentation-asyncpg` Add instrumentation to cursor based queries
+ ([#2501](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2501))
 - `opentelemetry-instrumentation-confluent-kafka` Add support for produce purge
  ([#2638](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2638))
+- `opentelemetry-instrumentation-httpx` Implement new semantic convention opt-in migration with stable http semantic conventions
+ ([#2631](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2631))
+- `opentelemetry-instrumentation-system-metrics` Permit to use psutil 6.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))
 
 ### Breaking changes
 
 - `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-fastapi`, `opentelemetry-instrumentation-starlette` Use `tracer` and `meter` of originating components instead of one from `asgi` middleware
  ([#2580](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2580))
+- Populate `{method}` as `HTTP` on `_OTHER` methods from scope
+ ([#2610](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2610))
+
+### Added
+
+- `opentelemetry-instrumentation-asgi` Implement new semantic convention opt-in with stable http semantic conventions
+ ([#2610](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2610))
 
 ### Fixed
 
@@ -40,6 +50,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  ([#2590](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2590))
 - Reference symbols from generated semantic conventions
  ([#2611](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2611))
+- `opentelemetry-instrumentation-psycopg` Bugfix: Handle empty statement.
+ ([#2644](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2644))
+- `opentelemetry-instrumentation-confluent-kafka` Confluent Kafka: Ensure consume span is ended when consumer is closed
+ ([#2640](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2640))
+- `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. 
+ ([#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))
+- `opentelemetry-instrumentation-django` Handle exceptions from request/response hooks
+ ([#2153](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2153))
+- `opentelemetry-instrumentation-asgi` Removed `NET_HOST_NAME` AND `NET_HOST_PORT` from active requests count attribute
+ ([#2610](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2610))
+
 
 ## Version 1.25.0/0.46b0 (2024-05-31)
 
@@ -147,7 +173,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  ([#2136](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2136))
 - `opentelemetry-resource-detector-azure` Suppress instrumentation for `urllib` call
  ([#2178](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2178))
-- AwsLambdaInstrumentor handles and re-raises function exception ([#2245](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2245))
+- AwsLambdaInstrumentor handles and re-raises function exception
+ ([#2245](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2245))
 
 ### Added
 

exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt

@@ -11,7 +11,6 @@ pluggy==1.5.0
 protobuf==4.25.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 python-snappy==0.7.1
 requests==2.32.3
 tomli==2.0.1

exporter/opentelemetry-exporter-richconsole/test-requirements.txt

@@ -10,7 +10,6 @@ pluggy==1.5.0
 py-cpuinfo==9.0.0
 Pygments==2.17.2
 pytest==7.4.4
-pytest-benchmark==4.0.0
 rich==13.7.1
 tomli==2.0.1
 typing_extensions==4.10.0

instrumentation/README.md

@@ -5,7 +5,7 @@
 | [opentelemetry-instrumentation-aiohttp-client](./opentelemetry-instrumentation-aiohttp-client) | aiohttp ~= 3.0 | No | experimental
 | [opentelemetry-instrumentation-aiohttp-server](./opentelemetry-instrumentation-aiohttp-server) | aiohttp ~= 3.0 | No | experimental
 | [opentelemetry-instrumentation-aiopg](./opentelemetry-instrumentation-aiopg) | aiopg >= 0.13.0, < 2.0.0 | No | experimental
-| [opentelemetry-instrumentation-asgi](./opentelemetry-instrumentation-asgi) | asgiref ~= 3.0 | No | experimental
+| [opentelemetry-instrumentation-asgi](./opentelemetry-instrumentation-asgi) | asgiref ~= 3.0 | Yes | migration
 | [opentelemetry-instrumentation-asyncio](./opentelemetry-instrumentation-asyncio) | asyncio | No | experimental
 | [opentelemetry-instrumentation-asyncpg](./opentelemetry-instrumentation-asyncpg) | asyncpg >= 0.12.0 | No | experimental
 | [opentelemetry-instrumentation-aws-lambda](./opentelemetry-instrumentation-aws-lambda) | aws_lambda | No | experimental
@@ -22,7 +22,7 @@
 | [opentelemetry-instrumentation-fastapi](./opentelemetry-instrumentation-fastapi) | fastapi ~= 0.58 | Yes | experimental
 | [opentelemetry-instrumentation-flask](./opentelemetry-instrumentation-flask) | flask >= 1.0 | Yes | migration
 | [opentelemetry-instrumentation-grpc](./opentelemetry-instrumentation-grpc) | grpcio ~= 1.27 | No | experimental
-| [opentelemetry-instrumentation-httpx](./opentelemetry-instrumentation-httpx) | httpx >= 0.18.0 | No | experimental
+| [opentelemetry-instrumentation-httpx](./opentelemetry-instrumentation-httpx) | httpx >= 0.18.0 | No | migration
 | [opentelemetry-instrumentation-jinja2](./opentelemetry-instrumentation-jinja2) | jinja2 >= 2.7, < 4.0 | No | experimental
 | [opentelemetry-instrumentation-kafka-python](./opentelemetry-instrumentation-kafka-python) | kafka-python >= 2.0 | No | experimental
 | [opentelemetry-instrumentation-logging](./opentelemetry-instrumentation-logging) | logging | No | experimental

instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt

@@ -11,7 +11,6 @@ pamqp==3.1.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.9.0
 wrapt==1.16.0

instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt

@@ -11,7 +11,6 @@ pamqp==3.2.1
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.9.0
 wrapt==1.16.0