consolidate log group and log stream config

Author: yiyuan-he

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

@@ -568,11 +568,35 @@ def _is_aws_otlp_endpoint(otlp_endpoint: str = None, service: str = "xray") -> b
     return bool(re.match(pattern, otlp_endpoint.lower()))
 
 
+def _parse_resource_attributes() -> Dict[str, str]:
+    """
+    Parse OTEL_RESOURCE_ATTRIBUTES environment variable into a dictionary.
+
+    Returns:
+        Dictionary of resource attributes
+    """
+    resource_attributes = {}
+    resource_attrs_str = os.environ.get("OTEL_RESOURCE_ATTRIBUTES", "")
+
+    if not resource_attrs_str:
+        return resource_attributes
+
+    for pair in resource_attrs_str.split(","):
+        if "=" in pair:
+            key, value = pair.split("=", 1)
+            resource_attributes[key.strip()] = value.strip()
+
+    return resource_attributes
+
+
 def _validate_logs_headers() -> OtlpLogHeaderSetting:
     """
     Checks if x-aws-log-group and x-aws-log-stream are present in the headers in order to send logs to
     AWS OTLP Logs endpoint.
 
+    When AGENT_OBSERVABILITY_ENABLED is true and OTEL_EXPORTER_OTLP_LOGS_HEADERS is not explicitly set,
+    this function will attempt to infer the headers from OTEL_RESOURCE_ATTRIBUTES.
+
     Returns:
         LogHeadersResult with log_group, log_stream, namespace and is_valid flag
     """
@@ -582,6 +606,25 @@ def _validate_logs_headers() -> OtlpLogHeaderSetting:
     log_stream = None
     namespace = None
 
+    # If logs headers are not explicitly set and agent observability is enabled,
+    # try to infer from OTEL_RESOURCE_ATTRIBUTES
+    if not logs_headers and is_agent_observability_enabled():
+        resource_attrs = _parse_resource_attributes()
+
+        # Extract log group and stream from resource attributes
+        log_group_names = resource_attrs.get("aws.log.group.names", "")
+        log_stream_names = resource_attrs.get("aws.log.stream.names", "")
+
+        if log_group_names and log_stream_names:
+            # Construct the headers string
+            inferred_headers = []
+            inferred_headers.append(f"{AWS_OTLP_LOGS_GROUP_HEADER}={log_group_names}")
+            inferred_headers.append(f"{AWS_OTLP_LOGS_STREAM_HEADER}={log_stream_names}")
+
+            # Use the inferred headers
+            logs_headers = ",".join(inferred_headers)
+            _logger.info("Inferred OTEL_EXPORTER_OTLP_LOGS_HEADERS from OTEL_RESOURCE_ATTRIBUTES: %s", logs_headers)
+
     if not logs_headers:
         _logger.warning(
             "Improper configuration: Please configure the environment variable OTEL_EXPORTER_OTLP_LOGS_HEADERS "

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

@@ -703,6 +703,82 @@ def customize_exporter_test(
             for key in config.keys():
                 os.environ.pop(key, None)
 
+    def test_validate_logs_headers_infers_from_resource_attributes(self):
+        """Test that _validate_logs_headers can infer headers from OTEL_RESOURCE_ATTRIBUTES"""
+        from amazon.opentelemetry.distro.aws_opentelemetry_configurator import (
+            _validate_logs_headers,
+            _parse_resource_attributes,
+        )
+
+        # Test _parse_resource_attributes function
+        os.environ["OTEL_RESOURCE_ATTRIBUTES"] = (
+            "service.name=TestService,aws.log.group.names=/aws/genesis/TestAgent,aws.log.stream.names=test-stream"
+        )
+        attrs = _parse_resource_attributes()
+        self.assertEqual(attrs["service.name"], "TestService")
+        self.assertEqual(attrs["aws.log.group.names"], "/aws/genesis/TestAgent")
+        self.assertEqual(attrs["aws.log.stream.names"], "test-stream")
+
+        # Test inference when AGENT_OBSERVABILITY_ENABLED is true and OTEL_EXPORTER_OTLP_LOGS_HEADERS is not set
+        os.environ["AGENT_OBSERVABILITY_ENABLED"] = "true"
+        os.environ["OTEL_RESOURCE_ATTRIBUTES"] = (
+            "service.name=TestService,aws.log.group.names=/aws/genesis/TestAgent,aws.log.stream.names=test-stream"
+        )
+        os.environ.pop("OTEL_EXPORTER_OTLP_LOGS_HEADERS", None)
+
+        result = _validate_logs_headers()
+        self.assertTrue(result.is_valid)
+        self.assertEqual(result.log_group, "/aws/genesis/TestAgent")
+        self.assertEqual(result.log_stream, "test-stream")
+
+        # Clean up
+        os.environ.pop("AGENT_OBSERVABILITY_ENABLED", None)
+        os.environ.pop("OTEL_RESOURCE_ATTRIBUTES", None)
+
+    def test_validate_logs_headers_explicit_takes_priority(self):
+        """Test that explicit OTEL_EXPORTER_OTLP_LOGS_HEADERS takes priority over inference"""
+        from amazon.opentelemetry.distro.aws_opentelemetry_configurator import _validate_logs_headers
+
+        # Set both explicit headers and resource attributes
+        os.environ["AGENT_OBSERVABILITY_ENABLED"] = "true"
+        os.environ["OTEL_RESOURCE_ATTRIBUTES"] = (
+            "aws.log.group.names=/aws/genesis/InferredAgent,aws.log.stream.names=inferred-stream"
+        )
+        os.environ["OTEL_EXPORTER_OTLP_LOGS_HEADERS"] = (
+            "x-aws-log-group=/aws/genesis/ExplicitAgent,x-aws-log-stream=explicit-stream"
+        )
+
+        result = _validate_logs_headers()
+        self.assertTrue(result.is_valid)
+        # Should use explicit headers, not inferred ones
+        self.assertEqual(result.log_group, "/aws/genesis/ExplicitAgent")
+        self.assertEqual(result.log_stream, "explicit-stream")
+
+        # Clean up
+        os.environ.pop("AGENT_OBSERVABILITY_ENABLED", None)
+        os.environ.pop("OTEL_RESOURCE_ATTRIBUTES", None)
+        os.environ.pop("OTEL_EXPORTER_OTLP_LOGS_HEADERS", None)
+
+    def test_validate_logs_headers_no_inference_when_agent_observability_disabled(self):
+        """Test that no inference happens when AGENT_OBSERVABILITY_ENABLED is false"""
+        from amazon.opentelemetry.distro.aws_opentelemetry_configurator import _validate_logs_headers
+
+        # Set resource attributes but keep agent observability disabled
+        os.environ["AGENT_OBSERVABILITY_ENABLED"] = "false"
+        os.environ["OTEL_RESOURCE_ATTRIBUTES"] = (
+            "aws.log.group.names=/aws/genesis/TestAgent,aws.log.stream.names=test-stream"
+        )
+        os.environ.pop("OTEL_EXPORTER_OTLP_LOGS_HEADERS", None)
+
+        result = _validate_logs_headers()
+        self.assertFalse(result.is_valid)
+        self.assertIsNone(result.log_group)
+        self.assertIsNone(result.log_stream)
+
+        # Clean up
+        os.environ.pop("AGENT_OBSERVABILITY_ENABLED", None)
+        os.environ.pop("OTEL_RESOURCE_ATTRIBUTES", None)
+
 
 def validate_distro_environ():
     tc: TestCase = TestCase()