Merge branch 'main' into boto3sqs/resource

mattoberle · Feb 20, 2024 · 556fdab · 556fdab
2 parents 6bfaf34 + 2518a4a
commit 556fdab
Show file tree

Hide file tree

Showing 40 changed files with 1,938 additions and 120 deletions.
diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -67,3 +67,6 @@ components:
 
   instrumentation/opentelemetry-instrumentation-cassandra:
     - mattcontinisio
+
+  instrumentation/opentelemetry-instrumentation-asyncio:
+    - bourbonkk
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: 84c0e4f38d4fcdb8c13fd3988469fbb8cda28150
+  CORE_REPO_SHA: e98af82ff0ebe7e687fda265093aa576cd9ba80f
 
 jobs:
   instrumentations-0:
@@ -73,6 +73,35 @@ jobs:
           - "tornado"
           - "tortoiseorm"
         os: [ubuntu-20.04]
+        exclude:
+          - python-version: py39
+            package: "sklearn"
+          - python-version: py310
+            package: "sklearn"
+          - python-version: py311
+            package: "sklearn"
+          - python-version: pypy3
+            package: "aiopg"
+          - python-version: pypy3
+            package: "asyncpg"
+          - python-version: pypy3
+            package: "boto"
+          - python-version: pypy3
+            package: "boto3sqs"
+          - python-version: pypy3
+            package: "botocore"
+          - python-version: pypy3
+            package: "psycopg2"
+          - python-version: pypy3
+            package: "remoulade"
+          - python-version: pypy3
+            package: "requests"
+          - python-version: pypy3
+            package: "sklearn"
+          - python-version: pypy3
+            package: "confluent-kafka"
+          - python-version: pypy3
+            package: "grpc"
     steps:
       - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v2
@@ -81,7 +110,7 @@ jobs:
         with:
           python-version: ${{ env[matrix.python-version] }}
       - name: Install tox
-        run: pip install tox==3.27.1 tox-factor
+        run: pip install tox
       - name: Cache tox environment
         # Preserves .tox directory between runs for faster installs
         uses: actions/cache@v1

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: 84c0e4f38d4fcdb8c13fd3988469fbb8cda28150
+  CORE_REPO_SHA: e98af82ff0ebe7e687fda265093aa576cd9ba80f
 
 jobs:
   instrumentations-1:
@@ -35,6 +35,11 @@ jobs:
           - "propagator-ot-trace"
           - "resource-detector-container"
         os: [ubuntu-20.04]
+        exclude:
+          - python-version: py311
+            package: "prometheus-remote-write"
+          - python-version: pypy3
+            package: "prometheus-remote-write"
     steps:
       - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v2
@@ -43,7 +48,7 @@ jobs:
         with:
           python-version: ${{ env[matrix.python-version] }}
       - name: Install tox
-        run: pip install tox==3.27.1 tox-factor
+        run: pip install tox
       - name: Cache tox environment
         # Preserves .tox directory between runs for faster installs
         uses: actions/cache@v1

diff --git a/.github/workflows/prepare-patch-release.yml b/.github/workflows/prepare-patch-release.yml
@@ -54,7 +54,7 @@ jobs:
         with:
           python-version: 3.9
       - name: Install tox
-        run: pip install tox==3.27.1
+        run: pip install tox
       - name: run tox
         run: tox -e generate
 

diff --git a/.github/workflows/prepare-release-branch.yml b/.github/workflows/prepare-release-branch.yml
@@ -81,7 +81,7 @@ jobs:
         with:
           python-version: 3.9
       - name: Install tox
-        run: pip install tox==3.27.1
+        run: pip install tox
       - name: run tox
         run: tox -e generate
 
@@ -165,7 +165,7 @@ jobs:
         with:
           python-version: 3.9
       - name: Install tox
-        run: pip install tox==3.27.1
+        run: pip install tox
       - name: run tox
         run: tox -e generate
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: d829e375202d0106d45d7a2441409be82086b423
+  CORE_REPO_SHA: e98af82ff0ebe7e687fda265093aa576cd9ba80f
 
 jobs:
   misc:
@@ -24,7 +24,7 @@ jobs:
         with:
           python-version: "3.10"
       - name: Install tox
-        run: pip install tox==3.27.1
+        run: pip install tox
       - name: Install libsnappy-dev
         if: ${{ matrix.tox-environment == 'lint' }}
         run: sudo apt-get install -y libsnappy-dev

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `opentelemetry-instrumentation-boto3sqs` Instrument Session and resource
   ([#2161](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2161))
-- Drop uspport for 3.7
+- Drop support for 3.7
   ([#2151](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2151))
 - `opentelemetry-resource-detector-azure` Added 10s timeout to VM Resource Detector
   ([#2119](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2119))
@@ -19,11 +19,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2132](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2132))
 - `opentelemetry-resource-detector-azure` Changed timeout to 4 seconds due to [timeout bug](https://github.com/open-telemetry/opentelemetry-python/issues/3644)
   ([#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))
 
 ## 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
   ([#1987](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1987))
 - `opentelemetry-instrumentation-httpx` Fix mixing async and non async hooks

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ some aspects of development, including testing against multiple Python versions.
 To install `tox`, run:
 
 ```console
-$ pip install tox==3.27.1
+$ pip install tox
 ```
 
 You can run `tox` with the following arguments:
@@ -107,7 +107,7 @@ Run tests:
 
 ```sh
 # make sure you have all supported versions of Python installed
-$ pip install tox==3.27.1  # only first time.
+$ pip install tox  # only first time.
 $ tox  # execute in the root of the repository
 ```
 
@@ -177,7 +177,7 @@ For a deeper discussion, see: https://github.com/open-telemetry/opentelemetry-sp
 ## Running Tests Locally
 
 1. Go to your Contrib repo directory. `git clone [email protected]:open-telemetry/opentelemetry-python-contrib.git && cd opentelemetry-python-contrib`.
-2. Make sure you have `tox` installed. `pip install tox==3.27.1`.
+2. Make sure you have `tox` installed. `pip install tox`.
 3. Run `tox` without any arguments to run tests for all the packages. Read more about [tox](https://tox.readthedocs.io/en/latest/).
 
 ### Testing against a different Core repo branch/commit
@@ -202,7 +202,7 @@ The continuation integration overrides that environment variable with as per the
 Below is a checklist of things to be mindful of when implementing a new instrumentation or working on a specific instrumentation. It is one of our goals as a community to keep the implementation specific details of instrumentations as similar across the board as possible for ease of testing and feature parity. It is also good to abstract as much common functionality as possible.
 
 - Follow semantic conventions
-  - The instrumentation should follow the semantic conventions defined [here](https://github.com/open-telemetry/opentelemetry-specification/tree/main/semantic_conventions)
+  - The instrumentation should follow the semantic conventions defined [here](https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/semantic-conventions.md)
 - Extends from [BaseInstrumentor](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/opentelemetry-instrumentation/src/opentelemetry/instrumentation/instrumentor.py#L26)
 - Supports auto-instrumentation
   - Add an entry point (ex. https://github.com/open-telemetry/opentelemetry-python-contrib/blob/f045c43affff6ff1af8fa2f7514a4fdaca97dacf/instrumentation/opentelemetry-instrumentation-requests/pyproject.toml#L44)

diff --git a/README.md b/README.md
@@ -128,7 +128,7 @@ Emeritus Maintainers:
 1. Go to your Contrib repo directory. `cd ~/git/opentelemetry-python-contrib`.
 2. Create a virtual env in your Contrib repo directory. `python3 -m venv my_test_venv`.
 3. Activate your virtual env. `source my_test_venv/bin/activate`.
-4. Make sure you have `tox` installed. `pip install tox==3.27.1`.
+4. Make sure you have `tox` installed. `pip install tox`.
 5. Run tests for a package. (e.g. `tox -e test-instrumentation-flask`.)
 
 ### Thanks to all the people who already contributed!

diff --git a/docs/instrumentation/asyncio/asyncio.rst b/docs/instrumentation/asyncio/asyncio.rst
@@ -0,0 +1,7 @@
+OpenTelemetry asyncio Instrumentation
+==============================================
+
+.. automodule:: opentelemetry.instrumentation.asyncio
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/instrumentation/README.md b/instrumentation/README.md
@@ -6,6 +6,7 @@
 | [opentelemetry-instrumentation-aiohttp-server](./opentelemetry-instrumentation-aiohttp-server) | aiohttp ~= 3.0 | No
 | [opentelemetry-instrumentation-aiopg](./opentelemetry-instrumentation-aiopg) | aiopg >= 0.13.0, < 2.0.0 | No
 | [opentelemetry-instrumentation-asgi](./opentelemetry-instrumentation-asgi) | asgiref ~= 3.0 | No
+| [opentelemetry-instrumentation-asyncio](./opentelemetry-instrumentation-asyncio) | asyncio | No
 | [opentelemetry-instrumentation-asyncpg](./opentelemetry-instrumentation-asyncpg) | asyncpg >= 0.12.0 | No
 | [opentelemetry-instrumentation-aws-lambda](./opentelemetry-instrumentation-aws-lambda) | aws_lambda | No
 | [opentelemetry-instrumentation-boto](./opentelemetry-instrumentation-boto) | boto~=2.0 | No