Merge branch 'main' into wrap-connect-kwargs

Author: florianschieder

CHANGELOG.md

@@ -52,6 +52,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3842](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3842))
 - `opentelemetry-instrumentation-mysqlclient`: Pass all keyword parameters
   ([#3950](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3950))
+- `opentelemetry-instrumentation-redis`: Add default span name for pipeline operations
+  ([#3941](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3941))
+- `opentelemetry-instrumentation-pymongo`: Fix invalid mongodb collection attribute type
+  ([#3942](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3942))
 
 ## Version 1.38.0/0.59b0 (2025-10-16)
 

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

@@ -138,7 +138,7 @@ def started(self, event: monitoring.CommandStartedEvent):
         command_name = event.command_name
         span_name = f"{event.database_name}.{command_name}"
         statement = self._get_statement_by_command_name(command_name, event)
-        collection = event.command.get(event.command_name)
+        collection = _get_command_collection_name(event)
 
         try:
             span = self._tracer.start_span(span_name, kind=SpanKind.CLIENT)
@@ -226,6 +226,13 @@ def _get_statement_by_command_name(
         return statement
 
 
+def _get_command_collection_name(event: CommandEvent) -> str | None:
+    collection_name = event.command.get(event.command_name)
+    if not collection_name or not isinstance(collection_name, str):
+        return None
+    return collection_name
+
+
 def _get_span_dict_key(
     event: CommandEvent,
 ) -> int | tuple[int, tuple[str, int | None]]:

instrumentation/opentelemetry-instrumentation-pymongo/tests/test_pymongo.py

@@ -278,6 +278,43 @@ def test_capture_statement_disabled_aggregate(self):
             span.attributes[SpanAttributes.DB_STATEMENT], "aggregate"
         )
 
+    def test_collection_name_attribute(self):
+        scenarios = [
+            (
+                {
+                    "command_name": "find",
+                    "find": "test_collection",
+                },
+                "test_collection",
+            ),
+            ({"command_name": "find"}, None),
+            ({"command_name": "find", "find": b"invalid"}, None),
+        ]
+        for command_attrs, expected in scenarios:
+            with self.subTest(command_attrs=command_attrs, expected=expected):
+                mock_event = MockEvent(command_attrs)
+
+                command_tracer = CommandTracer(
+                    self.tracer, capture_statement=True
+                )
+                command_tracer.started(event=mock_event)
+                command_tracer.succeeded(event=mock_event)
+
+                spans_list = self.memory_exporter.get_finished_spans()
+
+                self.assertEqual(len(spans_list), 1)
+                span = spans_list[0]
+
+                self.assertEqual(
+                    span.attributes[SpanAttributes.DB_STATEMENT], "find"
+                )
+
+                self.assertEqual(
+                    span.attributes.get(SpanAttributes.DB_MONGODB_COLLECTION),
+                    expected,
+                )
+                self.memory_exporter.clear()
+
 
 class MockCommand:
     def __init__(self, command_attrs):

instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/util.py

@@ -207,4 +207,4 @@ def _build_span_meta_data_for_pipeline(
         resource = ""
         span_name = ""
 
-    return command_stack, resource, span_name
+    return command_stack, resource, span_name or "redis"

instrumentation/opentelemetry-instrumentation-redis/tests/test_redis.py

@@ -390,6 +390,17 @@ def redis_operations():
             self.assertEqual(span.kind, SpanKind.CLIENT)
             self.assertEqual(span.status.status_code, trace.StatusCode.UNSET)
 
+    def test_span_name_empty_pipeline(self):
+        redis_client = fakeredis.FakeStrictRedis()
+        pipe = redis_client.pipeline()
+        pipe.execute()
+
+        spans = self.memory_exporter.get_finished_spans()
+        self.assertEqual(len(spans), 1)
+        self.assertEqual(spans[0].name, "redis")
+        self.assertEqual(spans[0].kind, SpanKind.CLIENT)
+        self.assertEqual(spans[0].status.status_code, trace.StatusCode.UNSET)
+
 
 class TestRedisAsync(TestBase, IsolatedAsyncioTestCase):
     def assert_span_count(self, count: int):
@@ -543,6 +554,22 @@ def response_hook(span, conn, args):
         await self.client.set("key", "value")
         spans = self.assert_span_count(0)
 
+    @pytest.mark.asyncio
+    async def test_span_name_empty_pipeline(self):
+        redis_client = fakeredis.aioredis.FakeRedis()
+        self.instrumentor.instrument_client(
+            client=redis_client, tracer_provider=self.tracer_provider
+        )
+        async with redis_client.pipeline() as pipe:
+            await pipe.execute()
+
+        spans = self.memory_exporter.get_finished_spans()
+        self.assertEqual(len(spans), 1)
+        self.assertEqual(spans[0].name, "redis")
+        self.assertEqual(spans[0].kind, SpanKind.CLIENT)
+        self.assertEqual(spans[0].status.status_code, trace.StatusCode.UNSET)
+        self.instrumentor.uninstrument_client(client=redis_client)
+
 
 class TestRedisInstance(TestBase):
     def assert_span_count(self, count: int):

util/opentelemetry-util-genai/CHANGELOG.md

@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Minor change to check LRU cache in Completion Hook before acquiring semaphore/thread ([#3907](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3907)).
 - Add environment variable for genai upload hook queue size
   ([https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3943](#3943))
+- Add more Semconv attributes to LLMInvocation spans. 
+  ([https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3862](#3862))
 
 ## Version 0.2b0 (2025-10-14)
 

util/opentelemetry-util-genai/pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-  "opentelemetry-instrumentation ~= 0.57b0",
-  "opentelemetry-semantic-conventions ~= 0.57b0",
+  "opentelemetry-instrumentation ~= 0.58b0",
+  "opentelemetry-semantic-conventions ~= 0.58b0",
   "opentelemetry-api>=1.31.0",
 ]
 

util/opentelemetry-util-genai/src/opentelemetry/util/genai/handler.py

@@ -61,7 +61,7 @@
 from __future__ import annotations
 
 from contextlib import contextmanager
-from typing import Iterator, Optional
+from typing import Iterator
 
 from opentelemetry import context as otel_context
 from opentelemetry.semconv._incubating.attributes import (
@@ -93,7 +93,7 @@ def __init__(self, tracer_provider: TracerProvider | None = None):
             __name__,
             __version__,
             tracer_provider,
-            schema_url=Schemas.V1_36_0.value,
+            schema_url=Schemas.V1_37_0.value,
         )
 
     def start_llm(
@@ -132,6 +132,7 @@ def fail_llm(  # pylint: disable=no-self-use
             # TODO: Provide feedback that this invocation was not started
             return invocation
 
+        _apply_finish_attributes(invocation.span, invocation)
         _apply_error_attributes(invocation.span, error)
         # Detach context and end span
         otel_context.detach(invocation.context_token)
@@ -140,7 +141,7 @@ def fail_llm(  # pylint: disable=no-self-use
 
     @contextmanager
     def llm(
-        self, invocation: Optional[LLMInvocation] = None
+        self, invocation: LLMInvocation | None = None
     ) -> Iterator[LLMInvocation]:
         """Context manager for LLM invocations.
 
@@ -169,7 +170,7 @@ def get_telemetry_handler(
     """
     Returns a singleton TelemetryHandler instance.
     """
-    handler: Optional[TelemetryHandler] = getattr(
+    handler: TelemetryHandler | None = getattr(
         get_telemetry_handler, "_default_handler", None
     )
     if handler is None:

util/opentelemetry-util-genai/src/opentelemetry/util/genai/span_utils.py

@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from dataclasses import asdict
-from typing import List
+from typing import Any
 
 from opentelemetry.semconv._incubating.attributes import (
     gen_ai_attributes as GenAI,
@@ -60,32 +62,13 @@ def _apply_common_span_attributes(
         # TODO: clean provider name to match GenAiProviderNameValues?
         span.set_attribute(GenAI.GEN_AI_PROVIDER_NAME, invocation.provider)
 
-    if invocation.output_messages:
-        span.set_attribute(
-            GenAI.GEN_AI_RESPONSE_FINISH_REASONS,
-            [gen.finish_reason for gen in invocation.output_messages],
-        )
-
-    if invocation.response_model_name is not None:
-        span.set_attribute(
-            GenAI.GEN_AI_RESPONSE_MODEL, invocation.response_model_name
-        )
-    if invocation.response_id is not None:
-        span.set_attribute(GenAI.GEN_AI_RESPONSE_ID, invocation.response_id)
-    if invocation.input_tokens is not None:
-        span.set_attribute(
-            GenAI.GEN_AI_USAGE_INPUT_TOKENS, invocation.input_tokens
-        )
-    if invocation.output_tokens is not None:
-        span.set_attribute(
-            GenAI.GEN_AI_USAGE_OUTPUT_TOKENS, invocation.output_tokens
-        )
+    _apply_response_attributes(span, invocation)
 
 
 def _maybe_set_span_messages(
     span: Span,
-    input_messages: List[InputMessage],
-    output_messages: List[OutputMessage],
+    input_messages: list[InputMessage],
+    output_messages: list[OutputMessage],
 ) -> None:
     if not is_experimental_mode() or get_content_capturing_mode() not in (
         ContentCapturingMode.SPAN_ONLY,
@@ -112,6 +95,8 @@ def _apply_finish_attributes(span: Span, invocation: LLMInvocation) -> None:
     _maybe_set_span_messages(
         span, invocation.input_messages, invocation.output_messages
     )
+    _apply_request_attributes(span, invocation)
+    _apply_response_attributes(span, invocation)
     span.set_attributes(invocation.attributes)
 
 
@@ -122,7 +107,75 @@ def _apply_error_attributes(span: Span, error: Error) -> None:
         span.set_attribute(ErrorAttributes.ERROR_TYPE, error.type.__qualname__)
 
 
+def _apply_request_attributes(span: Span, invocation: LLMInvocation) -> None:
+    """Attach GenAI request semantic convention attributes to the span."""
+    attributes: dict[str, Any] = {}
+    if invocation.temperature is not None:
+        attributes[GenAI.GEN_AI_REQUEST_TEMPERATURE] = invocation.temperature
+    if invocation.top_p is not None:
+        attributes[GenAI.GEN_AI_REQUEST_TOP_P] = invocation.top_p
+    if invocation.frequency_penalty is not None:
+        attributes[GenAI.GEN_AI_REQUEST_FREQUENCY_PENALTY] = (
+            invocation.frequency_penalty
+        )
+    if invocation.presence_penalty is not None:
+        attributes[GenAI.GEN_AI_REQUEST_PRESENCE_PENALTY] = (
+            invocation.presence_penalty
+        )
+    if invocation.max_tokens is not None:
+        attributes[GenAI.GEN_AI_REQUEST_MAX_TOKENS] = invocation.max_tokens
+    if invocation.stop_sequences is not None:
+        attributes[GenAI.GEN_AI_REQUEST_STOP_SEQUENCES] = (
+            invocation.stop_sequences
+        )
+    if invocation.seed is not None:
+        attributes[GenAI.GEN_AI_REQUEST_SEED] = invocation.seed
+    if attributes:
+        span.set_attributes(attributes)
+
+
+def _apply_response_attributes(span: Span, invocation: LLMInvocation) -> None:
+    """Attach GenAI response semantic convention attributes to the span."""
+    attributes: dict[str, Any] = {}
+
+    finish_reasons: list[str] | None
+    if invocation.finish_reasons is not None:
+        finish_reasons = invocation.finish_reasons
+    elif invocation.output_messages:
+        finish_reasons = [
+            message.finish_reason
+            for message in invocation.output_messages
+            if message.finish_reason
+        ]
+    else:
+        finish_reasons = None
+
+    if finish_reasons:
+        # De-duplicate finish reasons
+        unique_finish_reasons = sorted(set(finish_reasons))
+        if unique_finish_reasons:
+            attributes[GenAI.GEN_AI_RESPONSE_FINISH_REASONS] = (
+                unique_finish_reasons
+            )
+
+    if invocation.response_model_name is not None:
+        attributes[GenAI.GEN_AI_RESPONSE_MODEL] = (
+            invocation.response_model_name
+        )
+    if invocation.response_id is not None:
+        attributes[GenAI.GEN_AI_RESPONSE_ID] = invocation.response_id
+    if invocation.input_tokens is not None:
+        attributes[GenAI.GEN_AI_USAGE_INPUT_TOKENS] = invocation.input_tokens
+    if invocation.output_tokens is not None:
+        attributes[GenAI.GEN_AI_USAGE_OUTPUT_TOKENS] = invocation.output_tokens
+
+    if attributes:
+        span.set_attributes(attributes)
+
+
 __all__ = [
     "_apply_finish_attributes",
     "_apply_error_attributes",
+    "_apply_request_attributes",
+    "_apply_response_attributes",
 ]