Merge branch 'main' into add-remoulade

Author: ben-natan

.github/workflows/test.yml

@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 516bf8ad04d628b20c103622f390f7a536142e9a
+  CORE_REPO_SHA: 2c1cb20543fcc0bcfe5525d8a695e92babec06db
 
 jobs:
   build:

.pylintrc

@@ -12,6 +12,7 @@ ignore=CVS,gen,Dockerfile,docker-compose.yml,README.md,requirements.txt
 # Add files or directories matching the regex patterns to be excluded. The
 # regex matches against base names, not paths.
 ignore-patterns=
+ignore-paths=exporter/opentelemetry-exporter-datadog/.*$
 
 # Python code to execute, usually for sys.path manipulation such as
 # pygtk.require().

CHANGELOG.md

@@ -5,26 +5,47 @@ 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.11.0-0.30b0...HEAD)
+## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.11.1-0.30b1...HEAD)
+
+### Fixed
+- `opentelemetry-instrumentation-aiohttp-client` make span attributes available to sampler
+  ([1072](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1072))
+- `opentelemetry-instrumentation-aws-lambda` Fixed an issue - in some rare cases (API GW proxy integration test)
+  headers are set to None, breaking context propagators.
+  ([#1055](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1055))
+- Refactoring custom header collection API for consistency
+  ([#1064](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1064))
+
+### Added
+- `opentelemetry-instrument` and `opentelemetry-bootstrap` now include a `--version` flag
+  ([#1065](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1065))
+
+## [1.11.1-0.30b1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.11.1-0.30b1) - 2022-04-21
+
+### Added
+- `opentelemetry-instrumentation-starlette` Capture custom request/response headers in span attributes
+  ([#1046])(https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1046)
+
+### Fixed
+- Prune autoinstrumentation sitecustomize module directory from PYTHONPATH immediately
+  ([#1066](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1066))
 
 ## [1.11.0-0.30b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.11.0-0.30b0) - 2022-04-18
 
 ### Fixed
 - `opentelemetry-instrumentation-pyramid` Fixed which package is the correct caller in _traced_init.
   ([#830](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/830))
 - `opentelemetry-instrumentation-tornado` Fix Tornado errors mapping to 500
-  ([#1048])(https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1048)
+  ([#1048](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1048))
 - `opentelemetry-instrumentation-urllib` make span attributes available to sampler
   ([1014](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1014))
 - `opentelemetry-instrumentation-flask` Fix non-recording span bug
-  ([#999])(https://github.com/open-telemetry/opentelemetry-python-contrib/pull/999)
+  ([#999](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/999))
 - `opentelemetry-instrumentation-tornado` Fix non-recording span bug
-  ([#999])(https://github.com/open-telemetry/opentelemetry-python-contrib/pull/999)
+  ([#999](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/999))
 
 ### Added
 
-- `opentelemetry-instrumentation-starlette` Capture custom request/response headers in span attributes
-  ([#1046])(https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1046)
 - `opentelemetry-instrumentation-fastapi` Capture custom request/response headers in span attributes
   ([#1032])(https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1032)
 - `opentelemetry-instrumentation-django` Capture custom request/response headers in span attributes

README.md

@@ -98,6 +98,8 @@ Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telem
 - [Alex Boten](https://github.com/codeboten), Lightstep
 - [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
 - [Owais Lone](https://github.com/owais), Splunk
+- [Sanket Mehta](https://github.com/sanketmehta28), Cisco
+- [Ashutosh Goel](https://github.com/ashu658), Cisco
 
 *Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
 

_template/version.py

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

eachdist.ini

@@ -16,7 +16,7 @@ sortfirst=
     ext/*
 
 [stable]
-version=1.11.0
+version=1.11.1
 
 packages=
     opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.30b0
+version=0.30b1
 
 packages=
     all

exporter/opentelemetry-exporter-richconsole/setup.cfg

@@ -43,7 +43,7 @@ install_requires =
     rich>=10.0.0
     opentelemetry-api ~= 1.3
     opentelemetry-sdk ~= 1.3
-    opentelemetry-semantic-conventions == 0.30b0
+    opentelemetry-semantic-conventions == 0.30b1
 
 [options.packages.find]
 where = src

exporter/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.30b0"
+__version__ = "0.30b1"

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

@@ -41,9 +41,9 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.30b0
-    opentelemetry-instrumentation == 0.30b0
-    opentelemetry-util-http == 0.30b0
+    opentelemetry-semantic-conventions == 0.30b1
+    opentelemetry-instrumentation == 0.30b1
+    opentelemetry-util-http == 0.30b1
     wrapt >= 1.0.0, < 2.0.0
 
 [options.packages.find]

instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py

@@ -180,27 +180,24 @@ async def on_request_start(
 
         http_method = params.method.upper()
         request_span_name = f"HTTP {http_method}"
+        request_url = (
+            remove_url_credentials(trace_config_ctx.url_filter(params.url))
+            if callable(trace_config_ctx.url_filter)
+            else remove_url_credentials(str(params.url))
+        )
+
+        span_attributes = {
+            SpanAttributes.HTTP_METHOD: http_method,
+            SpanAttributes.HTTP_URL: request_url,
+        }
 
         trace_config_ctx.span = trace_config_ctx.tracer.start_span(
-            request_span_name,
-            kind=SpanKind.CLIENT,
+            request_span_name, kind=SpanKind.CLIENT, attributes=span_attributes
         )
 
         if callable(request_hook):
             request_hook(trace_config_ctx.span, params)
 
-        if trace_config_ctx.span.is_recording():
-            attributes = {
-                SpanAttributes.HTTP_METHOD: http_method,
-                SpanAttributes.HTTP_URL: remove_url_credentials(
-                    trace_config_ctx.url_filter(params.url)
-                )
-                if callable(trace_config_ctx.url_filter)
-                else remove_url_credentials(str(params.url)),
-            }
-            for key, value in attributes.items():
-                trace_config_ctx.span.set_attribute(key, value)
-
         trace_config_ctx.token = context_api.attach(
             trace.set_span_in_context(trace_config_ctx.span)
         )

instrumentation/opentelemetry-instrumentation-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.30b0"
+__version__ = "0.30b1"

instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg

@@ -41,14 +41,14 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-instrumentation-dbapi == 0.30b0
-    opentelemetry-instrumentation == 0.30b0
+    opentelemetry-instrumentation-dbapi == 0.30b1
+    opentelemetry-instrumentation == 0.30b1
     wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]
 test =
-    opentelemetry-test-utils == 0.30b0
-    opentelemetry-semantic-conventions == 0.30b0
+    opentelemetry-test-utils == 0.30b1
+    opentelemetry-semantic-conventions == 0.30b1
 
 [options.packages.find]
 where = src

instrumentation/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.30b0"
+__version__ = "0.30b1"

instrumentation/opentelemetry-instrumentation-asgi/setup.cfg

@@ -41,14 +41,14 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.30b0
-    opentelemetry-instrumentation == 0.30b0
-    opentelemetry-util-http == 0.30b0
+    opentelemetry-semantic-conventions == 0.30b1
+    opentelemetry-instrumentation == 0.30b1
+    opentelemetry-util-http == 0.30b1
     asgiref ~= 3.0
 
 [options.extras_require]
 test =
-    opentelemetry-test-utils == 0.30b0
+    opentelemetry-test-utils == 0.30b1
 
 [options.packages.find]
 where = src

instrumentation/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.30b0"
+__version__ = "0.30b1"

instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg

@@ -41,12 +41,12 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.30b0
-    opentelemetry-instrumentation == 0.30b0
+    opentelemetry-semantic-conventions == 0.30b1
+    opentelemetry-instrumentation == 0.30b1
 
 [options.extras_require]
 test =
-    opentelemetry-test-utils == 0.30b0
+    opentelemetry-test-utils == 0.30b1
 
 [options.packages.find]
 where = src

instrumentation/opentelemetry-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.30b0"
+__version__ = "0.30b1"

instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg

@@ -38,13 +38,13 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-instrumentation == 0.30b0
+    opentelemetry-instrumentation == 0.30b1
     opentelemetry-propagator-aws-xray == 1.0.1
-    opentelemetry-semantic-conventions == 0.30b0
+    opentelemetry-semantic-conventions == 0.30b1
 
 [options.extras_require]
 test =
-    opentelemetry-test-utils == 0.30b0
+    opentelemetry-test-utils == 0.30b1
 
 [options.packages.find]
 where = src

instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py

@@ -108,6 +108,8 @@ def _default_event_context_extractor(lambda_event: Any) -> Context:
     Assumes the Lambda Event is a map with the headers under the 'headers' key.
     This is the mapping to use when the Lambda is invoked by an API Gateway
     REST API where API Gateway is acting as a pure proxy for the request.
+    Protects headers from being something other than dictionary, as this
+    is what downstream propagators expect.
 
     See more:
     https://docs.aws.amazon.com/apigateway/latest/developerguide/set-up-lambda-proxy-integrations.html#api-gateway-simple-proxy-for-lambda-input-format
@@ -118,12 +120,14 @@ def _default_event_context_extractor(lambda_event: Any) -> Context:
     Returns:
         A Context with configuration found in the event.
     """
+    headers = None
     try:
         headers = lambda_event["headers"]
     except (TypeError, KeyError):
         logger.debug(
             "Extracting context from Lambda Event failed: either enable X-Ray active tracing or configure API Gateway to trigger this Lambda function as a pure proxy. Otherwise, generated spans will have an invalid (empty) parent context."
         )
+    if not isinstance(headers, dict):
         headers = {}
     return get_global_textmap().extract(headers)
 

instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py

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

instrumentation/opentelemetry-instrumentation-boto/setup.cfg

@@ -41,13 +41,13 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.30b0
-    opentelemetry-instrumentation == 0.30b0
+    opentelemetry-semantic-conventions == 0.30b1
+    opentelemetry-instrumentation == 0.30b1
 
 [options.extras_require]
 test =
     moto~=2.0
-    opentelemetry-test-utils == 0.30b0
+    opentelemetry-test-utils == 0.30b1
     markupsafe==2.0.1
 
 [options.packages.find]

instrumentation/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.30b0"
+__version__ = "0.30b1"

instrumentation/opentelemetry-instrumentation-botocore/setup.cfg

@@ -41,13 +41,13 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.30b0
-    opentelemetry-instrumentation == 0.30b0
+    opentelemetry-semantic-conventions == 0.30b1
+    opentelemetry-instrumentation == 0.30b1
 
 [options.extras_require]
 test =
     moto[all] ~= 2.2.6
-    opentelemetry-test-utils == 0.30b0
+    opentelemetry-test-utils == 0.30b1
     markupsafe==2.0.1
 
 [options.packages.find]

instrumentation/opentelemetry-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.30b0"
+__version__ = "0.30b1"

instrumentation/opentelemetry-instrumentation-celery/setup.cfg

@@ -41,13 +41,13 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.30b0
-    opentelemetry-instrumentation == 0.30b0
+    opentelemetry-semantic-conventions == 0.30b1
+    opentelemetry-instrumentation == 0.30b1
 
 [options.extras_require]
 test =
     pytest
-    opentelemetry-test-utils == 0.30b0
+    opentelemetry-test-utils == 0.30b1
 
 [options.packages.find]
 where = src

instrumentation/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.30b0"
+__version__ = "0.30b1"

instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg

@@ -41,13 +41,13 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-semantic-conventions == 0.30b0
-    opentelemetry-instrumentation == 0.30b0
+    opentelemetry-semantic-conventions == 0.30b1
+    opentelemetry-instrumentation == 0.30b1
     wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]
 test =
-    opentelemetry-test-utils == 0.30b0
+    opentelemetry-test-utils == 0.30b1
 
 [options.packages.find]
 where = src

instrumentation/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.30b0"
+__version__ = "0.30b1"
 
 _instruments = tuple()