Apply exception type and message

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentLogExporter.java

@@ -111,7 +111,7 @@ public CompletableResultCode export(Collection<LogRecordData> logs) {
           itemCount = Math.round(100.0 / samplingPercentage);
         }
 
-        TelemetryItem telemetryItem = mapper.map(log, stack, itemCount);
+        TelemetryItem telemetryItem = mapper.map(log, itemCount);
         telemetryItemConsumer.accept(telemetryItem);
 
         exportingLogLogger.recordSuccess();

agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/AzureMonitorLogRecordExporter.java

@@ -7,7 +7,6 @@
 
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.monitor.opentelemetry.exporter.implementation.LogDataMapper;
-import com.azure.monitor.opentelemetry.exporter.implementation.SemanticAttributes;
 import com.azure.monitor.opentelemetry.exporter.implementation.logging.OperationLogger;
 import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem;
 import com.azure.monitor.opentelemetry.exporter.implementation.pipeline.TelemetryItemExporter;
@@ -53,8 +52,7 @@ public CompletableResultCode export(Collection<LogRecordData> logs) {
     for (LogRecordData log : logs) {
       LOGGER.verbose("exporting log: {}", log);
       try {
-        String stack = log.getAttributes().get(SemanticAttributes.EXCEPTION_STACKTRACE);
-        telemetryItems.add(mapper.map(log, stack, null));
+        telemetryItems.add(mapper.map(log, null));
         OPERATION_LOGGER.recordSuccess();
       } catch (Throwable t) {
         OPERATION_LOGGER.recordFailure(t.getMessage(), t, EXPORTER_MAPPING_ERROR);

agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/LogDataMapper.java

@@ -8,6 +8,7 @@
 
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.monitor.opentelemetry.exporter.implementation.builders.AbstractTelemetryBuilder;
+import com.azure.monitor.opentelemetry.exporter.implementation.builders.ExceptionDetailBuilder;
 import com.azure.monitor.opentelemetry.exporter.implementation.builders.ExceptionTelemetryBuilder;
 import com.azure.monitor.opentelemetry.exporter.implementation.builders.Exceptions;
 import com.azure.monitor.opentelemetry.exporter.implementation.builders.MessageTelemetryBuilder;
@@ -21,6 +22,7 @@
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
 import io.opentelemetry.sdk.resources.Resource;
+import java.util.Collections;
 import java.util.List;
 import java.util.function.BiConsumer;
 import reactor.util.annotation.Nullable;
@@ -100,11 +102,12 @@ public LogDataMapper(
     this.telemetryInitializer = telemetryInitializer;
   }
 
-  public TelemetryItem map(LogRecordData log, @Nullable String stack, @Nullable Long itemCount) {
+  public TelemetryItem map(LogRecordData log, @Nullable Long itemCount) {
+    String stack = log.getAttributes().get(SemanticAttributes.EXCEPTION_STACKTRACE);
     if (stack == null) {
       return createMessageTelemetryItem(log, itemCount);
     } else {
-      return createExceptionTelemetryItem(log, itemCount, stack);
+      return createExceptionTelemetryItem(log, itemCount);
     }
   }
 
@@ -137,8 +140,7 @@ private TelemetryItem createMessageTelemetryItem(LogRecordData log, @Nullable Lo
     return telemetryBuilder.build();
   }
 
-  private TelemetryItem createExceptionTelemetryItem(
-      LogRecordData log, @Nullable Long itemCount, String stack) {
+  private TelemetryItem createExceptionTelemetryItem(LogRecordData log, @Nullable Long itemCount) {
     ExceptionTelemetryBuilder telemetryBuilder = ExceptionTelemetryBuilder.create();
     telemetryInitializer.accept(telemetryBuilder, log.getResource());
 
@@ -151,7 +153,18 @@ private TelemetryItem createExceptionTelemetryItem(
     Attributes attributes = log.getAttributes();
     MAPPINGS.map(attributes, telemetryBuilder);
 
-    telemetryBuilder.setExceptions(Exceptions.minimalParse(stack));
+    String stack = log.getAttributes().get(SemanticAttributes.EXCEPTION_STACKTRACE);
+    List<ExceptionDetailBuilder> builders = Exceptions.minimalParse(stack);
+    ExceptionDetailBuilder exceptionDetailBuilder = builders.get(0);
+    String type = log.getAttributes().get(SemanticAttributes.EXCEPTION_TYPE);
+    if (type != null && !type.isEmpty()) {
+      exceptionDetailBuilder.setTypeName(type);
+    }
+    String message = log.getAttributes().get(SemanticAttributes.EXCEPTION_MESSAGE);
+    if (message != null && !message.isEmpty()) {
+      exceptionDetailBuilder.setMessage(message);
+    }
+    telemetryBuilder.setExceptions(Collections.singletonList(exceptionDetailBuilder));
     telemetryBuilder.setSeverityLevel(toSeverityLevel(log.getSeverity()));
 
     // set exception-specific properties

settings.gradle.kts

@@ -124,6 +124,7 @@ hideFromDependabot(":smoke-tests:apps:Micrometer")
 hideFromDependabot(":smoke-tests:apps:MongoDB")
 hideFromDependabot(":smoke-tests:apps:NonDaemonThreads")
 hideFromDependabot(":smoke-tests:apps:OpenTelemetryApiSupport")
+hideFromDependabot(":smoke-tests:apps:OpenTelemetryLogBridgeApi")
 hideFromDependabot(":smoke-tests:apps:OpenTelemetryMetric")
 hideFromDependabot(":smoke-tests:apps:PreAggMetricsWithRoleNameOverridesAndSampling")
 hideFromDependabot(":smoke-tests:apps:PreferForwardedUrlScheme")
@@ -133,7 +134,6 @@ hideFromDependabot(":smoke-tests:apps:RoleNameOverrides")
 hideFromDependabot(":smoke-tests:apps:RuntimeAttach")
 hideFromDependabot(":smoke-tests:apps:RuntimeAttachWithDelayedConnectionString")
 hideFromDependabot(":smoke-tests:apps:Sampling")
-
 hideFromDependabot(":smoke-tests:apps:SamplingOverrides")
 hideFromDependabot(":smoke-tests:apps:SamplingOverridesBackCompat")
 hideFromDependabot(":smoke-tests:apps:SpringBoot")
@@ -153,3 +153,5 @@ hideFromDependabot(":smoke-tests:apps:WebFlux")
 fun hideFromDependabot(projectPath: String) {
   include(projectPath)
 }
+include("smoke-tests:apps:OpenTelemetryApiLogBridge")
+findProject(":smoke-tests:apps:OpenTelemetryApiLogBridge")?.name = "OpenTelemetryApiLogBridge"

smoke-tests/apps/OpenTelemetryApiLogBridge/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.applicationinsights.smoketestapp;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+@SpringBootApplication
+public class SpringBootApp extends SpringBootServletInitializer {
+  @Override
+  protected SpringApplicationBuilder configure(SpringApplicationBuilder applicationBuilder) {
+    return applicationBuilder.sources(SpringBootApp.class);
+  }
+}

smoke-tests/apps/OpenTelemetryApiLogBridge/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java

@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.applicationinsights.smoketestapp;
+
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.logs.Severity;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanContext;
+import io.opentelemetry.api.trace.TraceFlags;
+import io.opentelemetry.api.trace.TraceState;
+import io.opentelemetry.context.Scope;
+import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+@RestController
+public class TestController {
+
+  @GetMapping("/")
+  public String root() {
+    return "OK";
+  }
+
+  @GetMapping("/test-custom-exception-type-and-message")
+  public String testCustomExceptionTypeAndMessage() throws InterruptedException {
+    Span.current().updateName("myspanname");
+    SpanContext spanContext = SpanContext.create("ff01020304050600ff0a0b0c0d0e0f00", "090a0b0c0d0e0f00", TraceFlags.getSampled(), TraceState.getDefault());
+    try (Scope ignored = Span.wrap(spanContext).makeCurrent()) {
+      StringWriter sw = new StringWriter();
+      new Exception().printStackTrace(new PrintWriter(sw, true));
+
+      GlobalOpenTelemetry.get().getLogsBridge().get("my logger").logRecordBuilder()
+          .setSeverity(Severity.INFO)
+          .setAttribute(SemanticAttributes.EXCEPTION_TYPE, "my exception type")
+          .setAttribute(SemanticAttributes.EXCEPTION_MESSAGE, "This is an custom exception with custom exception type")
+          .setAttribute(SemanticAttributes.EXCEPTION_STACKTRACE, sw.toString())
+          .emit();
+      Thread.sleep(100000);
+    }
+    return "OK!";
+  }
+}

smoke-tests/apps/OpenTelemetryApiLogBridge/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiLogBridgeTest.java

@@ -0,0 +1,82 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.applicationinsights.smoketest;
+
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_19;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_20;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8_OPENJ9;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.microsoft.applicationinsights.smoketest.schemav2.Data;
+import com.microsoft.applicationinsights.smoketest.schemav2.Envelope;
+import com.microsoft.applicationinsights.smoketest.schemav2.RequestData;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import java.util.List;
+
+@UseAgent
+abstract class OpenTelemetryApiLogBridgeTest {
+
+  @RegisterExtension static final SmokeTestExtension testing = SmokeTestExtension.create();
+
+  @Test
+  @TargetUri("/test-custom-exception-type-and-message")
+  void testCustomExceptionTypeAndMessage() throws Exception {
+    List<Envelope> rdList = testing.mockedIngestion.waitForItems("RequestData", 1);
+    Envelope rdEnvelope = rdList.get(0);
+
+    RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
+    assertThat(rd.getName()).isEqualTo("myspanname");
+    assertThat(rd.getUrl())
+        .matches("http://localhost:[0-9]+/OpenTelemetryApiLogBridge/test-custom-exception-type-and-message");
+    assertThat(rd.getResponseCode()).isEqualTo("200");
+    assertThat(rd.getSuccess()).isTrue();
+    assertThat(rd.getSource()).isNull();
+    assertThat(rd.getProperties()).hasSize(1);
+    assertThat(rd.getProperties()).containsEntry("_MS.ProcessedByMetricExtractors", "True");
+
+    assertThat(rdEnvelope.getIKey()).isEqualTo("00000000-0000-0000-0000-0FEEDDADBEEF");
+    assertThat(rdEnvelope.getTags())
+        .hasEntrySatisfying("ai.internal.sdkVersion", v -> assertThat(v).startsWith("java:3."));
+
+    String operationId = rdEnvelope.getTags().get("ai.operation.id");
+    List<Envelope> edList =
+        testing.mockedIngestion.waitForItemsInOperation("ExceptionData", 1, operationId);
+    assertThat(edList.size()).isNotZero();
+  }
+
+  @Environment(TOMCAT_8_JAVA_8)
+  static class Tomcat8Java8Test extends OpenTelemetryApiLogBridgeTest {}
+
+  @Environment(TOMCAT_8_JAVA_8_OPENJ9)
+  static class Tomcat8Java8OpenJ9Test extends OpenTelemetryApiLogBridgeTest {}
+
+  @Environment(TOMCAT_8_JAVA_11)
+  static class Tomcat8Java11Test extends OpenTelemetryApiLogBridgeTest {}
+
+  @Environment(TOMCAT_8_JAVA_11_OPENJ9)
+  static class Tomcat8Java11OpenJ9Test extends OpenTelemetryApiLogBridgeTest {}
+
+  @Environment(TOMCAT_8_JAVA_17)
+  static class Tomcat8Java17Test extends OpenTelemetryApiLogBridgeTest {}
+
+  @Environment(TOMCAT_8_JAVA_19)
+  static class Tomcat8Java19Test extends OpenTelemetryApiLogBridgeTest {}
+
+  @Environment(TOMCAT_8_JAVA_20)
+  static class Tomcat8Java20Test extends OpenTelemetryApiLogBridgeTest {}
+
+  @Environment(WILDFLY_13_JAVA_8)
+  static class Wildfly13Java8Test extends OpenTelemetryApiLogBridgeTest {}
+
+  @Environment(WILDFLY_13_JAVA_8_OPENJ9)
+  static class Wildfly13Java8OpenJ9Test extends OpenTelemetryApiLogBridgeTest {}
+}

smoke-tests/apps/OpenTelemetryApiLogBridge/src/smokeTest/resources/logback-test.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+  <root level="warn">
+    <appender-ref ref="CONSOLE"/>
+  </root>
+</configuration>