Merge branch 'main' into add_confluent_kafka_producer_returns

CHANGELOG.md

@@ -54,6 +54,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2474](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2474))
 - `opentelemetry-instrumentation-elasticsearch` Improved support for version 8
   ([#2420](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2420))
+- `opentelemetry-instrumentation-asyncio` Check for __name__ attribute in the coroutine
+  ([#2521](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2521))
 
 ## Version 1.24.0/0.45b0 (2024-03-28)
 

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

@@ -261,6 +261,8 @@ def trace_item(self, coro_or_future):
         return coro_or_future
 
     async def trace_coroutine(self, coro):
+        if not hasattr(coro, "__name__"):
+            return
         start = default_timer()
         attr = {
             "type": "coroutine",

instrumentation/opentelemetry-instrumentation-asyncio/tests/test_asyncio_anext.py

@@ -0,0 +1,56 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import asyncio
+from unittest.mock import patch
+
+# pylint: disable=no-name-in-module
+from opentelemetry.instrumentation.asyncio import AsyncioInstrumentor
+from opentelemetry.instrumentation.asyncio.environment_variables import (
+    OTEL_PYTHON_ASYNCIO_COROUTINE_NAMES_TO_TRACE,
+)
+from opentelemetry.test.test_base import TestBase
+from opentelemetry.trace import get_tracer
+
+
+class TestAsyncioAnext(TestBase):
+    @patch.dict(
+        "os.environ",
+        {OTEL_PYTHON_ASYNCIO_COROUTINE_NAMES_TO_TRACE: "async_func"},
+    )
+    def setUp(self):
+        super().setUp()
+        AsyncioInstrumentor().instrument()
+        self._tracer = get_tracer(
+            __name__,
+        )
+
+    def tearDown(self):
+        super().tearDown()
+        AsyncioInstrumentor().uninstrument()
+
+    # Asyncio anext() does not have __name__ attribute, which is used to determine if the coroutine should be traced.
+    # This test is to ensure that the instrumentation does not break when the coroutine does not have __name__ attribute.
+    def test_asyncio_anext(self):
+        async def main():
+            async def async_gen():
+                for it in range(2):
+                    yield it
+
+            async_gen_instance = async_gen()
+            agen = anext(async_gen_instance)
+            await asyncio.create_task(agen)
+
+        asyncio.run(main())
+        spans = self.memory_exporter.get_finished_spans()
+        self.assertEqual(len(spans), 0)

resource/opentelemetry-resource-detector-azure/README.rst

@@ -9,6 +9,7 @@ OpenTelemetry Resource detectors for Azure
 This library contains OpenTelemetry `Resource Detectors <https://opentelemetry.io/docs/specs/otel/resource/sdk/#detecting-resource-information-from-the-environment>`_ for the following Azure resources:
  * `Azure App Service <https://azure.microsoft.com/en-us/products/app-service>`_
  * `Azure Virtual Machines <https://azure.microsoft.com/en-us/products/virtual-machines>`_
+ * `Azure Functions (Experimental) <https://azure.microsoft.com/en-us/products/functions>`_
 
 Installation
 ------------
@@ -60,16 +61,6 @@ The Azure App Service Resource Detector sets the following Resource Attributes:
  * ``service.instance.id`` set to the value of the ``WEBSITE_INSTANCE_ID`` environment variable.
  * ``azure.app.service.stamp`` set to the value of the ``WEBSITE_HOME_STAMPNAME`` environment variable.
 
- The Azure Functions Resource Detector sets the following Resource Attributes:
- * ``service.name`` set to the value of the ``WEBSITE_SITE_NAME`` environment variable.
- * ``process.id`` set to the process ID collected from the running process.
- * ``cloud.platform`` set to ``azure_functions``.
- * ``cloud.provider`` set to ``azure``.
- * ``cloud.resource_id`` set using the ``WEBSITE_RESOURCE_GROUP``, ``WEBSITE_OWNER_NAME``, and ``WEBSITE_SITE_NAME`` environment variables.
- * ``cloud.region`` set to the value of the ``REGION_NAME`` environment variable.
- * ``faas.instance`` set to the value of the ``WEBSITE_INSTANCE_ID`` environment variable.
- * ``faas.max_memory`` set to the value of the ``WEBSITE_MEMORY_LIMIT_MB`` environment variable.
-
 The Azure VM Resource Detector sets the following Resource Attributes according to the response from the `Azure Metadata Service <https://learn.microsoft.com/azure/virtual-machines/instance-metadata-service?tabs=windows>`_:
  * ``azure.vm.scaleset.name`` set to the value of the ``vmScaleSetName`` field.
  * ``azure.vm.sku`` set to the value of the ``sku`` field.
@@ -84,6 +75,16 @@ The Azure VM Resource Detector sets the following Resource Attributes according
  * ``os.version`` set to the value of the ``version`` field.
  * ``service.instance.id`` set to the value of the ``vmId`` field.
 
+The Azure Functions Resource Detector is currently experimental. It sets the following Resource Attributes:
+ * ``service.name`` set to the value of the ``WEBSITE_SITE_NAME`` environment variable.
+ * ``process.id`` set to the process ID collected from the running process.
+ * ``cloud.platform`` set to ``azure_functions``.
+ * ``cloud.provider`` set to ``azure``.
+ * ``cloud.resource_id`` set using the ``WEBSITE_RESOURCE_GROUP``, ``WEBSITE_OWNER_NAME``, and ``WEBSITE_SITE_NAME`` environment variables.
+ * ``cloud.region`` set to the value of the ``REGION_NAME`` environment variable.
+ * ``faas.instance`` set to the value of the ``WEBSITE_INSTANCE_ID`` environment variable.
+ * ``faas.max_memory`` set to the value of the ``WEBSITE_MEMORY_LIMIT_MB`` environment variable.
+
 For more information, see the `Semantic Conventions for Cloud Resource Attributes <https://opentelemetry.io/docs/specs/otel/resource/semantic_conventions/cloud/>`_.
 
 References