Address comments

Author: bjrara

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/aws_opentelemetry_configurator.py

@@ -78,6 +78,7 @@
 AWS_LAMBDA_FUNCTION_NAME_CONFIG = "AWS_LAMBDA_FUNCTION_NAME"
 AWS_XRAY_DAEMON_ADDRESS_CONFIG = "AWS_XRAY_DAEMON_ADDRESS"
 OTEL_AWS_PYTHON_DEFER_TO_WORKERS_ENABLED_CONFIG = "OTEL_AWS_PYTHON_DEFER_TO_WORKERS_ENABLED"
+SYSTEM_METRICS_INSTRUMENTATION_SCOPE_NAME = "opentelemetry.instrumentation.system_metrics"
 OTEL_EXPORTER_OTLP_TRACES_ENDPOINT = "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT"
 # UDP package size is not larger than 64KB
 LAMBDA_SPAN_EXPORT_BATCH_SIZE = 10
@@ -347,17 +348,17 @@ def _customize_span_processors(provider: TracerProvider, resource: Resource) ->
 
 def _customize_metric_exporters(metric_readers: List[MetricReader], views: List[View]) -> None:
     if _is_application_signals_runtime_enabled():
-        system_metrics_scope_name = "opentelemetry.instrumentation.system_metrics"
+        runtime_metrics_scope_name = SYSTEM_METRICS_INSTRUMENTATION_SCOPE_NAME
         if 0 == len(metric_readers):
-            _logger.info("Registered scope %s", system_metrics_scope_name)
-            views.append(View(meter_name=system_metrics_scope_name, aggregation=DefaultAggregation()))
+            _logger.info("Registered scope %s", runtime_metrics_scope_name)
+            views.append(View(meter_name=runtime_metrics_scope_name, aggregation=DefaultAggregation()))
             views.append(View(instrument_name="*", aggregation=DropAggregation()))
 
-        otel_metric_exporter = ApplicationSignalsExporterProvider().create_exporter()
+        application_signals_metric_exporter = ApplicationSignalsExporterProvider().create_exporter()
         scope_based_periodic_exporting_metric_reader = ScopeBasedPeriodicExportingMetricReader(
-            exporter=otel_metric_exporter,
+            exporter=application_signals_metric_exporter,
             export_interval_millis=_get_metric_export_interval(),
-            registered_scope_names={system_metrics_scope_name},
+            registered_scope_names={runtime_metrics_scope_name},
         )
         metric_readers.append(scope_based_periodic_exporting_metric_reader)
 

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/test_aws_opentelementry_configurator.py

@@ -239,23 +239,26 @@ def test_not_using_xray_sampler_does_not_modify_url_exclusion_env_vars(self):
     def test_is_application_signals_enabled(self):
         os.environ.setdefault("OTEL_AWS_APPLICATION_SIGNALS_ENABLED", "True")
         self.assertTrue(_is_application_signals_enabled())
-        self.assertTrue(_is_application_signals_runtime_enabled())
+        os.environ.pop("OTEL_AWS_APPLICATION_SIGNALS_ENABLED", None)
 
+        os.environ.setdefault("OTEL_AWS_APPLICATION_SIGNALS_ENABLED", "False")
+        self.assertFalse(_is_application_signals_enabled())
+        os.environ.pop("OTEL_AWS_APPLICATION_SIGNALS_ENABLED", None)
+        self.assertFalse(_is_application_signals_enabled())
+
+    def test_is_application_signals_runtime_enabled(self):
+        os.environ.setdefault("OTEL_AWS_APPLICATION_SIGNALS_ENABLED", "True")
+        self.assertTrue(_is_application_signals_runtime_enabled())
         os.environ.setdefault("OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED", "False")
-        self.assertTrue(_is_application_signals_enabled())
         self.assertFalse(_is_application_signals_runtime_enabled())
-        os.environ.pop("OTEL_AWS_APPLICATION_SIGNALS_ENABLED", None)
-        os.environ.pop("OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED", None)
 
         os.environ.setdefault("OTEL_AWS_APPLICATION_SIGNALS_ENABLED", "False")
         os.environ.setdefault("OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED", "True")
-        self.assertFalse(_is_application_signals_enabled())
         self.assertFalse(_is_application_signals_runtime_enabled())
 
         os.environ.pop("OTEL_AWS_APPLICATION_SIGNALS_ENABLED", None)
-        os.environ.pop("OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED", None)
+        os.environ.setdefault("OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED", None)
         self.assertFalse(_is_application_signals_enabled())
-        self.assertFalse(_is_application_signals_runtime_enabled())
 
     def test_customize_sampler(self):
         mock_sampler: Sampler = MagicMock()
@@ -405,11 +408,14 @@ def test_customize_metric_exporter(self):
 
         os.environ.setdefault("OTEL_AWS_APPLICATION_SIGNALS_ENABLED", "True")
         os.environ.setdefault("OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED", "True")
+        os.environ.setdefault("OTEL_METRIC_EXPORT_INTERVAL", "1000")
+
         _customize_metric_exporters(metric_readers, views)
         self.assertEqual(1, len(metric_readers))
         self.assertEqual(2, len(views))
         self.assertIsInstance(metric_readers[0], ScopeBasedPeriodicExportingMetricReader)
         pmr: ScopeBasedPeriodicExportingMetricReader = metric_readers[0]
+        self.assertEqual(1000, pmr._export_interval_millis)
         pmr.shutdown()
 
         periodic_exporting_metric_reader: PeriodicExportingMetricReader = MagicMock()
@@ -419,9 +425,12 @@ def test_customize_metric_exporter(self):
         self.assertEqual(2, len(metric_readers))
         self.assertIsInstance(metric_readers[1], ScopeBasedPeriodicExportingMetricReader)
         pmr: ScopeBasedPeriodicExportingMetricReader = metric_readers[1]
+        self.assertEqual(1000, pmr._export_interval_millis)
         pmr.shutdown()
         self.assertEqual(0, len(views))
 
+        os.environ.pop("OTEL_METRIC_EXPORT_INTERVAL", None)
+
 
 def validate_distro_environ():
     tc: TestCase = TestCase()