Merge branch 'main' into fix/opentelemetry-instrumentation-celery-bag…

…gage
open-telemetry · Jun 11, 2024 · f3a4f92 · f3a4f92
2 parents 015dc4b + da78275
commit f3a4f92
Show file tree

Hide file tree

Showing 153 changed files with 518 additions and 521 deletions.
diff --git a/.github/workflows/instrumentations_0.yml b/.github/workflows/instrumentations_0.yml
@@ -16,13 +16,14 @@ jobs:
       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, pypy3]
+        python-version: [py38, py39, py310, py311, py312, pypy3]
         package:
           # Do not add more instrumentations here, add them in instrumentations_1.yml.
           # The reason for this separation of instrumentations into more than one YAML file is
@@ -80,6 +81,12 @@ jobs:
             package: "sklearn"
           - python-version: py311
             package: "sklearn"
+          - python-version: py312
+            package: "sklearn"
+          - python-version: py312
+            package: "boto"
+          - python-version: py312
+            package: "kafka-python"
           - python-version: pypy3
             package: "aiopg"
           - python-version: pypy3

diff --git a/.github/workflows/instrumentations_1.yml b/.github/workflows/instrumentations_1.yml
@@ -16,13 +16,14 @@ jobs:
       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, pypy3]
+        python-version: [py38, py39, py310, py311, py312, pypy3]
         package:
           - "urllib"
           - "urllib3"
@@ -37,8 +38,6 @@ jobs:
           - "resource-detector-container"
         os: [ubuntu-20.04]
         exclude:
-          - python-version: py311
-            package: "prometheus-remote-write"
           - python-version: pypy3
             package: "prometheus-remote-write"
     steps:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -9,7 +9,7 @@ env:
   CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
 
 jobs:
-  lint-3_11:
+  lint-3_12:
     strategy:
       fail-fast: false  # ensures the entire test matrix is run, even if one permutation fails
       matrix:
@@ -75,10 +75,10 @@ jobs:
     steps:
       - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v4
-      - name: Set up Python 3.11
+      - name: Set up Python 3.12
         uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: 3.12
       - name: Install tox
         run: pip install tox
       - name: Cache tox environment

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@ repos:
     rev: 24.3.0
     hooks:
       - id: black
-        language_version: python3.11
+        language_version: python3.12
   - repo: https://github.com/pycqa/isort
     rev: 5.12.0
     hooks:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,10 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### 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))
+
 ### Fixed
 
 - `opentelemetry-instrumentation-httpx` Ensure httpx.get or httpx.request like methods are instrumented
   ([#2538](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2538))
+- Add Python 3.12 support
+  ([#2572](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2572))
 
 ## Version 1.25.0/0.46b0 (2024-05-31)
 
@@ -42,7 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2253](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2253))
 - `opentelemetry-instrumentation-pika` Instrumentation for `channel.consume()` (supported
   only for global, non channel specific instrumentation)
-  ([#2397](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2397)))
+  ([#2397](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2397))
 - `opentelemetry-processor-baggage` Initial release
   ([#2436](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2436))
 - `opentelemetry-processor-baggage` Add baggage key predicate
@@ -127,6 +134,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Version 1.22.0/0.43b0 (2023-12-14)
 
 ### Added
+
 - `opentelemetry-instrumentation-asyncio` Add support for asyncio
   ([#1919](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1943))
 - `opentelemetry-instrumentation` Added Otel semantic convention opt-in mechanism

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -13,6 +13,10 @@ on how to become a [**Member**](https://github.com/open-telemetry/community/blob
 [**Approver**](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
 and [**Maintainer**](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
 
+Before you can contribute, you will need to sign the [Contributor License Agreement](https://docs.linuxfoundation.org/lfx/easycla/contributors).
+
+Please also read the [OpenTelemetry Contributor Guide](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md).
+
 ## Index
 
 * [Find a Buddy and get Started Quickly](#find-a-buddy-and-get-started-quickly)
@@ -59,7 +63,7 @@ You can run `tox` with the following arguments:
 - `tox` to run all existing tox commands, including unit tests for all packages
   under multiple Python versions
 - `tox -e docs` to regenerate the API docs
-- `tox -e py311-test-instrumentation-aiopg` to e.g. run the aiopg instrumentation unit tests under a specific
+- `tox -e py312-test-instrumentation-aiopg` to e.g. run the aiopg instrumentation unit tests under a specific
   Python version
 - `tox -e spellcheck` to run a spellcheck on all the code
 - `tox -e lint-some-package` to run lint checks on `some-package`

diff --git a/_template/pyproject.toml b/_template/pyproject.toml
@@ -26,6 +26,7 @@ classifiers = [
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -7,7 +7,7 @@ mypy==0.931
 sphinx==7.1.2
 sphinx-rtd-theme==2.0.0rc4
 sphinx-autodoc-typehints==1.25.2
-pytest==7.1.3
+pytest==7.4.4
 pytest-cov==4.1.0
 readme-renderer==42.0
 bleach==4.1.0 # transient dependency for readme-renderer

diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml b/exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml
@@ -22,6 +22,8 @@ classifiers = [
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
   "protobuf ~= 4.21",

diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt b/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt
@@ -1,18 +1,16 @@
 asgiref==3.7.2
-attrs==23.2.0
 certifi==2024.2.2
 charset-normalizer==3.3.2
 cramjam==2.8.1
 Deprecated==1.2.14
-idna==3.6
+idna==3.7
 importlib-metadata==6.11.0
 iniconfig==2.0.0
-packaging==23.2
-pluggy==1.4.0
+packaging==24.0
+pluggy==1.5.0
 protobuf==4.25.3
-py==1.11.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 python-snappy==0.7.1
 requests==2.31.0

diff --git a/exporter/opentelemetry-exporter-richconsole/pyproject.toml b/exporter/opentelemetry-exporter-richconsole/pyproject.toml
@@ -22,6 +22,7 @@ classifiers = [
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",

diff --git a/exporter/opentelemetry-exporter-richconsole/test-requirements.txt b/exporter/opentelemetry-exporter-richconsole/test-requirements.txt
@@ -1,17 +1,15 @@
 asgiref==3.7.2
-attrs==23.2.0
 Deprecated==1.2.14
 flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 markdown-it-py==3.0.0
 mdurl==0.1.2
-packaging==23.2
-pluggy==1.4.0
-py==1.11.0
+packaging==24.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
 Pygments==2.17.2
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 rich==13.7.1
 tomli==2.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml
@@ -22,6 +22,7 @@ classifiers = [
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
   "opentelemetry-api ~= 1.5",

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt
@@ -1,18 +1,16 @@
 aio-pika==7.2.0
 aiormq==6.2.3
 asgiref==3.7.2
-attrs==23.2.0
 Deprecated==1.2.14
-idna==3.6
+idna==3.7
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
-packaging==23.2
+packaging==24.0
 pamqp==3.1.0
-pluggy==1.4.0
-py==1.11.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.9.0

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt
@@ -1,18 +1,16 @@
 aio-pika==8.3.0
 aiormq==6.6.4
 asgiref==3.7.2
-attrs==23.2.0
 Deprecated==1.2.14
-idna==3.6
+idna==3.7
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
-packaging==23.2
+packaging==24.0
 pamqp==3.2.1
-pluggy==1.4.0
-py==1.11.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.9.0

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
@@ -1,18 +1,16 @@
 aio-pika==9.0.5
 aiormq==6.7.1
 asgiref==3.7.2
-attrs==23.2.0
 Deprecated==1.2.14
-idna==3.6
+idna==3.7
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
-packaging==23.2
+packaging==24.0
 pamqp==3.2.1
-pluggy==1.4.0
-py==1.11.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.9.0

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt
@@ -1,18 +1,16 @@
 aio-pika==9.4.1
 aiormq==6.8.0
 asgiref==3.7.2
-attrs==23.2.0
 Deprecated==1.2.14
-idna==3.6
+idna==3.7
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
-packaging==23.2
+packaging==24.0
 pamqp==3.3.0
-pluggy==1.4.0
-py==1.11.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.9.0

diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml
@@ -22,6 +22,7 @@ classifiers = [
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",

diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt
@@ -2,7 +2,6 @@ aiohttp==3.9.3
 aiosignal==1.3.1
 asgiref==3.7.2
 async-timeout==4.0.3
-attrs==23.2.0
 blinker==1.7.0
 certifi==2024.2.2
 charset-normalizer==3.3.2
@@ -11,24 +10,23 @@ Deprecated==1.2.14
 Flask==3.0.2
 frozenlist==1.4.1
 http_server_mock==1.7
-idna==3.6
+idna==3.7
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 itsdangerous==2.1.2
-Jinja2==3.1.3
+Jinja2==3.1.4
 MarkupSafe==2.1.5
 multidict==6.0.5
-packaging==23.2
-pluggy==1.4.0
-py==1.11.0
+packaging==24.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 requests==2.31.0
 tomli==2.0.1
 typing_extensions==4.10.0
 urllib3==2.2.1
-Werkzeug==3.0.1
+Werkzeug==3.0.3
 wrapt==1.16.0
 yarl==1.9.4
 zipp==3.17.0

diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml
@@ -21,7 +21,8 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11"
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
     "opentelemetry-api ~= 1.12",

diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt
@@ -2,18 +2,16 @@ aiohttp==3.9.3
 aiosignal==1.3.1
 asgiref==3.7.2
 async-timeout==4.0.3
-attrs==23.2.0
 Deprecated==1.2.14
 frozenlist==1.4.1
-idna==3.6
+idna==3.7
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
-packaging==23.2
-pluggy==1.4.0
-py==1.11.0
+packaging==24.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-aiohttp==1.0.5
 pytest-asyncio==0.23.5
 pytest-benchmark==4.0.0