Remove custom exception resolver

Author: jack-berg

sdk/common/src/main/java/io/opentelemetry/sdk/internal/AttributeUtil.java

@@ -8,9 +8,12 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.function.BiConsumer;
 import java.util.function.Predicate;
 
 /**
@@ -19,6 +22,13 @@
  */
 public final class AttributeUtil {
 
+  private static final AttributeKey<String> EXCEPTION_TYPE =
+      AttributeKey.stringKey("exception.type");
+  private static final AttributeKey<String> EXCEPTION_MESSAGE =
+      AttributeKey.stringKey("exception.message");
+  private static final AttributeKey<String> EXCEPTION_STACKTRACE =
+      AttributeKey.stringKey("exception.stacktrace");
+
   private AttributeUtil() {}
 
   /**
@@ -95,4 +105,26 @@ public static Object applyAttributeLengthLimit(Object value, int lengthLimit) {
     }
     return value;
   }
+
+  public static void addExceptionAttributes(
+      Throwable exception, BiConsumer<AttributeKey<String>, String> attributeConsumer) {
+    String exceptionType = exception.getClass().getCanonicalName();
+    if (exceptionType != null) {
+      attributeConsumer.accept(EXCEPTION_TYPE, exceptionType);
+    }
+
+    String exceptionMessage = exception.getMessage();
+    if (exceptionMessage != null) {
+      attributeConsumer.accept(EXCEPTION_MESSAGE, exceptionMessage);
+    }
+
+    StringWriter stringWriter = new StringWriter();
+    try (PrintWriter printWriter = new PrintWriter(stringWriter)) {
+      exception.printStackTrace(printWriter);
+    }
+    String stackTrace = stringWriter.toString();
+    if (stackTrace != null) {
+      attributeConsumer.accept(EXCEPTION_STACKTRACE, stackTrace);
+    }
+  }
 }

sdk/common/src/main/java/io/opentelemetry/sdk/internal/DefaultExceptionAttributeResolver.java

@@ -28,6 +28,7 @@ testing {
       dependencies {
         implementation(project(":sdk:testing"))
         implementation(project(":api:incubator"))
+        implementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
         implementation("com.google.guava:guava")
       }
     }

sdk/common/src/main/java/io/opentelemetry/sdk/internal/ExceptionAttributeResolver.java

@@ -7,7 +7,6 @@
 
 import io.opentelemetry.sdk.common.Clock;
 import io.opentelemetry.sdk.common.CompletableResultCode;
-import io.opentelemetry.sdk.internal.ExceptionAttributeResolver;
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.function.Supplier;
 import javax.annotation.Nullable;
@@ -22,20 +21,17 @@ final class LoggerSharedState {
   private final Supplier<LogLimits> logLimitsSupplier;
   private final LogRecordProcessor logRecordProcessor;
   private final Clock clock;
-  private final ExceptionAttributeResolver exceptionAttributeResolver;
   @Nullable private volatile CompletableResultCode shutdownResult = null;
 
   LoggerSharedState(
       Resource resource,
       Supplier<LogLimits> logLimitsSupplier,
       LogRecordProcessor logRecordProcessor,
-      Clock clock,
-      ExceptionAttributeResolver exceptionAttributeResolver) {
+      Clock clock) {
     this.resource = resource;
     this.logLimitsSupplier = logLimitsSupplier;
     this.logRecordProcessor = logRecordProcessor;
     this.clock = clock;
-    this.exceptionAttributeResolver = exceptionAttributeResolver;
   }
 
   Resource getResource() {
@@ -54,10 +50,6 @@ Clock getClock() {
     return clock;
   }
 
-  ExceptionAttributeResolver getExceptionAttributeResolver() {
-    return exceptionAttributeResolver;
-  }
-
   boolean hasBeenShutdown() {
     return shutdownResult != null;
   }

sdk/logs/build.gradle.kts

@@ -5,19 +5,15 @@
 
 package io.opentelemetry.sdk.logs;
 
-import static io.opentelemetry.sdk.internal.ExceptionAttributeResolver.EXCEPTION_MESSAGE;
-import static io.opentelemetry.sdk.internal.ExceptionAttributeResolver.EXCEPTION_STACKTRACE;
-import static io.opentelemetry.sdk.internal.ExceptionAttributeResolver.EXCEPTION_TYPE;
-
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Value;
 import io.opentelemetry.api.logs.LogRecordBuilder;
 import io.opentelemetry.api.logs.Severity;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
+import io.opentelemetry.sdk.internal.AttributeUtil;
 import io.opentelemetry.sdk.internal.AttributesMap;
-import io.opentelemetry.sdk.internal.ExceptionAttributeResolver;
 import java.time.Instant;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
@@ -56,20 +52,9 @@ SdkLogRecordBuilder setException(Throwable throwable) {
     if (throwable == null) {
       return this;
     }
-    ExceptionAttributeResolver exceptionAttributeResolver =
-        loggerSharedState.getExceptionAttributeResolver();
-    String type = exceptionAttributeResolver.getExceptionType(throwable);
-    if (type != null) {
-      setAttribute(EXCEPTION_TYPE, type);
-    }
-    String message = exceptionAttributeResolver.getExceptionMessage(throwable);
-    if (message != null) {
-      setAttribute(EXCEPTION_MESSAGE, message);
-    }
-    String stacktrace = exceptionAttributeResolver.getExceptionStacktrace(throwable);
-    if (stacktrace != null) {
-      setAttribute(EXCEPTION_STACKTRACE, stacktrace);
-    }
+
+    AttributeUtil.addExceptionAttributes(throwable, this::setAttribute);
+
     return this;
   }
 

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LoggerSharedState.java

@@ -13,7 +13,6 @@
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.internal.ComponentRegistry;
-import io.opentelemetry.sdk.internal.ExceptionAttributeResolver;
 import io.opentelemetry.sdk.internal.ScopeConfigurator;
 import io.opentelemetry.sdk.logs.internal.LoggerConfig;
 import io.opentelemetry.sdk.resources.Resource;
@@ -54,12 +53,10 @@ public static SdkLoggerProviderBuilder builder() {
       Supplier<LogLimits> logLimitsSupplier,
       List<LogRecordProcessor> processors,
       Clock clock,
-      ScopeConfigurator<LoggerConfig> loggerConfigurator,
-      ExceptionAttributeResolver exceptionAttributeResolver) {
+      ScopeConfigurator<LoggerConfig> loggerConfigurator) {
     LogRecordProcessor logRecordProcessor = LogRecordProcessor.composite(processors);
     this.sharedState =
-        new LoggerSharedState(
-            resource, logLimitsSupplier, logRecordProcessor, clock, exceptionAttributeResolver);
+        new LoggerSharedState(resource, logLimitsSupplier, logRecordProcessor, clock);
     this.loggerComponentRegistry =
         new ComponentRegistry<>(
             instrumentationScopeInfo ->

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilder.java

@@ -12,8 +12,6 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.common.Clock;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
-import io.opentelemetry.sdk.internal.DefaultExceptionAttributeResolver;
-import io.opentelemetry.sdk.internal.ExceptionAttributeResolver;
 import io.opentelemetry.sdk.internal.ScopeConfigurator;
 import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
@@ -39,8 +37,6 @@ public final class SdkLoggerProviderBuilder {
   private Clock clock = Clock.getDefault();
   private ScopeConfiguratorBuilder<LoggerConfig> loggerConfiguratorBuilder =
       LoggerConfig.configuratorBuilder();
-  private ExceptionAttributeResolver exceptionAttributeResolver =
-      DefaultExceptionAttributeResolver.getInstance();
 
   SdkLoggerProviderBuilder() {}
 
@@ -153,33 +149,13 @@ SdkLoggerProviderBuilder addLoggerConfiguratorCondition(
     return this;
   }
 
-  /**
-   * Set the exception attribute resolver, which resolves {@code exception.*} attributes an
-   * exception is set on a log.
-   *
-   * <p>This method is experimental so not public. You may reflectively call it using {@link
-   * SdkLoggerProviderUtil#setExceptionAttributeResolver(SdkLoggerProviderBuilder,
-   * ExceptionAttributeResolver)}.
-   */
-  SdkLoggerProviderBuilder setExceptionAttributeResolver(
-      ExceptionAttributeResolver exceptionAttributeResolver) {
-    requireNonNull(exceptionAttributeResolver, "exceptionAttributeResolver");
-    this.exceptionAttributeResolver = exceptionAttributeResolver;
-    return this;
-  }
-
   /**
    * Create a {@link SdkLoggerProvider} instance.
    *
    * @return an instance configured with the provided options
    */
   public SdkLoggerProvider build() {
     return new SdkLoggerProvider(
-        resource,
-        logLimitsSupplier,
-        logRecordProcessors,
-        clock,
-        loggerConfiguratorBuilder.build(),
-        exceptionAttributeResolver);
+        resource, logLimitsSupplier, logRecordProcessors, clock, loggerConfiguratorBuilder.build());
   }
 }

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerProvider.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.sdk.logs.internal;
 
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
-import io.opentelemetry.sdk.internal.ExceptionAttributeResolver;
 import io.opentelemetry.sdk.internal.ScopeConfigurator;
 import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder;
 import java.lang.reflect.InvocationTargetException;
@@ -56,20 +55,4 @@ public static void addLoggerConfiguratorCondition(
           "Error calling addLoggerConfiguratorCondition on SdkLoggerProviderBuilder", e);
     }
   }
-
-  /** Reflectively set exception attribute resolver to the {@link SdkLoggerProviderBuilder}. */
-  public static void setExceptionAttributeResolver(
-      SdkLoggerProviderBuilder sdkLoggerProviderBuilder,
-      ExceptionAttributeResolver exceptionAttributeResolver) {
-    try {
-      Method method =
-          SdkLoggerProviderBuilder.class.getDeclaredMethod(
-              "setExceptionAttributeResolver", ExceptionAttributeResolver.class);
-      method.setAccessible(true);
-      method.invoke(sdkLoggerProviderBuilder, exceptionAttributeResolver);
-    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-      throw new IllegalStateException(
-          "Error calling setExceptionAttributeResolver on SdkLoggerProviderBuilder", e);
-    }
-  }
 }

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerProviderBuilder.java

@@ -12,7 +12,6 @@
 
 import io.opentelemetry.sdk.common.Clock;
 import io.opentelemetry.sdk.common.CompletableResultCode;
-import io.opentelemetry.sdk.internal.DefaultExceptionAttributeResolver;
 import io.opentelemetry.sdk.resources.Resource;
 import org.junit.jupiter.api.Test;
 
@@ -25,11 +24,7 @@ void shutdown() {
     when(logRecordProcessor.shutdown()).thenReturn(code);
     LoggerSharedState state =
         new LoggerSharedState(
-            Resource.empty(),
-            LogLimits::getDefault,
-            logRecordProcessor,
-            Clock.getDefault(),
-            DefaultExceptionAttributeResolver.getInstance());
+            Resource.empty(), LogLimits::getDefault, logRecordProcessor, Clock.getDefault());
     state.shutdown();
     state.shutdown();
     verify(logRecordProcessor, times(1)).shutdown();