Merge remote-tracking branch 'origin/feature/asyncio-instrumentation'…

… into feature/asyncio-instrumentation # Conflicts: # CHANGELOG.md
open-telemetry · Sep 11, 2023 · 0bfc1c8 · 0bfc1c8
2 parents 31b6157 + 7581c30
commit 0bfc1c8
Show file tree

Hide file tree

Showing 125 changed files with 1,220 additions and 314 deletions.
diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -64,3 +64,6 @@ components:
 
   instrumentation/opentelemetry-instrumentation-requests:
     - ocelotl
+
+  instrumentation/opentelemetry-instrumentation-cassandra:
+    - mattcontinisio
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: c41b6bf29e9486a71ba1c40cd0ea35a03b2f7489
+  CORE_REPO_SHA: 0ef76a5cc39626f783416ca75e43556e2bb2739d
 
 jobs:
   build:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,12 +12,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1919](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1943))
 
 
+## Version 1.20.0/0.41b0 (2023-09-01)
+
 ### Fixed
 
 - `opentelemetry-instrumentation-asgi` Fix UnboundLocalError local variable 'start' referenced before assignment
   ([#1889](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1889))
 - Fixed union typing error not compatible with Python 3.7 introduced in `opentelemetry-util-http`, fix tests introduced by patch related to sanitize method for wsgi
   ([#1913](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1913))
+- `opentelemetry-instrumentation-celery` Unwrap Celery's `ExceptionInfo` errors and report the actual exception that was raised. ([#1863](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1863))
 
 ### Added
 
@@ -41,6 +44,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Add instrumentor support for cassandra and scylla
+  ([#1902](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1902))
 - Add instrumentor support for mysqlclient
   ([#1744](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1744))
 - Fix async redis clients not being traced correctly
@@ -66,6 +71,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add optional distro and configurator selection for auto-instrumentation
   ([#1823](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1823))
 
+### Added
+- `opentelemetry-instrumentation-kafka-python` Add instrumentation to `consume` method
+  ([#1786](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1786))
+
 ## Version 1.18.0/0.39b0 (2023-05-10)
 
 - Update runtime metrics to follow semantic conventions

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.41b0.dev"
+__version__ = "0.42b0.dev"
diff --git a/docs-requirements.txt b/docs-requirements.txt
@@ -25,6 +25,7 @@ asyncpg>=0.12.0
 boto~=2.0
 botocore~=1.0
 boto3~=1.0
+cassandra-driver~=3.25
 celery>=4.0
 confluent-kafka>= 1.8.2,<= 2.2.0
 elasticsearch>=2.0,<9.0

diff --git a/docs/instrumentation/cassandra/cassandra.rst b/docs/instrumentation/cassandra/cassandra.rst
@@ -0,0 +1,7 @@
+OpenTelemetry Cassandra Instrumentation
+=======================================
+
+.. automodule:: opentelemetry.instrumentation.cassandra
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/eachdist.ini b/eachdist.ini
@@ -16,7 +16,7 @@ sortfirst=
     ext/*
 
 [stable]
-version=1.20.0.dev
+version=1.21.0.dev
 
 packages=
     opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.41b0.dev
+version=0.42b0.dev
 
 packages=
     all

diff --git a/...ter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py b/...ter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.41b0.dev"
+__version__ = "0.42b0.dev"
diff --git a/exporter/opentelemetry-exporter-richconsole/pyproject.toml b/exporter/opentelemetry-exporter-richconsole/pyproject.toml
@@ -27,7 +27,7 @@ classifiers = [
 dependencies = [
   "opentelemetry-api ~= 1.12",
   "opentelemetry-sdk ~= 1.12",
-  "opentelemetry-semantic-conventions == 0.41b0.dev",
+  "opentelemetry-semantic-conventions == 0.42b0.dev",
   "rich>=10.0.0",
 ]
 

diff --git a/...rter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py b/...rter/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.41b0.dev"
+__version__ = "0.42b0.dev"
diff --git a/instrumentation/README.md b/instrumentation/README.md
@@ -11,6 +11,7 @@
 | [opentelemetry-instrumentation-boto](./opentelemetry-instrumentation-boto) | boto~=2.0 | No
 | [opentelemetry-instrumentation-boto3sqs](./opentelemetry-instrumentation-boto3sqs) | boto3 ~= 1.0 | No
 | [opentelemetry-instrumentation-botocore](./opentelemetry-instrumentation-botocore) | botocore ~= 1.0 | No
+| [opentelemetry-instrumentation-cassandra](./opentelemetry-instrumentation-cassandra) | cassandra-driver ~= 3.25,scylla-driver ~= 3.25 | No
 | [opentelemetry-instrumentation-celery](./opentelemetry-instrumentation-celery) | celery >= 4.0, < 6.0 | No
 | [opentelemetry-instrumentation-confluent-kafka](./opentelemetry-instrumentation-confluent-kafka) | confluent-kafka >= 1.8.2, <= 2.2.0 | No
 | [opentelemetry-instrumentation-dbapi](./opentelemetry-instrumentation-dbapi) | dbapi | No

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml
@@ -35,7 +35,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-aio-pika[instruments]",
-  "opentelemetry-test-utils == 0.41b0.dev",
+  "opentelemetry-test-utils == 0.42b0.dev",
   "pytest",
   "wrapt >= 1.0.0, < 2.0.0",
 ]

diff --git a/...ntelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.py b/...ntelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.41b0.dev"
+__version__ = "0.42b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml
@@ -26,9 +26,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.41b0.dev",
-  "opentelemetry-semantic-conventions == 0.41b0.dev",
-  "opentelemetry-util-http == 0.41b0.dev",
+  "opentelemetry-instrumentation == 0.42b0.dev",
+  "opentelemetry-semantic-conventions == 0.42b0.dev",
+  "opentelemetry-util-http == 0.42b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

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.41b0.dev"
+__version__ = "0.42b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.41b0.dev",
-  "opentelemetry-instrumentation-dbapi == 0.41b0.dev",
+  "opentelemetry-instrumentation == 0.42b0.dev",
+  "opentelemetry-instrumentation-dbapi == 0.42b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
@@ -37,8 +37,8 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-aiopg[instruments]",
-  "opentelemetry-semantic-conventions == 0.41b0.dev",
-  "opentelemetry-test-utils == 0.41b0.dev",
+  "opentelemetry-semantic-conventions == 0.42b0.dev",
+  "opentelemetry-test-utils == 0.42b0.dev",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

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.41b0.dev"
+__version__ = "0.42b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml
@@ -27,9 +27,9 @@ classifiers = [
 dependencies = [
   "asgiref ~= 3.0",
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.41b0.dev",
-  "opentelemetry-semantic-conventions == 0.41b0.dev",
-  "opentelemetry-util-http == 0.41b0.dev",
+  "opentelemetry-instrumentation == 0.42b0.dev",
+  "opentelemetry-semantic-conventions == 0.42b0.dev",
+  "opentelemetry-util-http == 0.42b0.dev",
 ]
 
 [project.optional-dependencies]
@@ -38,7 +38,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-asgi[instruments]",
-  "opentelemetry-test-utils == 0.41b0.dev",
+  "opentelemetry-test-utils == 0.42b0.dev",
 ]
 
 [project.urls]

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.41b0.dev"
+__version__ = "0.42b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.41b0.dev",
-  "opentelemetry-semantic-conventions == 0.41b0.dev",
+  "opentelemetry-instrumentation == 0.42b0.dev",
+  "opentelemetry-semantic-conventions == 0.42b0.dev",
 ]
 
 [project.optional-dependencies]
@@ -36,7 +36,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-asyncpg[instruments]",
-  "opentelemetry-test-utils == 0.41b0.dev",
+  "opentelemetry-test-utils == 0.42b0.dev",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

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.41b0.dev"
+__version__ = "0.42b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml
@@ -22,15 +22,15 @@ classifiers = [
   "Programming Language :: Python :: 3.8",
 ]
 dependencies = [
-  "opentelemetry-instrumentation == 0.41b0.dev",
+  "opentelemetry-instrumentation == 0.42b0.dev",
   "opentelemetry-propagator-aws-xray == 1.0.1",
-  "opentelemetry-semantic-conventions == 0.41b0.dev",
+  "opentelemetry-semantic-conventions == 0.42b0.dev",
 ]
 
 [project.optional-dependencies]
 instruments = []
 test = [
-  "opentelemetry-test-utils == 0.41b0.dev",
+  "opentelemetry-test-utils == 0.42b0.dev",
 ]
 
 [project.urls]

diff --git a/...emetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py b/...emetry-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.41b0.dev"
+__version__ = "0.42b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml b/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.41b0.dev",
-  "opentelemetry-semantic-conventions == 0.41b0.dev",
+  "opentelemetry-instrumentation == 0.42b0.dev",
+  "opentelemetry-semantic-conventions == 0.42b0.dev",
 ]
 
 [project.optional-dependencies]
@@ -38,7 +38,7 @@ test = [
   "opentelemetry-instrumentation-boto[instruments]",
   "markupsafe==2.0.1",
   "moto~=2.0",
-  "opentelemetry-test-utils == 0.41b0.dev",
+  "opentelemetry-test-utils == 0.42b0.dev",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

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.41b0.dev"
+__version__ = "0.42b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml b/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.41b0.dev",
-  "opentelemetry-semantic-conventions == 0.41b0.dev",
+  "opentelemetry-instrumentation == 0.42b0.dev",
+  "opentelemetry-semantic-conventions == 0.42b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
@@ -37,7 +37,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-boto3sqs[instruments]",
-  "opentelemetry-test-utils == 0.41b0.dev",
+  "opentelemetry-test-utils == 0.42b0.dev",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

diff --git a/...ntelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/version.py b/...ntelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.41b0.dev"
+__version__ = "0.42b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml b/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.41b0.dev",
-  "opentelemetry-semantic-conventions == 0.41b0.dev",
+  "opentelemetry-instrumentation == 0.42b0.dev",
+  "opentelemetry-semantic-conventions == 0.42b0.dev",
   "opentelemetry-propagator-aws-xray == 1.0.1",
 ]
 
@@ -39,7 +39,7 @@ test = [
   "opentelemetry-instrumentation-botocore[instruments]",
   "markupsafe==2.0.1",
   "moto[all] ~= 2.2.6",
-  "opentelemetry-test-utils == 0.41b0.dev",
+  "opentelemetry-test-utils == 0.42b0.dev",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

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.41b0.dev"
+__version__ = "0.42b0.dev"