Guard against unexpected tracerprovider

xrmx · xrmx · commit b5e79399018d · 2026-03-20T17:56:19.000+01:00
Spotted by macroscope
diff --git a/src/elasticotel/distro/config.py b/src/elasticotel/distro/config.py
@@ -212,6 +212,12 @@ def _rules_from_deactivate_instrumentations(csv: str) -> _TracerConfiguratorRule
 
 
 def _handle_deactivate_instrumentations(remote_config) -> ConfigUpdate:
+    tracer_provider = trace.get_tracer_provider()
+    set_tracer_configurator = getattr(tracer_provider, "_set_tracer_configurator", None)
+    if set_tracer_configurator is None:
+        logger.debug("Cannot get _set_tracer_configurator from tracer provider.")
+        return ConfigUpdate()
+
     config_deactivate_instrumentations = remote_config.get(DEACTIVATE_INSTRUMENTATIONS_CONFIG_KEY, "")
 
     rules = _rules_from_deactivate_instrumentations(config_deactivate_instrumentations)
@@ -222,12 +228,9 @@ def _handle_deactivate_instrumentations(remote_config) -> ConfigUpdate:
         return ConfigUpdate()
     # when rules are updated we need to clear the cache of the tracer_configurator function
     tracer_configurator._updatable_tracer_configurator.cache_clear()
-    tracer_provider = trace.get_tracer_provider()
-    tracer_provider._set_tracer_configurator(  # type: ignore [reportAttributeAccessIssue]
-        tracer_configurator=tracer_configurator._updatable_tracer_configurator
-    )
 
-    logger.debug('Updated deactivate instrumentations to "%s"', config_deactivate_instrumentations)
+    set_tracer_configurator(tracer_configurator=tracer_configurator._updatable_tracer_configurator)
+    logger.debug('Updated deactivate instrumentations to "%s".', config_deactivate_instrumentations)
     _config = _get_config()
     if _config:
         _config.deactivate_instrumentations.update(value=config_deactivate_instrumentations)
diff --git a/tests/distro/test_distro.py b/tests/distro/test_distro.py
@@ -931,6 +931,38 @@ def test_sets_deactivate_instrumentations_with_same_rules(
         self.assertEqual(len(rule_based_tracer_configurator.rules), 1)
         _updatable_tracer_configurator.cache_clear()
 
+    @mock.patch("elasticotel.distro.config._get_config")
+    @mock.patch("elasticotel.sdk.trace.tracer_configurator._get_tracer_configurator")
+    @mock.patch("opentelemetry.trace.get_tracer_provider")
+    def test_sets_deactivate_instrumentations_handles_unexpected_tracer_provider(
+        self, get_tracer_provider_mock, get_tracer_configurator_mock, get_config_mock
+    ):
+        config = Config()
+        get_config_mock.return_value = config
+        get_tracer_provider_mock.return_value = None
+
+        agent = mock.Mock()
+        client = mock.Mock()
+        config = opamp_pb2.AgentConfigMap()
+        config.config_map["elastic"].body = json.dumps({"deactivate_instrumentations": ""}).encode()
+        config.config_map["elastic"].content_type = "application/json"
+        remote_config = opamp_pb2.AgentRemoteConfig(config=config, config_hash=b"1234")
+        message = opamp_pb2.ServerToAgent(remote_config=remote_config)
+        opamp_handler(agent, client, message)
+
+        client._update_remote_config_status.assert_called_once_with(
+            remote_config_hash=b"1234", status=opamp_pb2.RemoteConfigStatuses_APPLIED, error_message=""
+        )
+        client._update_effective_config.assert_called_once_with(
+            {"elastic": {"logging_level": "warn", "sampling_rate": "1.0", "deactivate_instrumentations": ""}}
+        )
+        client._build_remote_config_status_response_message.assert_called_once_with(
+            client._update_remote_config_status()
+        )
+        agent.send.assert_called_once_with(payload=mock.ANY)
+        client._build_full_state_message.assert_not_called()
+        get_tracer_configurator_mock.assert_not_called()
+
     @mock.patch("elasticotel.distro.config._get_config")
     @mock.patch("opentelemetry.trace.get_tracer_provider")
     def test_calls_build_full_state_message_when_report_full_state_flag_is_set(
