Merge branch 'open-telemetry:main' into issue_2555

open-telemetry · Jun 10, 2024 · 4d9613e · 4d9613e
2 parents b60cfc8 + 3511ed1
commit 4d9613e
Show file tree

Hide file tree

Showing 214 changed files with 894 additions and 985 deletions.
diff --git a/.github/workflows/instrumentations_0.yml b/.github/workflows/instrumentations_0.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2
+  CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
 
 jobs:
   instrumentations-0:

diff --git a/.github/workflows/instrumentations_1.yml b/.github/workflows/instrumentations_1.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2
+  CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
 
 jobs:
   instrumentations-1:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2
+  CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
 
 jobs:
   lint-3_11:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -81,12 +81,14 @@ jobs:
       # rejected by pypi (e.g "3 - Beta"). This would cause a failure during the
       # middle of the package upload causing the action to fail, and certain packages
       # might have already been updated, this would be bad.
-      - name: Publish to TestPyPI
-        env:
-          TWINE_USERNAME: '__token__'
-          TWINE_PASSWORD: ${{ secrets.test_pypi_token }}
-        run: |
-          twine upload --repository testpypi --skip-existing --verbose dist/*
+      # EDIT: 5/31/2024 - TestPypi now requires a verified email. Commenting out as a temporary measure
+      # until we found TestPypi credentials.
+      # - name: Publish to TestPyPI
+      #   env:
+      #     TWINE_USERNAME: '__token__'
+      #     TWINE_PASSWORD: ${{ secrets.test_pypi_token }}
+      #   run: |
+      #     twine upload --repository testpypi --skip-existing --verbose dist/*
 
       - name: Publish to PyPI
         env:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 47d5ad7aae5aef31238ca66e55dc550b307c7b35
+  CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
 
 jobs:
   misc:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### 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))
+
+## Version 1.25.0/0.46b0 (2024-05-31)
+
+### Breaking changes
+
 - Add return statement to Confluent kafka Producer poll() and flush() calls when instrumented by ConfluentKafkaInstrumentor().instrument_producer() ([#2527](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2527))
 - Rename `type` attribute to `asgi.event.type` in `opentelemetry-instrumentation-asgi`
   ([#2300](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2300))
@@ -20,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2425](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2425))
 - `opentelemetry-instrumentation-flask` Add `http.method` to `span.name`
   ([#2454](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2454))
+- ASGI, FastAPI, Starlette: provide both send and receive hooks with `scope` and `message` for internal spans ([#2546](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2546))
 
 ### Added
 
@@ -44,8 +57,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `opentelemetry-instrumentation-dbapi` Fix compatibility with Psycopg3 to extract libpq build version
   ([#2500](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2500))
-- `opentelemetry-instrumentation-httpx` Ensure httpx.get or httpx.request like methods are instrumented
-  ([#2538](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2538))
 - `opentelemetry-instrumentation-grpc` AioClientInterceptor should propagate with a Metadata object
   ([#2363](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2363))
 - `opentelemetry-instrumentation-boto3sqs` Instrument Session and resource

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)

diff --git a/_template/version.py b/_template/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.46b0.dev"
+__version__ = "0.47b0.dev"
diff --git a/eachdist.ini b/eachdist.ini
@@ -16,7 +16,7 @@ sortfirst=
     ext/*
 
 [stable]
-version=1.25.0.dev
+version=1.26.0.dev
 
 packages=
     opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.46b0.dev
+version=0.47b0.dev
 
 packages=
     all

diff --git a/...ter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py b/...ter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.46b0.dev"
+__version__ = "0.47b0.dev"
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
 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
@@ -26,7 +26,7 @@ classifiers = [
 dependencies = [
   "opentelemetry-api ~= 1.12",
   "opentelemetry-sdk ~= 1.12",
-  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.47b0.dev",
   "rich>=10.0.0",
 ]
 

diff --git a/...rter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py b/...rter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.46b0.dev"
+__version__ = "0.47b0.dev"
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
@@ -25,7 +25,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.5",
-  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-instrumentation == 0.47b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

diff --git a/...ntelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.py b/...ntelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.46b0.dev"
+__version__ = "0.47b0.dev"
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
@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.46b0.dev",
-  "opentelemetry-semantic-conventions == 0.46b0.dev",
-  "opentelemetry-util-http == 0.46b0.dev",
+  "opentelemetry-instrumentation == 0.47b0.dev",
+  "opentelemetry-semantic-conventions == 0.47b0.dev",
+  "opentelemetry-util-http == 0.47b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

diff --git a/...nstrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py b/...nstrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.46b0.dev"
+__version__ = "0.47b0.dev"
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,18 +10,17 @@ 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
 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

diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
     "opentelemetry-api ~= 1.12",
-    "opentelemetry-instrumentation == 0.46b0.dev",
-    "opentelemetry-semantic-conventions == 0.46b0.dev",
-    "opentelemetry-util-http == 0.46b0.dev",
+    "opentelemetry-instrumentation == 0.47b0.dev",
+    "opentelemetry-semantic-conventions == 0.47b0.dev",
+    "opentelemetry-util-http == 0.47b0.dev",
     "wrapt >= 1.0.0, < 2.0.0",
 ]
 

diff --git a/...nstrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/version.py b/...nstrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.46b0.dev"
+__version__ = "0.47b0.dev"
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