Skip to content

Commit 82e0b46

Browse files
committed
plug emf and compact console log exporter to lambda
1 parent b7d0506 commit 82e0b46

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsApplicationSignalsCustomizerProvider.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
import java.util.logging.Logger;
6767
import javax.annotation.concurrent.Immutable;
6868
import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.AwsCloudWatchEmfExporter;
69+
import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.ConsoleEmfExporter;
6970
import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.logs.OtlpAwsLogsExporterBuilder;
7071
import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.traces.OtlpAwsSpanExporterBuilder;
7172

@@ -540,24 +541,29 @@ MetricExporter customizeMetricExporter(
540541
Optional<String> awsRegion = getAwsRegionFromConfig(configProps);
541542

542543
if (awsRegion.isPresent()) {
544+
String namespace = headers.get(AWS_EMF_METRICS_NAMESPACE);
545+
543546
if (headers.containsKey(AWS_OTLP_LOGS_GROUP_HEADER)
544547
&& headers.containsKey(AWS_OTLP_LOGS_STREAM_HEADER)) {
545-
String namespace = headers.get(AWS_EMF_METRICS_NAMESPACE);
546548
String logGroup = headers.get(AWS_OTLP_LOGS_GROUP_HEADER);
547549
String logStream = headers.get(AWS_OTLP_LOGS_STREAM_HEADER);
548550
return new AwsCloudWatchEmfExporter(namespace, logGroup, logStream, awsRegion.get());
549551
}
552+
if (isLambdaEnvironment()) {
553+
return new ConsoleEmfExporter(namespace);
554+
}
550555
logger.warning(
551556
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,
553559
AWS_OTLP_LOGS_GROUP_HEADER,
554560
AWS_OTLP_LOGS_STREAM_HEADER,
555561
AWS_EMF_METRICS_NAMESPACE));
556562

557563
} else {
558564
logger.warning(
559565
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",
561567
AWS_REGION, AWS_DEFAULT_REGION));
562568
}
563569
}

0 commit comments

Comments
 (0)