Merge pull request #405 from solarwinds/NH-88067-setdefault-disable-a…

…ws-lambda-inst

NH-88067 setdefault for disabling aws-lambda if outside lambda

solarwinds_apm/distro.py

@@ -18,6 +18,9 @@
     OTEL_TRACES_EXPORTER,
 )
 from opentelemetry.instrumentation.distro import BaseDistro
+from opentelemetry.instrumentation.environment_variables import (
+    OTEL_PYTHON_DISABLED_INSTRUMENTATIONS,
+)
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.logging.environment_variables import (
     OTEL_PYTHON_LOG_FORMAT,
@@ -139,6 +142,17 @@ def _configure(self, **kwargs):
         # Always opt into new semconv for all instrumentors (if supported)
         environ["OTEL_SEMCONV_STABILITY_OPT_IN"] = self.get_semconv_opt_in()
 
+        # TODO: Bootstrapping and auto-instrumentation ideally
+        # should not load instrumentor nor instrument AWS Lambda if not in lambda
+        if not SolarWindsApmConfig.calculate_is_lambda():
+            # If user has set OTEL_PYTHON_DISABLED_INSTRUMENTATIONS
+            # then they will need to add "aws-lambda" to the list
+            # else instrumentor Version Lookups for attributes may fail
+            environ.setdefault(
+                OTEL_PYTHON_DISABLED_INSTRUMENTATIONS,
+                "aws-lambda",
+            )
+
     def load_instrumentor(self, entry_point: EntryPoint, **kwargs):
         """Takes a collection of instrumentation entry points
         and activates them by instantiating and calling instrument()

solarwinds_apm/version.py

@@ -1 +1 @@
-__version__ = "2.2.0.1"
+__version__ = "2.2.0.3"

tests/unit/test_distro.py

@@ -13,6 +13,9 @@
     OTEL_PROPAGATORS,
     OTEL_TRACES_EXPORTER
 )
+from opentelemetry.instrumentation.environment_variables import (
+    OTEL_PYTHON_DISABLED_INSTRUMENTATIONS,
+)
 from opentelemetry.sdk.environment_variables import (
     OTEL_EXPORTER_OTLP_LOGS_ENDPOINT,
     OTEL_EXPORTER_OTLP_LOGS_HEADERS,
@@ -297,6 +300,15 @@ def test_configure_env_propagators(self, mocker):
         assert os.environ[OTEL_TRACES_EXPORTER] == "solarwinds_exporter"
         assert os.environ.get("OTEL_SEMCONV_STABILITY_OPT_IN") == "http"
 
+    def test_configure_env_disabled_instrumentations_default(self):
+        distro.SolarWindsDistro()._configure()
+        assert os.environ[OTEL_PYTHON_DISABLED_INSTRUMENTATIONS] == "aws-lambda"
+
+    def test_configure_env_disabled_instrumentations_user_set(self, mocker):
+        mocker.patch.dict(os.environ, {"OTEL_PYTHON_DISABLED_INSTRUMENTATIONS": "foo-bar,only"})
+        distro.SolarWindsDistro()._configure()
+        assert os.environ[OTEL_PYTHON_DISABLED_INSTRUMENTATIONS] == "foo-bar,only"
+
     def test_load_instrumentor_no_commenting(self, mocker):
         mock_instrument = mocker.Mock()
         mock_instrumentor = mocker.Mock()