Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-python-contrib

Author: lzchen

.flake8

@@ -1,7 +1,6 @@
 [flake8]
 ignore =
   E501  # line too long, defer to black
-  F401  # unused import, defer to pylint
   W503  # allow line breaks before binary ops
   W504  # allow line breaks after binary ops
   E203  # allow whitespace before ':' (https://github.com/psf/black#slices) 

.github/workflows/publish-a-package.yml

@@ -0,0 +1,31 @@
+name: Publish a Package from Tag
+
+on:
+  push:
+    tags:
+      - 'opentelemetry-*==1.*'
+
+jobs:
+  publish-a-package:
+    name: Publish package from tag
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-python@v1
+      with:
+        python-version: '3.9'
+    - name: Log tag that triggered publish workflow
+      run:  echo "Attempting to publish package from tag $GITHUB_REF"
+    - name: Build wheel for tag
+      run: ./scripts/build_a_package.sh
+    - name: Install twine
+      run: |
+        pip install twine
+    # We don't need to publish to TestPyPI because we only publish 1 package.
+    # If it fails no other work needs to be reversed.
+    - name: Publish to PyPI
+      env:
+        TWINE_USERNAME: '__token__'
+        TWINE_PASSWORD: ${{ secrets.pypi_password }}
+      run: |
+        twine upload --skip-existing --verbose dist/*

.github/workflows/test.yml

@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 67bbad45917baa354a3a6d0d4361da48ff13fd31
+  CORE_REPO_SHA: c49ad57bfe35cfc69bfa863d74058ca9bec55fc3
 
 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

.python-version

@@ -0,0 +1 @@
+3.9.5

CHANGELOG.md

@@ -5,17 +5,35 @@ 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.4.0-0.23b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.4.0-0.23b0) - 2021-07-19
+## [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`
+  ([#604](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/604))
 
+## [1.4.0-0.23b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.4.0-0.23b0) - 2021-07-21
 
 ### Removed
 - Move `opentelemetry-instrumentation` to the core repo.
   ([#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
@@ -57,6 +75,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#563](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/563))
 - `opentelemetry-exporter-datadog` Datadog exporter should not use `unknown_service` as fallback resource service name.
   ([#570](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/570))
+- Add support for the async extension of SQLAlchemy (>= 1.4)
+  ([#568](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/568))
 
 ### Added
 - `opentelemetry-instrumentation-httpx` Add `httpx` instrumentation

README.md

@@ -72,22 +72,24 @@ See [CONTRIBUTING.md](CONTRIBUTING.md)
 
 We meet weekly on Thursday, and the time of the meeting alternates between 9AM PT and 4PM PT. The meeting is subject to change depending on contributors' availability. Check the [OpenTelemetry community calendar](https://calendar.google.com/calendar/embed?src=google.com_b79e3e90j7bbsa2n2p5an5lf60%40group.calendar.google.com) for specific dates.
 
-Meetings take place via [Zoom video conference](https://zoom.us/j/6729396170). The passcode is _77777_.
+Meetings take place via [Zoom video conference](https://zoom.us/j/8287234601?pwd=YjN2MURycXc4cEZlYTRtYjJaM0grZz09). The passcode is _77777_.
 
 Meeting notes are available as a public [Google doc](https://docs.google.com/document/d/1CIMGoIOZ-c3-igzbd6_Pnxx1SjAkjwqoYSUWxPY8XIs/edit). For edit access, get in touch on [GitHub Discussions](https://github.com/open-telemetry/opentelemetry-python/discussions).
 
 Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
 
 - [Aaron Abbott](https://github.com/aabmass), Google
-- [Diego Hurtado](https://github.com/ocelotl), Lightstep
-- [Owais Lone](https://github.com/owais), Splunk
+- [Alex Boten](https://github.com/codeboten), Lightstep
+- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
+- [Srikanth Chekuri](https://github.com/lonewolf3739)
 
 *Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
 
 Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-telemetry/teams/python-maintainers)):
 
-- [Alex Boten](https://github.com/codeboten), Lightstep
+- [Diego Hurtado](https://github.com/ocelotl), Lightstep
 - [Leighton Chen](https://github.com/lzchen), Microsoft
+- [Owais Lone](https://github.com/owais), Splunk
 
 *Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
 

_template/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.23b0"
+__version__ = "0.24b0"

dev-requirements.txt

@@ -1,4 +1,4 @@
-pylint~=2.6
+pylint<2.10
 flake8~=3.7
 isort~=5.6
 black>=19.3b0,==19.*

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.23b0
+version=0.24b0
 
 packages=
     all
     opentelemetry-semantic-conventions
     opentelemetry-test
+    opentelemetry-instrumentation
 
 [lintroots]
 extraroots=examples/*,scripts/

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.23b0
+    opentelemetry-semantic-conventions == 0.24b0
 
 [options.packages.find]
 where = src