Merge branch 'main' into feature/add_pika_instrumentation

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/CODEOWNERS

@@ -1,5 +1,26 @@
 # Code owners file.
 # This file controls who is tagged for review for any given pull request.
+#
+# What is a "CODEOWNER"?
+#
+# A CODEOWNER lends their expertise to a specific package hosted by an OpenTelemetry repository.
+#
+# A CODEOWNER MUST:
+# - introduce themselves on the CNCF OTel Python channel: https://cloud-native.slack.com/archives/C01PD4HUVBL
+# - have enough knowledge of the corresponding instrumented library
+# - respond to issues
+# - fix failing unit tests or any other blockers to the CI/CD workflow
+# - update usage of `opentelemetry-python-core` APIs upon the introduction of breaking changes
+# - be a member of the OpenTelemetry community so that the `component-owners.yml` action to automatically assign CODEOWNERS to PRs works correctly.
+#
+
 
 # For anything not explicitly taken by someone else:
 * @open-telemetry/opentelemetry-python-contrib-approvers
+
+# Learn about CODEOWNERS file format:
+# https://help.github.com/en/articles/about-code-owners
+#
+# Learn about membership in OpenTelemetry community:
+# https://github.com/open-telemetry/community/blob/main/community-membership.md
+#

.github/component_owners.yml

@@ -0,0 +1,4 @@
+components:
+
+  sdk-extension/opentelemetry-sdk-extension-aws:
+    - NathanielRN

.github/workflows/close-stale-issues.yml

@@ -0,0 +1,17 @@
+# This action assigns and requires approval from owners of components for
+# PRs that are open against those components. Components are defined as
+# individual paths within this repository.
+name: 'Component Owners'
+
+on:
+  pull_request_target:
+
+jobs:
+  run_self:
+    runs-on: ubuntu-latest
+    name: Auto Assign Owners
+    # Don't fail tests if this workflow fails. Some pending issues:
+    # - https://github.com/dyladan/component-owners/issues/8
+    continue-on-error: true
+    steps:
+      - uses: dyladan/component-owners@main

.github/workflows/component-owners.yml

@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 9dc17e33bc083e38c1fd55b8ed6787caba8f54fe
+  CORE_REPO_SHA: c49ad57bfe35cfc69bfa863d74058ca9bec55fc3
 
 jobs:
   build:

.github/workflows/test.yml

@@ -6,6 +6,27 @@ 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.5.0-0.24b0...HEAD)
+- `opentelemetry-sdk-extension-aws` Release AWS Python SDK Extension as 1.0.0
+  ([#667](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/667))
+
+### Added
+- `opentelemetry-instrumentation-elasticsearch` Added `response_hook` and `request_hook` callbacks
+  ([#670](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/670))
+
+### Added
+- `opentelemetry-instrumentation-redis` added request_hook and response_hook callbacks passed as arguments to the instrument method.
+  ([#669](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/669))
+
+### Changed
+- `opentelemetry-instrumentation-botocore` Unpatch botocore Endpoint.prepare_request on uninstrument
+  ([#664](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/664))
+- `opentelemetry-instrumentation-botocore` Fix span injection for lambda invoke
+  ([#663](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/663))
+
+### Changed
+
+- `opentelemetry-instrumentation-urllib3` Updated `_RequestHookT` with two additional fields - the request body and the request headers
+([#660](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/660))
 
 ## [1.5.0-0.24b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.5.0-0.24b0) - 2021-08-26
 
@@ -20,8 +41,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `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))
 

CHANGELOG.md

@@ -66,6 +66,24 @@ install](https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs)
 pip install -e ./instrumentation/opentelemetry-instrumentation-{integration}
 ```
 
+## Releasing
+
+Maintainers aim to periodically release new versions of the packages in `opentelemetry-python-contrib`.
+
+Contributions that enhance OTel for Python are welcome to be hosted upstream for the benefit of group collaboration. Maintainers will look for things like good documentation, good unit tests, and in general their own confidence when deciding to release a package with the stability guarantees that are implied with a `1.0` release.
+
+To resolve this, members of the community are encouraged to commit to becoming a CODEOWNER for packages in `-contrib` that they feel experienced enough to maintain. CODEOWNERS can then follow the checklist below to release `-contrib` packages as 1.0 stable:
+
+### Releasing a package as `1.0` stable
+
+To release a package as `1.0` stable, the package:
+- SHOULD have a CODEOWNER. To become one, submit an issue and explain why you meet the responsibilities found in [CODEOWNERS](.github/CODEOWNERS).
+- MUST have unit tests that cover all supported versions of the instrumented library.
+  - e.g. Instrumentation packages might use different techniques to instrument different major versions of python packages
+- MUST have clear documentation for non-obvious usages of the package
+  - e.g. If an instrumentation package uses flags, a token as context, or parameters that are not typical of the `BaseInstrumentor` class, these are documented
+- After the release of `1.0`, a CODEOWNER may no longer feel like they have the bandwidth to meet the responsibilities of maintaining the package. That's not a problem at all, life happens! However, if that is the case, we ask that the CODEOWNER please raise an issue indicating that they would like to be removed as a CODEOWNER so that they don't get pinged on future PRs. Ultimately, we hope to use that issue to find a new CODEOWNER.
+
 ## Contributing
 
 See [CONTRIBUTING.md](CONTRIBUTING.md)

CODEOWNERS

@@ -27,7 +27,7 @@
     "version.py",
 )
 PACKAGE_INFO = {}
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 setuptools.setup(

README.md

@@ -21,7 +21,7 @@
     BASE_DIR, "src", "opentelemetry", "exporter", "datadog", "version.py"
 )
 PACKAGE_INFO = {}
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 setuptools.setup(version=PACKAGE_INFO["__version__"])

_template/setup.py

@@ -14,12 +14,14 @@
 
 import itertools
 import logging
+import sys
 import time
 import unittest
 from unittest import mock
 
 from ddtrace.internal.writer import AgentWriter
 from flaky import flaky
+from pytest import mark
 
 from opentelemetry import trace as trace_api
 from opentelemetry.context import Context
@@ -469,6 +471,9 @@ def test_span_processor_dropped_spans(self):
         self.assertEqual(len(datadog_spans), 128)
         tracer_provider.shutdown()
 
+    @mark.skipif(
+        sys.platform == "win32", reason="unreliable test on windows",
+    )
     def test_span_processor_scheduled_delay(self):
         """Test that spans are exported each schedule_delay_millis"""
         delay = 300

exporter/opentelemetry-exporter-datadog/setup.py

@@ -0,0 +1,36 @@
+
+| Instrumentation | Supported Packages |
+| --------------- | ------------------ |
+| [opentelemetry-instrumentation-aiohttp-client](./opentelemetry-instrumentation-aiohttp-client) | aiohttp ~= 3.0 |
+| [opentelemetry-instrumentation-aiopg](./opentelemetry-instrumentation-aiopg) | aiopg >= 0.13.0, < 1.3.0 |
+| [opentelemetry-instrumentation-asgi](./opentelemetry-instrumentation-asgi) | asgiref ~= 3.0 |
+| [opentelemetry-instrumentation-asyncpg](./opentelemetry-instrumentation-asyncpg) | asyncpg >= 0.12.0 |
+| [opentelemetry-instrumentation-boto](./opentelemetry-instrumentation-boto) | boto~=2.0 |
+| [opentelemetry-instrumentation-botocore](./opentelemetry-instrumentation-botocore) | botocore ~= 1.0 |
+| [opentelemetry-instrumentation-celery](./opentelemetry-instrumentation-celery) | celery >= 4.0, < 6.0 |
+| [opentelemetry-instrumentation-dbapi](./opentelemetry-instrumentation-dbapi) | dbapi |
+| [opentelemetry-instrumentation-django](./opentelemetry-instrumentation-django) | django >= 1.10 |
+| [opentelemetry-instrumentation-elasticsearch](./opentelemetry-instrumentation-elasticsearch) | elasticsearch >= 2.0 |
+| [opentelemetry-instrumentation-falcon](./opentelemetry-instrumentation-falcon) | falcon ~= 2.0 |
+| [opentelemetry-instrumentation-fastapi](./opentelemetry-instrumentation-fastapi) | fastapi ~= 0.58 |
+| [opentelemetry-instrumentation-flask](./opentelemetry-instrumentation-flask) | flask >= 1.0, < 3.0 |
+| [opentelemetry-instrumentation-grpc](./opentelemetry-instrumentation-grpc) | grpcio ~= 1.27 |
+| [opentelemetry-instrumentation-httpx](./opentelemetry-instrumentation-httpx) | httpx >= 0.18.0, < 0.19.0 |
+| [opentelemetry-instrumentation-jinja2](./opentelemetry-instrumentation-jinja2) | jinja2~=2.7 |
+| [opentelemetry-instrumentation-logging](./opentelemetry-instrumentation-logging) | logging |
+| [opentelemetry-instrumentation-mysql](./opentelemetry-instrumentation-mysql) | mysql-connector-python ~= 8.0 |
+| [opentelemetry-instrumentation-psycopg2](./opentelemetry-instrumentation-psycopg2) | psycopg2 >= 2.7.3.1 |
+| [opentelemetry-instrumentation-pymemcache](./opentelemetry-instrumentation-pymemcache) | pymemcache ~= 1.3 |
+| [opentelemetry-instrumentation-pymongo](./opentelemetry-instrumentation-pymongo) | pymongo ~= 3.1 |
+| [opentelemetry-instrumentation-pymysql](./opentelemetry-instrumentation-pymysql) | PyMySQL ~= 0.10.1 |
+| [opentelemetry-instrumentation-pyramid](./opentelemetry-instrumentation-pyramid) | pyramid >= 1.7 |
+| [opentelemetry-instrumentation-redis](./opentelemetry-instrumentation-redis) | redis >= 2.6 |
+| [opentelemetry-instrumentation-requests](./opentelemetry-instrumentation-requests) | requests ~= 2.0 |
+| [opentelemetry-instrumentation-sklearn](./opentelemetry-instrumentation-sklearn) | scikit-learn ~= 0.24.0 |
+| [opentelemetry-instrumentation-sqlalchemy](./opentelemetry-instrumentation-sqlalchemy) | sqlalchemy |
+| [opentelemetry-instrumentation-sqlite3](./opentelemetry-instrumentation-sqlite3) | sqlite3 |
+| [opentelemetry-instrumentation-starlette](./opentelemetry-instrumentation-starlette) | starlette ~= 0.13.0 |
+| [opentelemetry-instrumentation-tornado](./opentelemetry-instrumentation-tornado) | tornado >= 6.0 |
+| [opentelemetry-instrumentation-urllib](./opentelemetry-instrumentation-urllib) | urllib |
+| [opentelemetry-instrumentation-urllib3](./opentelemetry-instrumentation-urllib3) | urllib3 >= 1.0.0, < 2.0.0 |
+| [opentelemetry-instrumentation-wsgi](./opentelemetry-instrumentation-wsgi) | wsgi |

exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py

@@ -46,7 +46,7 @@
     "aiohttp_client",
     "version.py",
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
@@ -57,7 +57,7 @@
     "aiohttp_client",
     "package.py",
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/README.md

@@ -39,14 +39,14 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    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.24b0
+    opentelemetry-semantic-conventions == 0.24b0
 
 [options.packages.find]
 where = src

instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.py

@@ -41,13 +41,13 @@
 VERSION_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "aiopg", "version.py"
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "aiopg", "package.py"
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg

@@ -41,13 +41,13 @@
 VERSION_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "asgi", "version.py"
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "asgi", "package.py"
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-aiopg/setup.py

@@ -46,7 +46,7 @@
     "asyncpg",
     "version.py",
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
@@ -57,7 +57,7 @@
     "asyncpg",
     "package.py",
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-asgi/setup.py

@@ -38,7 +38,6 @@
 
 import asyncpg
 import wrapt
-from asyncpg import exceptions
 
 from opentelemetry import trace
 from opentelemetry.instrumentation.asyncpg.package import _instruments

instrumentation/opentelemetry-instrumentation-asyncpg/setup.py

@@ -41,7 +41,6 @@ install_requires =
     opentelemetry-api ~= 1.3
     opentelemetry-semantic-conventions == 0.24b0
     opentelemetry-instrumentation == 0.24b0
-    opentelemetry-instrumentation-botocore == 0.24b0
 
 [options.extras_require]
 test =

instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/__init__.py

@@ -41,13 +41,13 @@
 VERSION_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "boto", "version.py"
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "boto", "package.py"
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-boto/setup.cfg

@@ -52,7 +52,6 @@
 from opentelemetry.instrumentation.boto.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import unwrap
-from opentelemetry.sdk.trace import Resource
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace import SpanKind, get_tracer
 

instrumentation/opentelemetry-instrumentation-boto/setup.py

@@ -46,7 +46,7 @@
     "botocore",
     "version.py",
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
@@ -57,7 +57,7 @@
     "botocore",
     "package.py",
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.