cleanup

Author: liustve

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

@@ -90,8 +90,8 @@
 OTEL_EXPORTER_OTLP_TRACES_ENDPOINT = "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT"
 OTEL_EXPORTER_OTLP_LOGS_ENDPOINT = "OTEL_EXPORTER_OTLP_LOGS_ENDPOINT"
 
-AWS_TRACES_OTLP_ENDPOINT_PATTERN = r"^https://xray\\.([a-z0-9-]+)\\.amazonaws\\.com/v1/traces$"
-AWS_LOGS_OTLP_ENDPOINT_PATTERN = r"^https://logs\\.([a-z0-9-]+)\\.amazonaws\\.com/v1/logs$"
+AWS_TRACES_OTLP_ENDPOINT_PATTERN = r"https://xray\.([a-z0-9-]+)\.amazonaws\.com/v1/traces$"
+AWS_LOGS_OTLP_ENDPOINT_PATTERN = r"https://logs\.([a-z0-9-]+)\.amazonaws\.com/v1/logs$"
 
 # UDP package size is not larger than 64KB
 LAMBDA_SPAN_EXPORT_BATCH_SIZE = 10
@@ -177,7 +177,7 @@ def _init_logging(
     set_logger_provider(provider)
 
     for _, exporter_class in exporters.items():
-        exporter_args = {}
+        exporter_args: Dict[str, any] = {}
         log_exporter = _customize_logs_exporter(exporter_class(**exporter_args), resource)
         provider.add_log_record_processor(BatchLogRecordProcessor(exporter=log_exporter))
 
@@ -496,16 +496,12 @@ def _is_lambda_environment():
 def is_aws_otlp_endpoint(otlp_endpoint: str = None, service: str = "xray") -> bool:
     """Is the given endpoint an AWS OTLP endpoint?"""
 
+    pattern = AWS_TRACES_OTLP_ENDPOINT_PATTERN if service == "xray" else AWS_LOGS_OTLP_ENDPOINT_PATTERN
+
     if not otlp_endpoint:
         return False
 
-    if service == "xray":
-        return bool(re.match(AWS_TRACES_OTLP_ENDPOINT_PATTERN, otlp_endpoint.lower()))
-
-    if service == "logs":
-        return bool(re.match(AWS_LOGS_OTLP_ENDPOINT_PATTERN, otlp_endpoint.lower()))
-
-    return False
+    return bool(re.match(pattern, otlp_endpoint.lower()))
 
 
 def _get_metric_export_interval():