Fix tests

Author: DylanRussell

opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init__.py

@@ -126,7 +126,7 @@ def _load_credential_from_envvar(
     if credential_env:
         credentials = _import_config_component(
             credential_env, "opentelemetry_otlp_credential_provider"
-        )()
+        )
         if isinstance(credentials, ChannelCredentials):
             return ("credentials", credentials)
         elif isinstance(credentials, Session):
@@ -271,13 +271,13 @@ def _init_exporter(
     if (
         credential_key == "credentials"
         and "credentials" in params
-        and isinstance(credential, params["credentials"].annotation)
+        and "ChannelCredentials" in params["credentials"].annotation
     ):
         return exporter_class(credentials=credential, **exporter_args_map)
     if (
         credential_key == "session"
         and "session" in params
-        and isinstance(credential, params["session"].annotation)
+        and "Session" in params["session"].annotation
     ):
         return exporter_class(session=credential, **exporter_args_map)
     return exporter_class(**exporter_args_map)

opentelemetry-sdk/tests/test_configurator.py

@@ -28,7 +28,7 @@
 
 from opentelemetry import trace
 from opentelemetry.context import Context
-from opentelemetry.sdk.environment_variables import OTEL_PYTHON_EXPORTER_OTLP_LOGS_CREDENTIAL_PROVIDER
+from opentelemetry.sdk.environment_variables import OTEL_PYTHON_EXPORTER_OTLP_TRACES_CREDENTIAL_PROVIDER, OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER
 from opentelemetry.environment_variables import OTEL_PYTHON_ID_GENERATOR
 from opentelemetry.sdk._configuration import (
     _EXPORTER_OTLP,
@@ -45,6 +45,7 @@
     _init_exporter,
     _init_metrics,
     _init_tracing,
+    _load_credential_from_envvar,
     _initialize_components,
     _OTelSDKConfigurator,
 )
@@ -182,7 +183,8 @@ def shutdown(self, timeout_millis: float = 30_000, **kwargs) -> None:
 
 
 class DummyOTLPMetricExporter:
-    def __init__(self, compression: str | None = None, session: Session | None, *args, **kwargs):
+    def __init__(self, compression: str | None = None, session: Session | None = None, *args, **kwargs):
+        self.session = session
         self.export_called = False
         self.compression = compression
 
@@ -209,6 +211,7 @@ def shutdown(self):
 class OTLPSpanExporter:
     def __init__(self, compression: str | None = None, credentials: ChannelCredentials | None = None, *args, **kwargs):
         self.compression = compression
+        self.credentials = credentials
 
 
 class DummyOTLPLogExporter(LogExporter):
@@ -412,15 +415,36 @@ def test_trace_init_custom_id_generator(self, mock_entry_points):
         self.assertIsInstance(provider.id_generator, CustomIdGenerator)
 
 
-    @patch.dict(environ, {OTEL_PYTHON_EXPORTER_OTLP_LOGS_CREDENTIAL_PROVIDER: "custom_session"})
+    @patch.dict(environ, {OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER: "custom_session"})
     @patch("opentelemetry.sdk._configuration.entry_points")
-    def check_that_credential_envvar_gets_passed_to_exporter(self, mock_entry_points):
+    def test_that_session_gets_passed_to_exporter(self, mock_entry_points):
+        # Should not be used, trace specific version should override.
+        session_for_all_signals = Session()
+        session_for_metrics_only = Session()
         mock_entry_points.configure_mock(
             return_value=[
-                IterEntryPoint("custom_session", Session())
+                IterEntryPoint("custom_session", session_for_metrics_only)
             ]
         )
-        exporter = _init_exporter('traces', None, OTLPSpanExporter)
+        exporter = _init_exporter('metrics', {}, DummyOTLPMetricExporter, otlp_credential_param_for_all_signal_types=("session", session_for_all_signals))
+        assert exporter.session is session_for_metrics_only
+        assert exporter.session is not session_for_all_signals
+
+
+    @patch.dict(environ, {OTEL_PYTHON_EXPORTER_OTLP_TRACES_CREDENTIAL_PROVIDER: "custom_credential"})
+    @patch("opentelemetry.sdk._configuration.entry_points")
+    def test_that_credential_gets_passed_to_exporter(self, mock_entry_points):
+        # Should not be used, trace specific version should override.
+        credential_for_all_signals = ChannelCredentials(None)
+        credential_for_trace_only = ChannelCredentials(None)
+        mock_entry_points.configure_mock(
+            return_value=[
+                IterEntryPoint("custom_credential", credential_for_trace_only)
+            ]
+        )
+        exporter = _init_exporter('traces', {}, OTLPSpanExporter, otlp_credential_param_for_all_signal_types=credential_for_all_signals)
+        assert exporter.credentials is credential_for_trace_only
+        assert exporter.credentials is not credential_for_all_signals
 
     @patch.dict(
         "os.environ", {OTEL_TRACES_SAMPLER: "non_existent_entry_point"}