add compact log record exporter for lambda environment

Author: liustve

awsagentprovider/build.gradle.kts

@@ -46,6 +46,8 @@ dependencies {
   implementation("com.amazonaws:aws-java-sdk-core:1.12.773")
   // Export configuration
   compileOnly("io.opentelemetry:opentelemetry-exporter-otlp")
+  // For logging exporter
+  compileOnly("io.opentelemetry:opentelemetry-exporter-logging")
   // For Udp emitter
   compileOnly("io.opentelemetry:opentelemetry-exporter-otlp-common")
 

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

@@ -65,8 +65,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.concurrent.Immutable;
+import software.amazon.opentelemetry.javaagent.providers.exporter.aws.logs.CompactConsoleLogRecordExporter;
 import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.AwsCloudWatchEmfExporter;
-import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.logs.OtlpAwsLogsExporterBuilder;
+import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.logs.OtlpAwsLogRecordExporterBuilder;
 import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.traces.OtlpAwsSpanExporterBuilder;
 
 /**
@@ -514,7 +515,7 @@ LogRecordExporter customizeLogsExporter(
               configProps.getString(OTEL_EXPORTER_OTLP_COMPRESSION_CONFIG, "none"));
 
       try {
-        return OtlpAwsLogsExporterBuilder.create(
+        return OtlpAwsLogRecordExporterBuilder.create(
                 (OtlpHttpLogRecordExporter) logsExporter,
                 configProps.getString(OTEL_EXPORTER_OTLP_LOGS_ENDPOINT))
             .setCompression(compression)
@@ -527,6 +528,13 @@ LogRecordExporter customizeLogsExporter(
             e);
       }
     }
+    String logsExporterConfig = configProps.getString(OTEL_LOGS_EXPORTER);
+
+    if (isLambdaEnvironment()
+        && logsExporterConfig != null
+        && logsExporterConfig.equals("console")) {
+      return new CompactConsoleLogRecordExporter();
+    }
 
     return logsExporter;
   }

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/logs/CompactConsoleLogRecordExporter.java

@@ -0,0 +1,132 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.opentelemetry.javaagent.providers.exporter.aws.logs;
+
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ */
+
+import io.opentelemetry.api.common.Value;
+import io.opentelemetry.exporter.logging.SystemOutLogRecordExporter;
+import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
+import io.opentelemetry.sdk.logs.data.LogRecordData;
+import io.opentelemetry.sdk.logs.export.LogRecordExporter;
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.Collection;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * A compact console log exporter that changes the functionality of OpenTelemetry's {@link
+ * SystemOutLogRecordExporter} by removing whitespace around JSON delimiters in the printed log
+ * output.
+ *
+ * <p>This exporter uses the same formatting logic as {@code SystemOutLogRecordExporter} but applies
+ * compact formatting by removing spaces around characters like {@code {}[]:,} to produce more
+ * condensed log output.
+ */
+public class CompactConsoleLogRecordExporter implements LogRecordExporter {
+  private static final DateTimeFormatter ISO_FORMAT = DateTimeFormatter.ISO_DATE_TIME;
+  private final AtomicBoolean isShutdown = new AtomicBoolean();
+
+  private final LogRecordExporter parentExporter;
+
+  public CompactConsoleLogRecordExporter() {
+    this.parentExporter = SystemOutLogRecordExporter.create();
+  }
+
+  @Override
+  public CompletableResultCode export(Collection<LogRecordData> logs) {
+    if (this.isShutdown.get()) {
+      return CompletableResultCode.ofFailure();
+    } else {
+      StringBuilder stringBuilder = new StringBuilder(60);
+
+      for (LogRecordData logRecord : logs) {
+        stringBuilder.setLength(0);
+        formatLog(stringBuilder, logRecord);
+        System.out.println(stringBuilder);
+      }
+
+      return CompletableResultCode.ofSuccess();
+    }
+  }
+
+  @Override
+  public CompletableResultCode flush() {
+    return this.parentExporter.flush();
+  }
+
+  /**
+   * Shuts down the exporter. This method is copied and modified from
+   * SystemOutLogRecordExporter.shutdown().
+   *
+   * <p>See: <a
+   * href="https://github.com/open-telemetry/opentelemetry-java/blob/5ab0a65675e5a06d13b293a758ef495d797e6d04/exporters/logging/src/main/java/io/opentelemetry/exporter/logging/SystemOutLogRecordExporter.java#L93">...</a>
+   */
+  @Override
+  public CompletableResultCode shutdown() {
+    if (!this.isShutdown.compareAndSet(false, true)) {
+      System.out.println("Calling shutdown() multiple times.");
+    }
+    return CompletableResultCode.ofSuccess();
+  }
+
+  /**
+   * Formats log record data into a compact string representation. This method is copied from
+   * SystemOutLogRecordExporter.formatLog() and modified to apply compact formatting by removing
+   * whitespace around JSON delimiters.
+   *
+   * <p>See: <a
+   * href="https://github.com/open-telemetry/opentelemetry-java/blob/5ab0a65675e5a06d13b293a758ef495d797e6d04/exporters/logging/src/main/java/io/opentelemetry/exporter/logging/SystemOutLogRecordExporter.java#L66">...</a>
+   */
+  static void formatLog(StringBuilder stringBuilder, LogRecordData log) {
+    InstrumentationScopeInfo instrumentationScopeInfo = log.getInstrumentationScopeInfo();
+    Value<?> body = log.getBodyValue();
+    stringBuilder
+        .append(
+            ISO_FORMAT.format(
+                Instant.ofEpochMilli(TimeUnit.NANOSECONDS.toMillis(log.getTimestampEpochNanos()))
+                    .atZone(ZoneOffset.UTC)))
+        .append(" ")
+        .append(log.getSeverity())
+        .append(" '")
+        .append(body == null ? "" : body.asString())
+        .append("' : ")
+        .append(log.getSpanContext().getTraceId())
+        .append(" ")
+        .append(log.getSpanContext().getSpanId())
+        .append(" [scopeInfo: ")
+        .append(instrumentationScopeInfo.getName())
+        .append(":")
+        .append(
+            instrumentationScopeInfo.getVersion() == null
+                ? ""
+                : instrumentationScopeInfo.getVersion())
+        .append("] ")
+        .append(log.getAttributes());
+
+    String compact = stringBuilder.toString().replaceAll("\\s*([{}\\[\\]:,])\\s*", "$1");
+    stringBuilder.setLength(0);
+    stringBuilder.append(compact);
+  }
+}

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/otlp/aws/logs/OtlpAwsLogsExporter.java renamed to awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/otlp/aws/logs/OtlpAwsLogRecordExporter.java

@@ -38,21 +38,21 @@
  * documentation: "<a
  * href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-OTLPEndpoint.html">...</a>">
  */
-public final class OtlpAwsLogsExporter extends BaseOtlpAwsExporter implements LogRecordExporter {
+public final class OtlpAwsLogRecordExporter extends BaseOtlpAwsExporter implements LogRecordExporter {
   private final OtlpHttpLogRecordExporterBuilder parentExporterBuilder;
   private final OtlpHttpLogRecordExporter parentExporter;
 
-  static OtlpAwsLogsExporter getDefault(String endpoint) {
-    return new OtlpAwsLogsExporter(
+  static OtlpAwsLogRecordExporter getDefault(String endpoint) {
+    return new OtlpAwsLogRecordExporter(
         OtlpHttpLogRecordExporter.getDefault(), endpoint, CompressionMethod.NONE);
   }
 
-  static OtlpAwsLogsExporter create(
+  static OtlpAwsLogRecordExporter create(
       OtlpHttpLogRecordExporter parent, String endpoint, CompressionMethod compression) {
-    return new OtlpAwsLogsExporter(parent, endpoint, compression);
+    return new OtlpAwsLogRecordExporter(parent, endpoint, compression);
   }
 
-  private OtlpAwsLogsExporter(
+  private OtlpAwsLogRecordExporter(
       OtlpHttpLogRecordExporter parentExporter, String endpoint, CompressionMethod compression) {
     super(endpoint, compression);
 

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/otlp/aws/logs/OtlpAwsLogsExporterBuilder.java renamed to awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/otlp/aws/logs/OtlpAwsLogRecordExporterBuilder.java

@@ -20,35 +20,35 @@
 import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter;
 import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.common.CompressionMethod;
 
-public class OtlpAwsLogsExporterBuilder {
+public class OtlpAwsLogRecordExporterBuilder {
   private final OtlpHttpLogRecordExporter parentExporter;
   private final String endpoint;
   private String compression;
 
-  public static OtlpAwsLogsExporterBuilder create(
+  public static OtlpAwsLogRecordExporterBuilder create(
       OtlpHttpLogRecordExporter parentExporter, String endpoint) {
-    return new OtlpAwsLogsExporterBuilder(parentExporter, endpoint);
+    return new OtlpAwsLogRecordExporterBuilder(parentExporter, endpoint);
   }
 
-  public static OtlpAwsLogsExporter getDefault(String endpoint) {
-    return OtlpAwsLogsExporter.getDefault(endpoint);
+  public static OtlpAwsLogRecordExporter getDefault(String endpoint) {
+    return OtlpAwsLogRecordExporter.getDefault(endpoint);
   }
 
-  public OtlpAwsLogsExporterBuilder setCompression(String compression) {
+  public OtlpAwsLogRecordExporterBuilder setCompression(String compression) {
     this.compression = compression;
     return this;
   }
 
-  public OtlpAwsLogsExporter build() {
+  public OtlpAwsLogRecordExporter build() {
     CompressionMethod compression = CompressionMethod.NONE;
     if (this.compression != null && "gzip".equalsIgnoreCase(this.compression)) {
       compression = CompressionMethod.GZIP;
     }
 
-    return OtlpAwsLogsExporter.create(this.parentExporter, this.endpoint, compression);
+    return OtlpAwsLogRecordExporter.create(this.parentExporter, this.endpoint, compression);
   }
 
-  private OtlpAwsLogsExporterBuilder(OtlpHttpLogRecordExporter parentExporter, String endpoint) {
+  private OtlpAwsLogRecordExporterBuilder(OtlpHttpLogRecordExporter parentExporter, String endpoint) {
     this.parentExporter = requireNonNull(parentExporter, "Must set a parentExporter");
     this.endpoint = requireNonNull(endpoint, "Must set an endpoint");
   }

awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsApplicationSignalsCustomizerProviderTest.java

@@ -53,7 +53,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.MockedStatic;
 import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.AwsCloudWatchEmfExporter;
-import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.logs.OtlpAwsLogsExporter;
+import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.logs.OtlpAwsLogRecordExporter;
 import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.traces.OtlpAwsSpanExporter;
 
 class AwsApplicationSignalsCustomizerProviderTest {
@@ -74,7 +74,7 @@ void testShouldEnableSigV4LogsExporterIfConfigIsCorrect(Map<String, String> vali
         validSigv4Config,
         defaultHttpLogsExporter,
         this.provider::customizeLogsExporter,
-        OtlpAwsLogsExporter.class);
+        OtlpAwsLogRecordExporter.class);
   }
 
   @ParameterizedTest

awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/exporter/otlp/aws/OtlpAwsExporterTest.java

@@ -51,8 +51,8 @@
 import software.amazon.awssdk.http.auth.spi.signer.SignedRequest;
 import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
 import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.common.CompressionMethod;
-import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.logs.OtlpAwsLogsExporter;
-import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.logs.OtlpAwsLogsExporterBuilder;
+import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.logs.OtlpAwsLogRecordExporter;
+import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.logs.OtlpAwsLogRecordExporterBuilder;
 import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.traces.OtlpAwsSpanExporter;
 import software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws.traces.OtlpAwsSpanExporterBuilder;
 
@@ -282,7 +282,7 @@ public void export() {
     }
   }
 
-  static class OtlpAwsLogsExporterTest extends AbstractOtlpAwsExporterTest {
+  static class OtlpAwsLogRecordExporterTest extends AbstractOtlpAwsExporterTest {
     private static final String LOGS_OTLP_ENDPOINT = "https://logs.us-east-1.amazonaws.com/v1/logs";
 
     @Mock private OtlpHttpLogRecordExporterBuilder mockBuilder;
@@ -306,33 +306,33 @@ void setup() {
 
     @Test
     void testLogsExporterCompressionDefaultsToNone() {
-      OtlpAwsLogsExporter exporter =
-          OtlpAwsLogsExporterBuilder.create(this.mockExporter, LOGS_OTLP_ENDPOINT).build();
+      OtlpAwsLogRecordExporter exporter =
+          OtlpAwsLogRecordExporterBuilder.create(this.mockExporter, LOGS_OTLP_ENDPOINT).build();
       assertEquals(CompressionMethod.NONE, exporter.getCompression());
     }
 
     @Test
     void testLogsExporterCompressionCanBeSetToGzip() {
-      OtlpAwsLogsExporter exporter =
-          OtlpAwsLogsExporterBuilder.create(this.mockExporter, LOGS_OTLP_ENDPOINT)
+      OtlpAwsLogRecordExporter exporter =
+          OtlpAwsLogRecordExporterBuilder.create(this.mockExporter, LOGS_OTLP_ENDPOINT)
               .setCompression("gzip")
               .build();
       assertEquals(CompressionMethod.GZIP, exporter.getCompression());
     }
 
     @Test
     void testLogsExporterCompressionIgnoresCaseForGzip() {
-      OtlpAwsLogsExporter exporter =
-          OtlpAwsLogsExporterBuilder.create(this.mockExporter, LOGS_OTLP_ENDPOINT)
+      OtlpAwsLogRecordExporter exporter =
+          OtlpAwsLogRecordExporterBuilder.create(this.mockExporter, LOGS_OTLP_ENDPOINT)
               .setCompression("GZIP")
               .build();
       assertEquals(CompressionMethod.GZIP, exporter.getCompression());
     }
 
     @Test
     void testLogsExporterCompressionDefaultsToNoneForUnknownValue() {
-      OtlpAwsLogsExporter exporter =
-          OtlpAwsLogsExporterBuilder.create(this.mockExporter, LOGS_OTLP_ENDPOINT)
+      OtlpAwsLogRecordExporter exporter =
+          OtlpAwsLogRecordExporterBuilder.create(this.mockExporter, LOGS_OTLP_ENDPOINT)
               .setCompression("unknown")
               .build();
       assertEquals(CompressionMethod.NONE, exporter.getCompression());
@@ -343,8 +343,8 @@ private static final class MockOtlpAwsLogsExporterWrapper implements OtlpAwsExpo
 
       private MockOtlpAwsLogsExporterWrapper(OtlpHttpLogRecordExporter mockExporter) {
         this.exporter =
-            OtlpAwsLogsExporterBuilder.create(
-                    mockExporter, OtlpAwsLogsExporterTest.LOGS_OTLP_ENDPOINT)
+            OtlpAwsLogRecordExporterBuilder.create(
+                    mockExporter, OtlpAwsLogRecordExporterTest.LOGS_OTLP_ENDPOINT)
                 .build();
       }