Run precommit and update variable

Author: DylanRussell

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

@@ -247,7 +247,7 @@ def _get_exporter_names(
 
 def _init_exporter(
     signal_type: Literal["traces", "metrics", "logs"],
-    exporter_args_map: Mapping[str, Any],
+    exporter_args: ExporterArgsMap,
     exporter_class: Union[
         Type[SpanExporter], Type[MetricExporter], Type[LogExporter]
     ],
@@ -268,9 +268,14 @@ def _init_exporter(
     if otlp_credential_param:
         credential_key, credential = otlp_credential_param
         # We only want to inject credentials into the appropriate OTLP HTTP // GRPC exporters.
-        if credential_key in inspect.signature(exporter_class.__init__).parameters and ("opentelemetry.exporter.otlp.proto.http" in str(exporter_class) or "opentelemetry.exporter.otlp.proto.grpc" in str(exporter_class)):
-            exporter_args_map[credential_key] = credential
-    return exporter_class(**exporter_args_map)
+        if credential_key in inspect.signature(
+            exporter_class.__init__
+        ).parameters and (
+            "opentelemetry.exporter.otlp.proto.http" in str(exporter_class)
+            or "opentelemetry.exporter.otlp.proto.grpc" in str(exporter_class)
+        ):
+            exporter_args[credential_key] = credential
+    return exporter_class(**exporter_args)
 
 
 def _init_tracing(

opentelemetry-sdk/tests/test_configurator.py

@@ -22,14 +22,13 @@
 from typing import Iterable, Optional, Sequence
 from unittest import TestCase, mock
 from unittest.mock import Mock, patch
-from requests import Session
-from grpc import ChannelCredentials
 
+from grpc import ChannelCredentials
 from pytest import raises
+from requests import Session
 
 from opentelemetry import trace
 from opentelemetry.context import Context
-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,
@@ -42,18 +41,19 @@
     _import_exporters,
     _import_id_generator,
     _import_sampler,
-    _init_logging,
     _init_exporter,
+    _init_logging,
     _init_metrics,
     _init_tracing,
-    _load_credential_from_envvar,
     _initialize_components,
     _OTelSDKConfigurator,
 )
 from opentelemetry.sdk._logs import LoggingHandler
 from opentelemetry.sdk._logs._internal.export import LogExporter
 from opentelemetry.sdk._logs.export import ConsoleLogExporter
 from opentelemetry.sdk.environment_variables import (
+    OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER,
+    OTEL_PYTHON_EXPORTER_OTLP_TRACES_CREDENTIAL_PROVIDER,
     OTEL_TRACES_SAMPLER,
     OTEL_TRACES_SAMPLER_ARG,
 )
@@ -184,7 +184,13 @@ def shutdown(self, timeout_millis: float = 30_000, **kwargs) -> None:
 
 
 class DummyOTLPMetricExporter:
-    def __init__(self, compression: str | None = None, session: Session | None = 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
@@ -210,7 +216,13 @@ def shutdown(self):
 
 
 class OTLPSpanExporter:
-    def __init__(self, compression: str | None = None, credentials: ChannelCredentials | None = None, *args, **kwargs):
+    def __init__(
+        self,
+        compression: str | None = None,
+        credentials: ChannelCredentials | None = None,
+        *args,
+        **kwargs,
+    ):
         self.compression = compression
         self.credentials = credentials
 
@@ -415,8 +427,12 @@ def test_trace_init_custom_id_generator(self, mock_entry_points):
         provider = self.set_provider_mock.call_args[0][0]
         self.assertIsInstance(provider.id_generator, CustomIdGenerator)
 
-
-    @patch.dict(environ, {OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER: "custom_session"})
+    @patch.dict(
+        environ,
+        {
+            OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER: "custom_session"
+        },
+    )
     @patch("opentelemetry.sdk._configuration.entry_points")
     def test_that_session_gets_passed_to_exporter(self, mock_entry_points):
         # Should not be used, trace specific version should override.
@@ -427,12 +443,24 @@ def test_that_session_gets_passed_to_exporter(self, mock_entry_points):
                 IterEntryPoint("custom_session", session_for_metrics_only)
             ]
         )
-        exporter = _init_exporter('metrics', {}, DummyOTLPMetricExporter, otlp_credential_param_for_all_signal_types=("session", session_for_all_signals))
+        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.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.
@@ -443,7 +471,12 @@ def test_that_credential_gets_passed_to_exporter(self, mock_entry_points):
                 IterEntryPoint("custom_credential", credential_for_trace_only)
             ]
         )
-        exporter = _init_exporter('traces', {}, OTLPSpanExporter, otlp_credential_param_for_all_signal_types=credential_for_all_signals)
+        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
 
@@ -777,7 +810,11 @@ def test_logging_init_disable_default(self, logging_mock, tracing_mock):
         _initialize_components(auto_instrumentation_version="auto-version")
         self.assertEqual(tracing_mock.call_count, 1)
         logging_mock.assert_called_once_with(
-            mock.ANY, mock.ANY, False, otlp_credential_param=None, exporter_args_map=None
+            mock.ANY,
+            mock.ANY,
+            False,
+            otlp_credential_param=None,
+            exporter_args_map=None,
         )
 
     @patch.dict(
@@ -793,7 +830,11 @@ def test_logging_init_enable_env(self, logging_mock, tracing_mock):
         with self.assertLogs(level=WARNING):
             _initialize_components(auto_instrumentation_version="auto-version")
         logging_mock.assert_called_once_with(
-            mock.ANY, mock.ANY, True, otlp_credential_param=None, exporter_args_map=None
+            mock.ANY,
+            mock.ANY,
+            True,
+            otlp_credential_param=None,
+            exporter_args_map=None,
         )
         self.assertEqual(tracing_mock.call_count, 1)