Merge branch 'main' into py313

Author: xrmx

instrumentation-genai/opentelemetry-instrumentation-openai-v2/examples/zero-code/.env

@@ -12,10 +12,11 @@ OPENAI_API_KEY=sk-YOUR_API_KEY
 
 OTEL_SERVICE_NAME=opentelemetry-python-openai
 
-# Change to 'false' to disable logging
+# Change to 'false' to disable collection of python logging logs
 OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED=true
-# Change to 'console' if your OTLP endpoint doesn't support logs
-# TODO: this should not be necessary once https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3042 is released
-OTEL_LOGS_EXPORTER=otlp
+
+# Uncomment if your OTLP endpoint doesn't support logs
+# OTEL_LOGS_EXPORTER=console
+
 # Change to 'false' to hide prompt and completion content
 OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT=true

instrumentation-genai/opentelemetry-instrumentation-vertexai/examples/zero-code/.env

@@ -4,10 +4,11 @@
 
 OTEL_SERVICE_NAME=opentelemetry-python-vertexai
 
-# Change to 'false' to disable logging
+# Change to 'false' to disable collection of python logging logs
 OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED=true
-# Change to 'console' if your OTLP endpoint doesn't support logs
-# TODO: this should not be necessary once https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3042 is released
-OTEL_LOGS_EXPORTER=otlp
+
+# Uncomment if your OTLP endpoint doesn't support logs
+# OTEL_LOGS_EXPORTER=console
+
 # Change to 'false' to hide prompt and completion content
 OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT=true

instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt

@@ -5,7 +5,7 @@ Deprecated==1.2.14
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
-psycopg2-binary==2.9.9
+psycopg2-binary==2.9.10
 py-cpuinfo==9.0.0
 pytest==7.4.4
 tomli==2.0.1

instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/utils.py

@@ -12,15 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import logging
-from typing import ContextManager, Optional, Tuple
+from typing import TYPE_CHECKING, Optional, Tuple
 
 from celery import registry  # pylint: disable=no-name-in-module
 from celery.app.task import Task
 
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace import Span
 
+if TYPE_CHECKING:
+    from contextlib import AbstractContextManager
+
 logger = logging.getLogger(__name__)
 
 # Celery Context key
@@ -123,7 +128,7 @@ def attach_context(
     task: Optional[Task],
     task_id: str,
     span: Span,
-    activation: ContextManager[Span],
+    activation: AbstractContextManager[Span],
     token: Optional[object],
     is_publish: bool = False,
 ) -> None:
@@ -171,7 +176,7 @@ def detach_context(task, task_id, is_publish=False) -> None:
 
 def retrieve_context(
     task, task_id, is_publish=False
-) -> Optional[Tuple[Span, ContextManager[Span], Optional[object]]]:
+) -> Optional[Tuple[Span, AbstractContextManager[Span], Optional[object]]]:
     """Helper to retrieve an active `Span`, `ContextManager` and context token
     stored in a `Task` instance
     """

instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt

@@ -1,6 +1,6 @@
 amqp==5.2.0
 asgiref==3.8.1
-billiard==4.2.0
+billiard==4.2.1
 celery==5.3.6
 click==8.1.7
 click-didyoumean==0.3.0

instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt

@@ -3,7 +3,7 @@ Deprecated==1.2.14
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
-psycopg==3.1.18
+psycopg==3.2.2
 py-cpuinfo==9.0.0
 pytest==7.4.4
 tomli==2.0.1

instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt

@@ -3,7 +3,7 @@ Deprecated==1.2.14
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
-psycopg2==2.9.9
+psycopg2==2.9.10
 py-cpuinfo==9.0.0
 pytest==7.4.4
 tomli==2.0.1