Merge branch 'main' into audit-and-test-opentelemetry-instrumentation…

…-elasticsearch-no-op-tracer

.github/workflows/test.yml

@@ -102,10 +102,10 @@ jobs:
     steps:
       - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v2
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: Install tox
         run: pip install tox==3.27.1
       - name: Install libsnappy-dev

CHANGELOG.md

@@ -9,10 +9,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- `opentelemetry-instrumentation-redis` Add `sanitize_query` config option to allow query sanitization.  ([#1572](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1572))
+- `opentelemetry-instrumentation-celery` Record exceptions as events on the span.
+  ([#1573](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1573))
 - Add metric instrumentation for urllib
   ([#1553](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1553))
 - `opentelemetry/sdk/extension/aws` Implement [`aws.ecs.*`](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/semantic_conventions/cloud_provider/aws/ecs.md) and [`aws.logs.*`](https://opentelemetry.io/docs/reference/specification/resource/semantic_conventions/cloud_provider/aws/logs/) resource attributes in the `AwsEcsResourceDetector` detector when the ECS Metadata v4 is available
   ([#1212](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1212))
+- `opentelemetry-instrumentation-aio-pika` Support `aio_pika` 8.x
+  ([#1481](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1481))
+- `opentelemetry-instrumentation-aws-lambda` Flush `MeterProvider` at end of function invocation.
+  ([#1613](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1613))
+- Fix aiohttp bug with unset `trace_configs`
+  ([#1592](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1592))
+- `opentelemetry-instrumentation-django` Allow explicit `excluded_urls` configuration through `instrument()`
+  ([#1618](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1618))
 
 ### Fixed
 

README.md

@@ -95,15 +95,15 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
 Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
 
 - [Aaron Abbott](https://github.com/aabmass), Google
-- [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
+- [Shalev Roda](https://github.com/shalevr), Cisco
 
 Emeritus Approvers:
 
 - [Hector Hernandez](https://github.com/hectorhdzg), Microsoft
 - [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
+- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
+- [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).*
 
@@ -116,6 +116,7 @@ Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-t
 Emeritus Maintainers:
 
 - [Alex Boten](https://github.com/codeboten), Lightstep
+- [Owais Lone](https://github.com/owais), Splunk
 
 *Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
 

exporter/opentelemetry-exporter-prometheus-remote-write/example/sampleapp.py

@@ -46,7 +46,7 @@
 
 # Callback to gather cpu usage
 def get_cpu_usage_callback(observer):
-    for (number, percent) in enumerate(psutil.cpu_percent(percpu=True)):
+    for number, percent in enumerate(psutil.cpu_percent(percpu=True)):
         labels = {"cpu_number": str(number)}
         yield Observation(percent, labels)
 

exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/__init__.py

@@ -300,7 +300,6 @@ def _sanitize_string(string: str, type_: str) -> str:
         return sanitized
 
     def _parse_histogram_data_point(self, data_point, name):
-
         sample_attr_pairs = []
 
         base_attrs = list(data_point.attributes.items())
@@ -341,7 +340,6 @@ def handle_bucket(value, bound=None, name_override=None):
         return sample_attr_pairs
 
     def _parse_data_point(self, data_point, name=None):
-
         attrs = tuple(data_point.attributes.items()) + (
             ("__name__", self._sanitize_string(name, "name")),
         )

exporter/opentelemetry-exporter-prometheus-remote-write/tests/test_prometheus_remote_write_exporter.py

@@ -56,7 +56,6 @@ def test_regex_invalid(prom_rw):
 
 
 def test_parse_data_point(prom_rw):
-
     attrs = {"Foo": "Bar", "Baz": 42}
     timestamp = 1641946016139533244
     value = 242.42

instrumentation/README.md

@@ -1,7 +1,7 @@
 
 | Instrumentation | Supported Packages | Metrics support |
 | --------------- | ------------------ | --------------- |
-| [opentelemetry-instrumentation-aio-pika](./opentelemetry-instrumentation-aio-pika) | aio_pika ~= 7.2.0 | No
+| [opentelemetry-instrumentation-aio-pika](./opentelemetry-instrumentation-aio-pika) | aio_pika >= 7.2.0, < 9.0.0 | No
 | [opentelemetry-instrumentation-aiohttp-client](./opentelemetry-instrumentation-aiohttp-client) | aiohttp ~= 3.0 | No
 | [opentelemetry-instrumentation-aiopg](./opentelemetry-instrumentation-aiopg) | aiopg >= 0.13.0, < 2.0.0 | No
 | [opentelemetry-instrumentation-asgi](./opentelemetry-instrumentation-asgi) | asgiref ~= 3.0 | No

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

@@ -31,7 +31,7 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = [
-  "aio_pika ~= 7.2.0",
+  "aio_pika >= 7.2.0, < 9.0.0",
 ]
 test = [
   "opentelemetry-instrumentation-aio-pika[instruments]",

instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/package.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 from typing import Collection
 
-_instruments: Collection[str] = ("aio_pika ~= 7.2.0",)
+_instruments: Collection[str] = ("aio_pika >= 7.2.0, < 9.0.0",)

instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/span_builder.py

@@ -24,7 +24,7 @@
 )
 from opentelemetry.trace import Span, SpanKind, Tracer
 
-_DEFAULT_ATTRIBUTES = {SpanAttributes.MESSAGING_SYSTEM: 'rabbitmq'}
+_DEFAULT_ATTRIBUTES = {SpanAttributes.MESSAGING_SYSTEM: "rabbitmq"}
 
 
 class SpanBuilder:
@@ -49,18 +49,30 @@ def set_destination(self, destination: str):
         self._attributes[SpanAttributes.MESSAGING_DESTINATION] = destination
 
     def set_channel(self, channel: AbstractChannel):
-        url = channel.connection.connection.url
-        self._attributes.update({
-            SpanAttributes.NET_PEER_NAME: url.host,
-            SpanAttributes.NET_PEER_PORT: url.port
-        })
+        connection = channel.connection
+        if getattr(connection, "connection", None):
+            # aio_rmq 7
+            url = connection.connection.url
+        else:
+            # aio_rmq 8
+            url = connection.url
+        self._attributes.update(
+            {
+                SpanAttributes.NET_PEER_NAME: url.host,
+                SpanAttributes.NET_PEER_PORT: url.port,
+            }
+        )
 
     def set_message(self, message: AbstractMessage):
         properties = message.properties
         if properties.message_id:
-            self._attributes[SpanAttributes.MESSAGING_MESSAGE_ID] = properties.message_id
+            self._attributes[
+                SpanAttributes.MESSAGING_MESSAGE_ID
+            ] = properties.message_id
         if properties.correlation_id:
-            self._attributes[SpanAttributes.MESSAGING_CONVERSATION_ID] = properties.correlation_id
+            self._attributes[
+                SpanAttributes.MESSAGING_CONVERSATION_ID
+            ] = properties.correlation_id
 
     def build(self) -> Optional[Span]:
         if not is_instrumentation_enabled():
@@ -69,9 +81,11 @@ def build(self) -> Optional[Span]:
             self._attributes[SpanAttributes.MESSAGING_OPERATION] = self._operation.value
         else:
             self._attributes[SpanAttributes.MESSAGING_TEMP_DESTINATION] = True
-        span = self._tracer.start_span(self._generate_span_name(), kind=self._kind, attributes=self._attributes)
+        span = self._tracer.start_span(
+            self._generate_span_name(), kind=self._kind, attributes=self._attributes
+        )
         return span
 
     def _generate_span_name(self) -> str:
-        operation_value = self._operation.value if self._operation else 'send'
-        return f'{self._destination} {operation_value}'
+        operation_value = self._operation.value if self._operation else "send"
+        return f"{self._destination} {operation_value}"

instrumentation/opentelemetry-instrumentation-aio-pika/tests/consts.py

@@ -15,8 +15,10 @@
 SERVER_URL = URL(
     f"amqp://{SERVER_USER}:{SERVER_PASS}@{SERVER_HOST}:{SERVER_PORT}/"
 )
-CONNECTION = Namespace(connection=Namespace(url=SERVER_URL))
-CHANNEL = Namespace(connection=CONNECTION, loop=None)
+CONNECTION_7 = Namespace(connection=Namespace(url=SERVER_URL))
+CONNECTION_8 = Namespace(url=SERVER_URL)
+CHANNEL_7 = Namespace(connection=CONNECTION_7, loop=None)
+CHANNEL_8 = Namespace(connection=CONNECTION_8, loop=None)
 MESSAGE = Namespace(
     properties=Namespace(
         message_id=MESSAGE_ID, correlation_id=CORRELATION_ID, headers={}

instrumentation/opentelemetry-instrumentation-aio-pika/tests/test_callback_decorator.py

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import asyncio
-from unittest import TestCase, mock
+from unittest import TestCase, mock, skipIf
 
-from aio_pika import Queue
+from aio_pika import Queue, version_info
 
 from opentelemetry.instrumentation.aio_pika.callback_decorator import (
     CallbackDecorator,
@@ -23,7 +23,8 @@
 from opentelemetry.trace import SpanKind, get_tracer
 
 from .consts import (
-    CHANNEL,
+    CHANNEL_7,
+    CHANNEL_8,
     CORRELATION_ID,
     EXCHANGE_NAME,
     MESSAGE,
@@ -35,7 +36,8 @@
 )
 
 
-class TestInstrumentedQueue(TestCase):
+@skipIf(version_info >= (8, 0), "Only for aio_pika 7")
+class TestInstrumentedQueueAioRmq7(TestCase):
     EXPECTED_ATTRIBUTES = {
         SpanAttributes.MESSAGING_SYSTEM: MESSAGING_SYSTEM,
         SpanAttributes.MESSAGING_DESTINATION: EXCHANGE_NAME,
@@ -52,7 +54,7 @@ def setUp(self):
         asyncio.set_event_loop(self.loop)
 
     def test_get_callback_span(self):
-        queue = Queue(CHANNEL, QUEUE_NAME, False, False, False, None)
+        queue = Queue(CHANNEL_7, QUEUE_NAME, False, False, False, None)
         tracer = mock.MagicMock()
         CallbackDecorator(tracer, queue)._get_span(MESSAGE)
         tracer.start_span.assert_called_once_with(
@@ -62,7 +64,47 @@ def test_get_callback_span(self):
         )
 
     def test_decorate_callback(self):
-        queue = Queue(CHANNEL, QUEUE_NAME, False, False, False, None)
+        queue = Queue(CHANNEL_7, QUEUE_NAME, False, False, False, None)
+        callback = mock.MagicMock(return_value=asyncio.sleep(0))
+        with mock.patch.object(
+            CallbackDecorator, "_get_span"
+        ) as mocked_get_callback_span:
+            callback_decorator = CallbackDecorator(self.tracer, queue)
+            decorated_callback = callback_decorator.decorate(callback)
+            self.loop.run_until_complete(decorated_callback(MESSAGE))
+        mocked_get_callback_span.assert_called_once()
+        callback.assert_called_once_with(MESSAGE)
+
+
+@skipIf(version_info <= (8, 0), "Only for aio_pika 8")
+class TestInstrumentedQueueAioRmq8(TestCase):
+    EXPECTED_ATTRIBUTES = {
+        SpanAttributes.MESSAGING_SYSTEM: MESSAGING_SYSTEM,
+        SpanAttributes.MESSAGING_DESTINATION: EXCHANGE_NAME,
+        SpanAttributes.NET_PEER_NAME: SERVER_HOST,
+        SpanAttributes.NET_PEER_PORT: SERVER_PORT,
+        SpanAttributes.MESSAGING_MESSAGE_ID: MESSAGE_ID,
+        SpanAttributes.MESSAGING_CONVERSATION_ID: CORRELATION_ID,
+        SpanAttributes.MESSAGING_OPERATION: "receive",
+    }
+
+    def setUp(self):
+        self.tracer = get_tracer(__name__)
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
+
+    def test_get_callback_span(self):
+        queue = Queue(CHANNEL_8, QUEUE_NAME, False, False, False, None)
+        tracer = mock.MagicMock()
+        CallbackDecorator(tracer, queue)._get_span(MESSAGE)
+        tracer.start_span.assert_called_once_with(
+            f"{EXCHANGE_NAME} receive",
+            kind=SpanKind.CONSUMER,
+            attributes=self.EXPECTED_ATTRIBUTES,
+        )
+
+    def test_decorate_callback(self):
+        queue = Queue(CHANNEL_8, QUEUE_NAME, False, False, False, None)
         callback = mock.MagicMock(return_value=asyncio.sleep(0))
         with mock.patch.object(
             CallbackDecorator, "_get_span"