|
66 | 66 | import java.util.logging.Logger; |
67 | 67 | import javax.annotation.concurrent.Immutable; |
68 | 68 | import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.AwsCloudWatchEmfExporter; |
| 69 | +import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.ConsoleEmfExporter; |
69 | 70 | import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.logs.OtlpAwsLogsExporterBuilder; |
70 | 71 | import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.traces.OtlpAwsSpanExporterBuilder; |
71 | 72 |
|
@@ -540,24 +541,29 @@ MetricExporter customizeMetricExporter( |
540 | 541 | Optional<String> awsRegion = getAwsRegionFromConfig(configProps); |
541 | 542 |
|
542 | 543 | if (awsRegion.isPresent()) { |
| 544 | + String namespace = headers.get(AWS_EMF_METRICS_NAMESPACE); |
| 545 | + |
543 | 546 | if (headers.containsKey(AWS_OTLP_LOGS_GROUP_HEADER) |
544 | 547 | && headers.containsKey(AWS_OTLP_LOGS_STREAM_HEADER)) { |
545 | | - String namespace = headers.get(AWS_EMF_METRICS_NAMESPACE); |
546 | 548 | String logGroup = headers.get(AWS_OTLP_LOGS_GROUP_HEADER); |
547 | 549 | String logStream = headers.get(AWS_OTLP_LOGS_STREAM_HEADER); |
548 | 550 | return new AwsCloudWatchEmfExporter(namespace, logGroup, logStream, awsRegion.get()); |
549 | 551 | } |
| 552 | + if (isLambdaEnvironment()) { |
| 553 | + return new ConsoleEmfExporter(namespace); |
| 554 | + } |
550 | 555 | logger.warning( |
551 | 556 | String.format( |
552 | | - "Improper configuration: Please configure the environment variable OTEL_EXPORTER_OTLP_LOGS_HEADERS to have values for %s, %s, and %s", |
| 557 | + "Improper EMF Exporter configuration: Please configure the environment variable %s to have values for %s, %s, and %s", |
| 558 | + OTEL_EXPORTER_OTLP_LOGS_HEADERS, |
553 | 559 | AWS_OTLP_LOGS_GROUP_HEADER, |
554 | 560 | AWS_OTLP_LOGS_STREAM_HEADER, |
555 | 561 | AWS_EMF_METRICS_NAMESPACE)); |
556 | 562 |
|
557 | 563 | } else { |
558 | 564 | logger.warning( |
559 | 565 | String.format( |
560 | | - "Improper configuration: AWS region not found in environment variables please set %s or %s", |
| 566 | + "Improper EMF Exporter configuration: AWS region not found in environment variables please set %s or %s", |
561 | 567 | AWS_REGION, AWS_DEFAULT_REGION)); |
562 | 568 | } |
563 | 569 | } |
|
0 commit comments