Fix broken tests

Author: DylanRussell

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

@@ -257,11 +257,11 @@ def _init_exporter(
         ]
     ] = None,
 ) -> Union[SpanExporter, MetricExporter, LogExporter]:
-    otlp_credential_param_for_signal_type = _load_credential_from_envvar(
-        _EXPORTER_CREDENTIAL_BY_SIGNAL_TYPE[signal_type]
-    )
+    # Per signal type envvar should take precedence over all signal type env var.
     otlp_credential_param = (
-        otlp_credential_param_for_signal_type
+        _load_credential_from_envvar(
+            _EXPORTER_CREDENTIAL_BY_SIGNAL_TYPE[signal_type]
+        )
         or otlp_credential_param_for_all_signal_types
     )
     if not otlp_credential_param:

opentelemetry-sdk/tests/test_configurator.py

@@ -734,7 +734,7 @@ 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, exporter_args_map=None
+            mock.ANY, mock.ANY, False, otlp_credential_param=None, exporter_args_map=None
         )
 
     @patch.dict(
@@ -750,7 +750,7 @@ 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, exporter_args_map=None
+            mock.ANY, mock.ANY, True, otlp_credential_param=None, exporter_args_map=None
         )
         self.assertEqual(tracing_mock.call_count, 1)
 
@@ -868,17 +868,20 @@ def test_initialize_components_kwargs(
             id_generator="TEST_GENERATOR",
             sampler="TEST_SAMPLER",
             resource="TEST_RESOURCE",
+            otlp_credential_param=None,
             exporter_args_map={1: {"compression": "gzip"}},
         )
         metrics_mock.assert_called_once_with(
             "TEST_METRICS_EXPORTERS_DICT",
             "TEST_RESOURCE",
+            otlp_credential_param=None,
             exporter_args_map={1: {"compression": "gzip"}},
         )
         logging_mock.assert_called_once_with(
             "TEST_LOG_EXPORTERS_DICT",
             "TEST_RESOURCE",
             True,
+            otlp_credential_param=None,
             exporter_args_map={1: {"compression": "gzip"}},
         )