Merge branch 'master' into ivana/make-logs-and-metrics-go-via-scope

Author: sentrivana

sentry_sdk/integrations/grpc/__init__.py

@@ -1,25 +1,30 @@
 from functools import wraps
 
-import grpc
-from grpc import Channel, Server, intercept_channel
-from grpc.aio import Channel as AsyncChannel
-from grpc.aio import Server as AsyncServer
-
 from sentry_sdk.integrations import Integration
 from sentry_sdk.utils import parse_version
+from sentry_sdk.integrations import DidNotEnable
 
 from .client import ClientInterceptor
 from .server import ServerInterceptor
-from .aio.server import ServerInterceptor as AsyncServerInterceptor
-from .aio.client import (
-    SentryUnaryUnaryClientInterceptor as AsyncUnaryUnaryClientInterceptor,
-)
-from .aio.client import (
-    SentryUnaryStreamClientInterceptor as AsyncUnaryStreamClientIntercetor,
-)
 
 from typing import TYPE_CHECKING, Any, Optional, Sequence
 
+try:
+    import grpc
+    from grpc import Channel, Server, intercept_channel
+    from grpc.aio import Channel as AsyncChannel
+    from grpc.aio import Server as AsyncServer
+
+    from .aio.server import ServerInterceptor as AsyncServerInterceptor
+    from .aio.client import (
+        SentryUnaryUnaryClientInterceptor as AsyncUnaryUnaryClientInterceptor,
+    )
+    from .aio.client import (
+        SentryUnaryStreamClientInterceptor as AsyncUnaryStreamClientIntercetor,
+    )
+except ImportError:
+    raise DidNotEnable("grpcio is not installed.")
+
 # Hack to get new Python features working in older versions
 # without introducing a hard dependency on `typing_extensions`
 # from: https://stackoverflow.com/a/71944042/300572

sentry_sdk/integrations/grpc/aio/client.py

@@ -1,19 +1,23 @@
 from typing import Callable, Union, AsyncIterable, Any
 
-from grpc.aio import (
-    UnaryUnaryClientInterceptor,
-    UnaryStreamClientInterceptor,
-    ClientCallDetails,
-    UnaryUnaryCall,
-    UnaryStreamCall,
-    Metadata,
-)
-from google.protobuf.message import Message
-
 import sentry_sdk
 from sentry_sdk.consts import OP
+from sentry_sdk.integrations import DidNotEnable
 from sentry_sdk.integrations.grpc.consts import SPAN_ORIGIN
 
+try:
+    from grpc.aio import (
+        UnaryUnaryClientInterceptor,
+        UnaryStreamClientInterceptor,
+        ClientCallDetails,
+        UnaryUnaryCall,
+        UnaryStreamCall,
+        Metadata,
+    )
+    from google.protobuf.message import Message
+except ImportError:
+    raise DidNotEnable("grpcio is not installed")
+
 
 class ClientInterceptor:
     @staticmethod

sentry_sdk/integrations/opentelemetry/consts.py

@@ -1,5 +1,9 @@
-from opentelemetry.context import create_key
+from sentry_sdk.integrations import DidNotEnable
 
+try:
+    from opentelemetry.context import create_key
+except ImportError:
+    raise DidNotEnable("opentelemetry not installed")
 
 SENTRY_TRACE_KEY = create_key("sentry-trace")
 SENTRY_BAGGAGE_KEY = create_key("sentry-baggage")

sentry_sdk/integrations/opentelemetry/propagator.py

@@ -1,23 +1,4 @@
-from opentelemetry import trace
-from opentelemetry.context import (
-    Context,
-    get_current,
-    set_value,
-)
-from opentelemetry.propagators.textmap import (
-    CarrierT,
-    Getter,
-    Setter,
-    TextMapPropagator,
-    default_getter,
-    default_setter,
-)
-from opentelemetry.trace import (
-    NonRecordingSpan,
-    SpanContext,
-    TraceFlags,
-)
-
+from sentry_sdk.integrations import DidNotEnable
 from sentry_sdk.integrations.opentelemetry.consts import (
     SENTRY_BAGGAGE_KEY,
     SENTRY_TRACE_KEY,
@@ -31,6 +12,29 @@
 )
 from sentry_sdk.tracing_utils import Baggage, extract_sentrytrace_data
 
+try:
+    from opentelemetry import trace
+    from opentelemetry.context import (
+        Context,
+        get_current,
+        set_value,
+    )
+    from opentelemetry.propagators.textmap import (
+        CarrierT,
+        Getter,
+        Setter,
+        TextMapPropagator,
+        default_getter,
+        default_setter,
+    )
+    from opentelemetry.trace import (
+        NonRecordingSpan,
+        SpanContext,
+        TraceFlags,
+    )
+except ImportError:
+    raise DidNotEnable("opentelemetry not installed")
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:

sentry_sdk/integrations/opentelemetry/span_processor.py

@@ -2,21 +2,9 @@
 from time import time
 from typing import TYPE_CHECKING, cast
 
-from opentelemetry.context import get_value
-from opentelemetry.sdk.trace import SpanProcessor, ReadableSpan as OTelSpan
-from opentelemetry.semconv.trace import SpanAttributes
-from opentelemetry.trace import (
-    format_span_id,
-    format_trace_id,
-    get_current_span,
-    SpanKind,
-)
-from opentelemetry.trace.span import (
-    INVALID_SPAN_ID,
-    INVALID_TRACE_ID,
-)
 from sentry_sdk import get_client, start_transaction
 from sentry_sdk.consts import INSTRUMENTER, SPANSTATUS
+from sentry_sdk.integrations import DidNotEnable
 from sentry_sdk.integrations.opentelemetry.consts import (
     SENTRY_BAGGAGE_KEY,
     SENTRY_TRACE_KEY,
@@ -26,6 +14,23 @@
 
 from urllib3.util import parse_url as urlparse
 
+try:
+    from opentelemetry.context import get_value
+    from opentelemetry.sdk.trace import SpanProcessor, ReadableSpan as OTelSpan
+    from opentelemetry.semconv.trace import SpanAttributes
+    from opentelemetry.trace import (
+        format_span_id,
+        format_trace_id,
+        get_current_span,
+        SpanKind,
+    )
+    from opentelemetry.trace.span import (
+        INVALID_SPAN_ID,
+        INVALID_TRACE_ID,
+    )
+except ImportError:
+    raise DidNotEnable("opentelemetry not installed")
+
 if TYPE_CHECKING:
     from typing import Any, Optional, Union
     from opentelemetry import context as context_api

tests/test_shadowed_module.py

@@ -30,9 +30,7 @@ def pytest_generate_tests(metafunc):
             submodule_names
             - {
                 "clickhouse_driver",
-                "grpc",
                 "litellm",
-                "opentelemetry",
                 "pure_eval",
                 "ray",
                 "typer",