Merge branch 'main' into fix-url-typing

Author: Olegt0rr

Diff for: .github/component_owners.yml

@@ -1,5 +1,8 @@
 components:
 
+  instrumentation/opentelemetry-instrumentation-kafka-python:
+    - nozik
+  
   instrumentation/opentelemetry-instrumentation-pika:
     - oxeye-nikolay
     - nikosokolik

Diff for: .github/workflows/test.yml

@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: f0d559f5a8c40185e4cada6ed1914642b937f256
+  CORE_REPO_SHA: 523257d9e13273abf21d03fc92b33cae02816216
 
 jobs:
   build:

Diff for: CHANGELOG.md

@@ -5,24 +5,49 @@ 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.8.0-0.27b0...HEAD)
+## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.9.1-0.28b1...HEAD)
+
+## [1.9.1-0.28b1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.9.1-0.28b1) - 2022-01-29
+
+
+
+### Fixed
+
+- `opentelemetry-instrumentation-pika` requires `packaging` dependency
+
+
+## [1.9.0-0.28b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.9.0-0.28b0) - 2022-01-26
+
 
 ### Added
 
+- `opentelemetry-instrumentation-pyramid` Pyramid: Conditionally create SERVER spans
+  ([#869](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/869))
+- `opentelemetry-instrumentation-grpc` added `trailing_metadata` to _OpenTelemetryServicerContext.
+  ([#871](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/871))
 - `opentelemetry-instrumentation-asgi` now returns a `traceresponse` response header.
   ([#817](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/817))
+- `opentelemetry-instrumentation-kafka-python` added kafka-python module instrumentation.
+  ([#814](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/814))
+- `opentelemetry-instrumentation-falcon` Falcon: Conditionally create SERVER spans
+  ([#867](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/867))
+- `opentelemetry-instrumentation-pymongo` now supports `pymongo v4`
+  ([#876](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/876))
 
 ### Fixed
 
 - `opentelemetry-instrumentation-django` Django: Conditionally create SERVER spans
   ([#832](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/832))
-  
 - `opentelemetry-instrumentation-flask` Flask: Conditionally create SERVER spans
   ([#828](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/828))
-
+- `opentelemetry-instrumentation-celery` Celery: Support partial task time limit
+  ([#846](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/846))
 - `opentelemetry-instrumentation-asgi` ASGI: Conditionally create SERVER spans
   ([#843](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/843))
-
+- `opentelemetry-instrumentation-django` Django: fix issue preventing detection of MIDDLEWARE_CLASSES
+- `opentelemetry-instrumentation-sqlite3` Instrumentation now works with `dbapi2.connect`
+- `opentelemetry-instrumentation-kafka` Kafka: safe kafka partition extraction
+  ([#872](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/872))
 - `opentelemetry-instrumentation-aiohttp-client` aiohttp: Correct url filter input type
   ([#843](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/864))
 

Diff for: README.md

@@ -68,7 +68,7 @@ pip install -e ./instrumentation/opentelemetry-instrumentation-{integration}
 
 ## Releasing
 
-Maintainers aim to periodically release new versions of the packages in `opentelemetry-python-contrib`.
+Maintainers release new versions of the packages in `opentelemetry-python-contrib` on a monthly cadence. See [releases](https://github.com/open-telemetry/opentelemetry-python-contrib/releases) for all previous releases.
 
 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.
 

Diff for: _template/version.py

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

Diff for: dev-requirements.txt

@@ -1,7 +1,7 @@
 pylint<2.10
 flake8~=3.7
 isort~=5.6
-black>=21.10b0
+black>=22.1.0
 httpretty~=1.0
 mypy==0.790
 sphinx

Diff for: eachdist.ini

@@ -16,7 +16,7 @@ sortfirst=
     ext/*
 
 [stable]
-version=1.8.0
+version=1.9.1
 
 packages=
     opentelemetry-sdk
@@ -34,13 +34,19 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.27b0
+version=0.28b1
 
 packages=
     all
     opentelemetry-semantic-conventions
     opentelemetry-test-utils
     opentelemetry-instrumentation
+    opentelemetry-distro
+
+[exclude_release]
+packages=
+    opentelemetry-sdk-extension-aws
+    opentelemetry-propagator-aws-xray
 
 [lintroots]
 extraroots=examples/*,scripts/

Diff for: exporter/opentelemetry-exporter-datadog/setup.cfg

@@ -43,7 +43,7 @@ install_requires =
     ddtrace>=0.34.0,<0.47.0
     opentelemetry-api ~= 1.3
     opentelemetry-sdk ~= 1.3
-    opentelemetry-semantic-conventions == 0.27b0
+    opentelemetry-semantic-conventions == 0.28b1
 
 [options.packages.find]
 where = src

Diff for: 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.27b0"
+__version__ = "0.28b1"

Diff for: exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py

@@ -168,13 +168,13 @@ def test_translate_to_datadog(self):
         parent_id = 0x1111111111111111
         other_id = 0x2222222222222222
 
-        base_time = 683647322 * 10 ** 9  # in ns
+        base_time = 683647322 * 10**9  # in ns
         start_times = (
             base_time,
-            base_time + 150 * 10 ** 6,
-            base_time + 300 * 10 ** 6,
+            base_time + 150 * 10**6,
+            base_time + 300 * 10**6,
         )
-        durations = (50 * 10 ** 6, 100 * 10 ** 6, 200 * 10 ** 6)
+        durations = (50 * 10**6, 100 * 10**6, 200 * 10**6)
         end_times = (
             start_times[0] + durations[0],
             start_times[1] + durations[1],

Diff for: 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.27b0
+    opentelemetry-semantic-conventions == 0.28b1
 
 [options.packages.find]
 where = src

Diff for: 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.27b0"
+__version__ = "0.28b1"

Diff for: instrumentation/README.md

@@ -18,12 +18,13 @@
 | [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, < 4.0 |
+| [opentelemetry-instrumentation-kafka-python](./opentelemetry-instrumentation-kafka-python) | kafka-python >= 2.0 |
 | [opentelemetry-instrumentation-logging](./opentelemetry-instrumentation-logging) | logging |
 | [opentelemetry-instrumentation-mysql](./opentelemetry-instrumentation-mysql) | mysql-connector-python ~= 8.0 |
 | [opentelemetry-instrumentation-pika](./opentelemetry-instrumentation-pika) | pika >= 0.12.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-pymongo](./opentelemetry-instrumentation-pymongo) | pymongo >= 3.1, < 5.0 |
 | [opentelemetry-instrumentation-pymysql](./opentelemetry-instrumentation-pymysql) | PyMySQL < 2 |
 | [opentelemetry-instrumentation-pyramid](./opentelemetry-instrumentation-pyramid) | pyramid >= 1.7 |
 | [opentelemetry-instrumentation-redis](./opentelemetry-instrumentation-redis) | redis >= 2.6 |

Diff for: 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.27b0
-    opentelemetry-instrumentation == 0.27b0
-    opentelemetry-util-http == 0.27b0
+    opentelemetry-semantic-conventions == 0.28b1
+    opentelemetry-instrumentation == 0.28b1
+    opentelemetry-util-http == 0.28b1
     wrapt >= 1.0.0, < 2.0.0
 
 [options.packages.find]

Diff for: 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.27b0"
+__version__ = "0.28b1"

Diff for: 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.27b0
-    opentelemetry-instrumentation == 0.27b0
+    opentelemetry-instrumentation-dbapi == 0.28b1
+    opentelemetry-instrumentation == 0.28b1
     wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]
 test =
-    opentelemetry-test-utils == 0.27b0
-    opentelemetry-semantic-conventions == 0.27b0
+    opentelemetry-test-utils == 0.28b1
+    opentelemetry-semantic-conventions == 0.28b1
 
 [options.packages.find]
 where = src

Diff for: 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.27b0"
+__version__ = "0.28b1"

Diff for: 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.27b0
-    opentelemetry-instrumentation == 0.27b0
-    opentelemetry-util-http == 0.27b0
+    opentelemetry-semantic-conventions == 0.28b1
+    opentelemetry-instrumentation == 0.28b1
+    opentelemetry-util-http == 0.28b1
     asgiref ~= 3.0
 
 [options.extras_require]
 test =
-    opentelemetry-test-utils == 0.27b0
+    opentelemetry-test-utils == 0.28b1
 
 [options.packages.find]
 where = src

Diff for: 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.27b0"
+__version__ = "0.28b1"

Diff for: 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.27b0
-    opentelemetry-instrumentation == 0.27b0
+    opentelemetry-semantic-conventions == 0.28b1
+    opentelemetry-instrumentation == 0.28b1
 
 [options.extras_require]
 test =
-    opentelemetry-test-utils == 0.27b0
+    opentelemetry-test-utils == 0.28b1
 
 [options.packages.find]
 where = src

Diff for: 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.27b0"
+__version__ = "0.28b1"

Diff for: instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg

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

Diff for: 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.27b0"
+__version__ = "0.28b1"

Diff for: 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.27b0
-    opentelemetry-instrumentation == 0.27b0
+    opentelemetry-semantic-conventions == 0.28b1
+    opentelemetry-instrumentation == 0.28b1
 
 [options.extras_require]
 test =
     moto~=2.0
-    opentelemetry-test-utils == 0.27b0
+    opentelemetry-test-utils == 0.28b1
 
 [options.packages.find]
 where = src

Diff for: 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.27b0"
+__version__ = "0.28b1"

Diff for: 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.27b0
-    opentelemetry-instrumentation == 0.27b0
+    opentelemetry-semantic-conventions == 0.28b1
+    opentelemetry-instrumentation == 0.28b1
 
 [options.extras_require]
 test =
     moto[all] ~= 2.2.6
-    opentelemetry-test-utils == 0.27b0
+    opentelemetry-test-utils == 0.28b1
 
 [options.packages.find]
 where = src

Diff for: 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.27b0"
+__version__ = "0.28b1"

Diff for: instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_lambda.py

@@ -126,6 +126,7 @@ def _create_lambda_function(self, function_name: str, function_code: str):
             Publish=True,
         )
 
+    @mark.skip(reason="Docker error, unblocking builds for now.")
     @mark.skipif(
         sys.platform == "win32",
         reason="requires docker and Github CI Windows does not have docker installed by default",
@@ -152,7 +153,7 @@ def test_invoke(self):
             span = self.assert_invoke_span(function_name)
             span_context = span.get_span_context()
 
-            # assert injected span
+            # # assert injected span
             headers = json.loads(response["Payload"].read().decode("utf-8"))
             self.assertEqual(
                 str(span_context.trace_id),

Diff for: 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.27b0
-    opentelemetry-instrumentation == 0.27b0
+    opentelemetry-semantic-conventions == 0.28b1
+    opentelemetry-instrumentation == 0.28b1
 
 [options.extras_require]
 test =
     pytest
-    opentelemetry-test-utils == 0.27b0
+    opentelemetry-test-utils == 0.28b1
 
 [options.packages.find]
 where = src

Diff for: instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/utils.py

@@ -61,8 +61,11 @@ def set_attributes_from_context(span, context):
 
         # Skip `timelimit` if it is not set (it's default/unset value is a
         # tuple or a list of `None` values
-        if key == "timelimit" and value in [(None, None), [None, None]]:
-            continue
+        if key == "timelimit":
+            if value in [(None, None), [None, None]]:
+                continue
+            if None in value:
+                value = ["" if tl is None else tl for tl in value]
 
         # Skip `retries` if it's value is `0`
         if key == "retries" and value == 0: