Merge branch 'main' into django-asgi

open-telemetry · Aug 26, 2021 · beaeb17 · beaeb17
2 parents ee0dbcc + d4668bc
commit beaeb17
Show file tree

Hide file tree

Showing 83 changed files with 187 additions and 170 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 1c8449dee58b702b2505e2aefeb3c4106d1e33cf
+  CORE_REPO_SHA: 3e1c89bcae77c34b9750a1f00608a04a97921c51
 
 jobs:
   build:
@@ -44,8 +44,10 @@ jobs:
         # Preserves .tox directory between runs for faster installs
         uses: actions/cache@v2
         with:
-          path: .tox
-          key: v2-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
+          path: |
+            .tox
+            ~/.cache/pip
+          key: v4-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 }} -- --benchmark-json=${{ env.RUN_MATRIX_COMBINATION }}-benchmark.json
       - name: Find and merge benchmarks
@@ -94,12 +96,17 @@ jobs:
           python-version: 3.9
       - name: Install tox
         run: pip install -U tox
+      - name: Install libsnappy-dev
+        if: ${{ matrix.tox-environment == 'lint' }}
+        run: sudo apt-get install -y libsnappy-dev
       - name: Cache tox environment
         # Preserves .tox directory between runs for faster installs
         uses: actions/cache@v2
         with:
-          path: .tox
-          key: v2-misc-tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt', 'gen-requirements.txt', 'docs-requirements.txt') }}
+          path: |
+            .tox
+            ~/.cache/pip
+          key: v4-misc-tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt', 'gen-requirements.txt', 'docs-requirements.txt') }}
       - name: run tox
         run: tox -e ${{ matrix.tox-environment }}
       - name: Ensure generated code is up to date

diff --git a/.python-version b/.python-version
@@ -0,0 +1 @@
+3.9.5
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,14 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.4.0-0.23b0...HEAD)
+## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.5.0-0.24b0...HEAD)
+
+## [1.5.0-0.24b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.5.0-0.24b0) - 2021-08-26
 
 ### Added
 - `opentelemetry-sdk-extension-aws` Add AWS resource detectors to extension package
   ([#586](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/586))
 - `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-aiohttp-client`, `openetelemetry-instrumentation-fastapi`,        
   `opentelemetry-instrumentation-starlette`, `opentelemetry-instrumentation-urllib`, `opentelemetry-instrumentation-urllib3` Added `request_hook` and `response_hook` callbacks 
   ([#576](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/576))
+
+### Changed
+
+- `opentelemetry-instrumentation-fastapi` Allow instrumentation of newer FastAPI versions.
+  ([#602](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/602))
 
 ### Changed
 - Enable explicit `excluded_urls` argument in `opentelemetry-instrumentation-flask`
@@ -25,6 +32,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#595](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/595))
 
 ### Changed
+- `opentelemetry-instrumentation-falcon` added support for Falcon 3.
+  ([#607](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/607))
 - `opentelemetry-instrumentation-tornado` properly instrument work done in tornado on_finish method.
   ([#499](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/499))
 - `opentelemetry-instrumentation` Fixed cases where trying to use an instrumentation package without the

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.24.dev0"
+__version__ = "0.24b0"
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,4 +1,4 @@
-pylint~=2.6
+pylint<2.10
 flake8~=3.7
 isort~=5.6
 black>=19.3b0,==19.*

diff --git a/eachdist.ini b/eachdist.ini
@@ -17,7 +17,7 @@ sortfirst=
     ext/*
 
 [stable]
-version=1.4.0
+version=1.5.0
 
 packages=
     opentelemetry-sdk
@@ -35,12 +35,13 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.24.dev0
+version=0.24b0
 
 packages=
     all
     opentelemetry-semantic-conventions
     opentelemetry-test
+    opentelemetry-instrumentation
 
 [lintroots]
 extraroots=examples/*,scripts/

diff --git a/exporter/opentelemetry-exporter-datadog/setup.cfg b/exporter/opentelemetry-exporter-datadog/setup.cfg
@@ -41,7 +41,7 @@ install_requires =
     ddtrace>=0.34.0,<0.47.0
     opentelemetry-api ~= 1.3
     opentelemetry-sdk ~= 1.3
-    opentelemetry-semantic-conventions == 0.24.dev0
+    opentelemetry-semantic-conventions == 0.24b0
 
 [options.packages.find]
 where = src

diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/version.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.24.dev0"
+__version__ = "0.24b0"
diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg
@@ -39,9 +39,9 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.24.dev0
-    opentelemetry-instrumentation == 0.24.dev0
-    opentelemetry-util-http == 0.24.dev0
+    opentelemetry-semantic-conventions == 0.24b0
+    opentelemetry-instrumentation == 0.24b0
+    opentelemetry-util-http == 0.24b0
     wrapt >= 1.0.0, < 2.0.0
 
 [options.packages.find]

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.24.dev0"
+__version__ = "0.24b0"
diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg
@@ -39,14 +39,14 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.24.dev0
-    opentelemetry-instrumentation-dbapi == 0.24.dev0
-    opentelemetry-instrumentation == 0.24.dev0
+    opentelemetry-semantic-conventions == 0.24b0
+    opentelemetry-instrumentation-dbapi == 0.24b0
+    opentelemetry-instrumentation == 0.24b0
     wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.24.dev0
+    opentelemetry-test == 0.24b0
 
 [options.packages.find]
 where = src

diff --git a/...on/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py b/...on/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.24.dev0"
+__version__ = "0.24b0"
diff --git a/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg b/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg
@@ -39,13 +39,13 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.24.dev0
-    opentelemetry-instrumentation == 0.24.dev0
-    opentelemetry-util-http == 0.24.dev0
+    opentelemetry-semantic-conventions == 0.24b0
+    opentelemetry-instrumentation == 0.24b0
+    opentelemetry-util-http == 0.24b0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.24.dev0
+    opentelemetry-test == 0.24b0
 
 [options.packages.find]
 where = src
diff --git a/...tion/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py b/...tion/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.24.dev0"
+__version__ = "0.24b0"
diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg
@@ -39,12 +39,12 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.24.dev0
-    opentelemetry-instrumentation == 0.24.dev0
+    opentelemetry-semantic-conventions == 0.24b0
+    opentelemetry-instrumentation == 0.24b0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.24.dev0
+    opentelemetry-test == 0.24b0
 
 [options.packages.find]
 where = src

diff --git a/...pentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py b/...pentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.24.dev0"
+__version__ = "0.24b0"
diff --git a/instrumentation/opentelemetry-instrumentation-boto/setup.cfg b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg
@@ -39,14 +39,14 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.24.dev0
-    opentelemetry-instrumentation == 0.24.dev0
-    opentelemetry-instrumentation-botocore == 0.24.dev0
+    opentelemetry-semantic-conventions == 0.24b0
+    opentelemetry-instrumentation == 0.24b0
+    opentelemetry-instrumentation-botocore == 0.24b0
 
 [options.extras_require]
 test =
     moto~=2.0
-    opentelemetry-test == 0.24.dev0
+    opentelemetry-test == 0.24b0
 
 [options.packages.find]
 where = src

diff --git a/...tion/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py b/...tion/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.24.dev0"
+__version__ = "0.24b0"
diff --git a/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg
@@ -39,13 +39,13 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.24.dev0
-    opentelemetry-instrumentation == 0.24.dev0
+    opentelemetry-semantic-conventions == 0.24b0
+    opentelemetry-instrumentation == 0.24b0
 
 [options.extras_require]
 test =
     moto[all] ~= 2.0
-    opentelemetry-test == 0.24.dev0
+    opentelemetry-test == 0.24b0
 
 [options.packages.find]
 where = src

diff --git a/...ntelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py b/...ntelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.24.dev0"
+__version__ = "0.24b0"
diff --git a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg
@@ -39,13 +39,13 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.24.dev0
-    opentelemetry-instrumentation == 0.24.dev0
+    opentelemetry-semantic-conventions == 0.24b0
+    opentelemetry-instrumentation == 0.24b0
 
 [options.extras_require]
 test =
     pytest
-    opentelemetry-test == 0.24.dev0
+    opentelemetry-test == 0.24b0
 
 [options.packages.find]
 where = src

diff --git a/.../opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py b/.../opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.24.dev0"
+__version__ = "0.24b0"
diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg
@@ -39,13 +39,13 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.24.dev0
-    opentelemetry-instrumentation == 0.24.dev0
+    opentelemetry-semantic-conventions == 0.24b0
+    opentelemetry-instrumentation == 0.24b0
     wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.24.dev0
+    opentelemetry-test == 0.24b0
 
 [options.packages.find]
 where = src
diff --git a/...on/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py b/...on/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.24.dev0"
+__version__ = "0.24b0"
 
 _instruments = tuple()
diff --git a/instrumentation/opentelemetry-instrumentation-django/setup.cfg b/instrumentation/opentelemetry-instrumentation-django/setup.cfg
@@ -38,17 +38,17 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-util-http == 0.24.dev0
-    opentelemetry-instrumentation-wsgi == 0.24.dev0
-    opentelemetry-instrumentation == 0.24.dev0
+    opentelemetry-util-http == 0.24b0
+    opentelemetry-instrumentation-wsgi == 0.24b0
+    opentelemetry-instrumentation == 0.24b0
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.24.dev0
+    opentelemetry-semantic-conventions == 0.24b0
 
 [options.extras_require]
 asgi =
     opentelemetry-instrumentation-asgi == 0.23.dev0
 test =
-    opentelemetry-test == 0.24.dev0
+    opentelemetry-test == 0.24b0
 
 [options.packages.find]
 where = src

diff --git a/.../opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py b/.../opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.24.dev0"
+__version__ = "0.24b0"
diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg
@@ -39,13 +39,13 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.24.dev0
-    opentelemetry-instrumentation == 0.24.dev0
+    opentelemetry-semantic-conventions == 0.24b0
+    opentelemetry-instrumentation == 0.24b0
     wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.24.dev0
+    opentelemetry-test == 0.24b0
     elasticsearch-dsl >= 2.0
 
 [options.packages.find]

diff --git a/...-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py b/...-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.24.dev0"
+__version__ = "0.24b0"
diff --git a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg
@@ -39,15 +39,15 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-instrumentation-wsgi == 0.24.dev0
-    opentelemetry-util-http == 0.24.dev0
-    opentelemetry-instrumentation == 0.24.dev0
+    opentelemetry-instrumentation-wsgi == 0.24b0
+    opentelemetry-util-http == 0.24b0
+    opentelemetry-instrumentation == 0.24b0
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.24.dev0
+    opentelemetry-semantic-conventions == 0.24b0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.24.dev0
+    opentelemetry-test == 0.24b0
     parameterized == 0.7.4
 
 [options.packages.find]

diff --git a/...opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py b/...opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py
@@ -126,7 +126,7 @@ def response_hook(span, req, resp):
 
 _excluded_urls = get_excluded_urls("FALCON")
 _traced_request_attrs = get_traced_request_attrs("FALCON")
-_response_propagation_setter = FuncSetter(falcon.api.Response.append_header)
+_response_propagation_setter = FuncSetter(falcon.Response.append_header)
 
 
 class FalconInstrumentor(BaseInstrumentor):