Merge branch 'main' into aiohttp-server-instrumentation

Author: decko

.github/component_owners.yml

@@ -3,6 +3,7 @@ components:
   docs/instrumentation:
     - nemoshlag
 
+
   instrumentation/opentelemetry-instrumentation-aio-pika:
     - ofek1weiss
 
@@ -63,3 +64,6 @@ components:
 
   instrumentation/opentelemetry-instrumentation-requests:
     - ocelotl
+
+  instrumentation/opentelemetry-instrumentation-cassandra:
+    - mattcontinisio

.github/workflows/test.yml

@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: e9530c5c548d08a6aaa56268d103f9beb00cd002
+  CORE_REPO_SHA: c41b6bf29e9486a71ba1c40cd0ea35a03b2f7489
 
 jobs:
   build:

CHANGELOG.md

@@ -6,25 +6,48 @@ 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
+
+### 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))
+
+### Added
+
+- `opentelemetry-resource-detector-azure` Add resource detectors for Azure App Service and VM
+  ([#1901](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1901))
+
+## Version 1.19.0/0.40b0 (2023-07-13)
 - `opentelemetry-instrumentation-asgi` Add `http.server.request.size` metric
   ([#1867](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1867))
 
 ### Fixed
 
+- `opentelemetry-instrumentation-django` Fix empty span name when using
+  `path("", ...)` ([#1788](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1788)
 - Fix elastic-search instrumentation sanitization to support bulk queries
   ([#1870](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1870))
 - Update falcon instrumentation to follow semantic conventions
   ([#1824](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1824))
-- Fix sqlalchemy instrumentation wrap methods to accept sqlcommenter options([#1873](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1873))
+- Fix sqlalchemy instrumentation wrap methods to accept sqlcommenter options
+  ([#1873](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1873))
 
 ### Added
 
-- Fix async redis clients not being traced correctly ([#1830](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1830))
+- 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
+  ([#1830](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1830))
 - Make Flask request span attributes available for `start_span`. 
   ([#1784](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1784))
 - Fix falcon instrumentation's usage of Span Status to only set the description if the status code is ERROR.
   ([#1840](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1840))
-- Instrument all httpx versions >= 0.18. ([#1748](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1748))
+- Instrument all httpx versions >= 0.18.
+  ([#1748](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1748))
 - Fix `Invalid type NoneType for attribute X  (opentelemetry-instrumentation-aws-lambda)` error when some attributes do not exist
   ([#1780](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1780))
 - Add metric instrumentation for celery
@@ -37,14 +60,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1810](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1810))
 - `opentelemetry-instrumentation-urllib3` Add support for urllib3 version 2
   ([#1879](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1879))
+- 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)
 
-- `opentelemetry-instrumentation-system-metrics` Add `process.` prefix to `runtime.memory`, `runtime.cpu.time`, and `runtime.gc_count`. Change `runtime.memory` from count to UpDownCounter. ([#1735](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1735))
+- Update runtime metrics to follow semantic conventions
+  ([#1735](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1735))
 - Add request and response hooks for GRPC instrumentation (client only)
   ([#1706](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1706))
 - Fix memory leak in SQLAlchemy instrumentation where disposed `Engine` does not get garbage collected
-  ([#1771](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1771)
+  ([#1771](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1771))
 - `opentelemetry-instrumentation-pymemcache` Update instrumentation to support pymemcache >4
   ([#1764](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1764))
 - `opentelemetry-instrumentation-confluent-kafka` Add support for higher versions of confluent_kafka
@@ -67,8 +97,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- `opentelemetry-instrumentation-botocore` now uses the AWS X-Ray propagator by
-  default
+- `opentelemetry-instrumentation-botocore` now uses the AWS X-Ray propagator by default
   ([#1741](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1741))
 
 ### Fixed
@@ -86,7 +115,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Update HTTP server/client instrumentation span names to comply with spec
-  ([#1759](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1759)
+  ([#1759](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1759))
 
 ## Version 1.17.0/0.38b0 (2023-03-22)
 

_template/version.py

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

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
@@ -33,6 +34,7 @@ falcon~=2.0
 grpcio~=1.27
 kafka-python>=2.0,<3.0
 mysql-connector-python~=8.0
+mysqlclient~=2.1.1
 psutil>=5
 pika>=0.12.0
 pymongo~=3.1

docs/instrumentation/cassandra/cassandra.rst

@@ -0,0 +1,7 @@
+OpenTelemetry Cassandra Instrumentation
+=======================================
+
+.. automodule:: opentelemetry.instrumentation.cassandra
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/instrumentation/mysqlclient/mysqlclient.rst

@@ -0,0 +1,7 @@
+OpenTelemetry mysqlclient Instrumentation
+=========================================
+
+.. automodule:: opentelemetry.instrumentation.mysqlclient
+    :members:
+    :undoc-members:
+    :show-inheritance:

eachdist.ini

@@ -16,7 +16,7 @@ sortfirst=
     ext/*
 
 [stable]
-version=1.19.0.dev
+version=1.20.0.dev
 
 packages=
     opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.40b0.dev
+version=0.41b0.dev
 
 packages=
     all

exporter/opentelemetry-exporter-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.40b0.dev"
+__version__ = "0.41b0.dev"

exporter/opentelemetry-exporter-richconsole/pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
 dependencies = [
   "opentelemetry-api ~= 1.12",
   "opentelemetry-sdk ~= 1.12",
-  "opentelemetry-semantic-conventions == 0.40b0.dev",
+  "opentelemetry-semantic-conventions == 0.41b0.dev",
   "rich>=10.0.0",
 ]
 

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.40b0.dev"
+__version__ = "0.41b0.dev"

instrumentation/README.md

@@ -10,6 +10,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
@@ -24,6 +25,7 @@
 | [opentelemetry-instrumentation-kafka-python](./opentelemetry-instrumentation-kafka-python) | kafka-python >= 2.0 | No
 | [opentelemetry-instrumentation-logging](./opentelemetry-instrumentation-logging) | logging | No
 | [opentelemetry-instrumentation-mysql](./opentelemetry-instrumentation-mysql) | mysql-connector-python ~= 8.0 | No
+| [opentelemetry-instrumentation-mysqlclient](./opentelemetry-instrumentation-mysqlclient) | mysqlclient < 3 | No
 | [opentelemetry-instrumentation-pika](./opentelemetry-instrumentation-pika) | pika >= 0.12.0 | No
 | [opentelemetry-instrumentation-psycopg2](./opentelemetry-instrumentation-psycopg2) | psycopg2 >= 2.7.3.1 | No
 | [opentelemetry-instrumentation-pymemcache](./opentelemetry-instrumentation-pymemcache) | pymemcache >= 1.3.5, < 5 | No

instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml

@@ -35,7 +35,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-aio-pika[instruments]",
-  "opentelemetry-test-utils == 0.40b0.dev",
+  "opentelemetry-test-utils == 0.41b0.dev",
   "pytest",
   "wrapt >= 1.0.0, < 2.0.0",
 ]

instrumentation/opentelemetry-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.40b0.dev"
+__version__ = "0.41b0.dev"

instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml

@@ -26,9 +26,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.40b0.dev",
-  "opentelemetry-semantic-conventions == 0.40b0.dev",
-  "opentelemetry-util-http == 0.40b0.dev",
+  "opentelemetry-instrumentation == 0.41b0.dev",
+  "opentelemetry-semantic-conventions == 0.41b0.dev",
+  "opentelemetry-util-http == 0.41b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

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.40b0.dev"
+__version__ = "0.41b0.dev"

instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.40b0.dev",
-  "opentelemetry-instrumentation-dbapi == 0.40b0.dev",
+  "opentelemetry-instrumentation == 0.41b0.dev",
+  "opentelemetry-instrumentation-dbapi == 0.41b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
@@ -37,8 +37,8 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-aiopg[instruments]",
-  "opentelemetry-semantic-conventions == 0.40b0.dev",
-  "opentelemetry-test-utils == 0.40b0.dev",
+  "opentelemetry-semantic-conventions == 0.41b0.dev",
+  "opentelemetry-test-utils == 0.41b0.dev",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

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.40b0.dev"
+__version__ = "0.41b0.dev"

instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml

@@ -27,9 +27,9 @@ classifiers = [
 dependencies = [
   "asgiref ~= 3.0",
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.40b0.dev",
-  "opentelemetry-semantic-conventions == 0.40b0.dev",
-  "opentelemetry-util-http == 0.40b0.dev",
+  "opentelemetry-instrumentation == 0.41b0.dev",
+  "opentelemetry-semantic-conventions == 0.41b0.dev",
+  "opentelemetry-util-http == 0.41b0.dev",
 ]
 
 [project.optional-dependencies]
@@ -38,7 +38,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-asgi[instruments]",
-  "opentelemetry-test-utils == 0.40b0.dev",
+  "opentelemetry-test-utils == 0.41b0.dev",
 ]
 
 [project.urls]

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

@@ -538,6 +538,7 @@ async def __call__(self, scope, receive, send):
             receive: An awaitable callable yielding dictionaries
             send: An awaitable callable taking a single dictionary as argument.
         """
+        start = default_timer()
         if scope["type"] not in ("http", "websocket"):
             return await self.app(scope, receive, send)
 
@@ -591,7 +592,6 @@ async def __call__(self, scope, receive, send):
                     send,
                     duration_attrs,
                 )
-                start = default_timer()
 
                 await self.app(scope, otel_receive, otel_send)
         finally:

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.40b0.dev"
+__version__ = "0.41b0.dev"

instrumentation/opentelemetry-instrumentation-asgi/tests/test_asgi_middleware.py

@@ -14,6 +14,7 @@
 
 # pylint: disable=too-many-lines
 
+import asyncio
 import sys
 import unittest
 from timeit import default_timer
@@ -796,5 +797,38 @@ async def wrapped_app(scope, receive, send):
         )
 
 
+class TestAsgiApplicationRaisingError(AsgiTestBase):
+    def tearDown(self):
+        pass
+
+    @mock.patch(
+        "opentelemetry.instrumentation.asgi.collect_custom_request_headers_attributes",
+        side_effect=ValueError("whatever"),
+    )
+    def test_asgi_issue_1883(
+        self, mock_collect_custom_request_headers_attributes
+    ):
+        """
+        Test that exception UnboundLocalError local variable 'start' referenced before assignment is not raised
+        See https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1883
+        """
+        app = otel_asgi.OpenTelemetryMiddleware(simple_asgi)
+        self.seed_app(app)
+        self.send_default_request()
+        try:
+            asyncio.get_event_loop().run_until_complete(
+                self.communicator.stop()
+            )
+        except ValueError as exc_info:
+            self.assertEqual(exc_info.args[0], "whatever")
+        except Exception as exc_info:  # pylint: disable=W0703
+            self.fail(
+                "expecting ValueError('whatever'), received instead: "
+                + str(exc_info)
+            )
+        else:
+            self.fail("expecting ValueError('whatever')")
+
+
 if __name__ == "__main__":
     unittest.main()

instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.40b0.dev",
-  "opentelemetry-semantic-conventions == 0.40b0.dev",
+  "opentelemetry-instrumentation == 0.41b0.dev",
+  "opentelemetry-semantic-conventions == 0.41b0.dev",
 ]
 
 [project.optional-dependencies]
@@ -36,7 +36,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-asyncpg[instruments]",
-  "opentelemetry-test-utils == 0.40b0.dev",
+  "opentelemetry-test-utils == 0.41b0.dev",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

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.40b0.dev"
+__version__ = "0.41b0.dev"