Add exception event names to other instrumentations

Author: trask

instrumentation/camel-2.20/javaagent/build.gradle.kts

@@ -101,8 +101,14 @@ tasks {
     systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
   }
 
+  val testExceptionSignalLogs by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+    jvmArgs("-Dotel.semconv.exception.signal.opt-in=logs")
+  }
+
   check {
-    dependsOn(testStableSemconv, testExperimental)
+    dependsOn(testStableSemconv, testExperimental, testExceptionSignalLogs)
   }
 
   if (findProperty("denyUnsafe") as Boolean) {

instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelRequest.java

@@ -11,7 +11,7 @@
 import org.apache.camel.Exchange;
 
 @AutoValue
-abstract class CamelRequest {
+public abstract class CamelRequest {
 
   public static CamelRequest create(
       SpanDecorator spanDecorator,

instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelSingletons.java

@@ -14,6 +14,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor;
+import io.opentelemetry.instrumentation.api.internal.Experimental;
 import io.opentelemetry.javaagent.instrumentation.apachecamel.decorators.DecoratorRegistry;
 import javax.annotation.Nullable;
 import org.apache.camel.Endpoint;
@@ -73,6 +74,13 @@ public void onEnd(
         Instrumenter.builder(GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, spanNameExtractor);
     builder.addAttributesExtractor(attributesExtractor);
     builder.setSpanStatusExtractor(spanStatusExtractor);
+    Experimental.setExceptionEventExtractor(
+        builder,
+        (logRecordBuilder, context, request) ->
+            request
+                .getSpanDecorator()
+                .getExceptionEventExtractor(request.getSpanKind())
+                .extract(logRecordBuilder, context, request));
 
     INSTRUMENTER = builder.buildInstrumenter(request -> request.getSpanKind());
   }

instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SpanDecorator.java

@@ -26,12 +26,21 @@
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
+import io.opentelemetry.instrumentation.api.incubator.instrumenter.ExceptionEventExtractor;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 
 /** This interface represents a decorator specific to the component/endpoint being instrumented. */
 public interface SpanDecorator {
 
+  /**
+   * Returns the {@link ExceptionEventExtractor} for the given span kind.
+   *
+   * @param spanKind The span kind
+   * @return The exception event extractor
+   */
+  ExceptionEventExtractor<CamelRequest> getExceptionEventExtractor(SpanKind spanKind);
+
   /**
    * This method indicates whether the component associated with the SpanDecorator should result in
    * a new span being created.

instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/BaseSpanDecorator.java

@@ -28,7 +28,9 @@
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
+import io.opentelemetry.instrumentation.api.incubator.instrumenter.ExceptionEventExtractor;
 import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection;
+import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelRequest;
 import io.opentelemetry.javaagent.instrumentation.apachecamel.SpanDecorator;
 import java.util.Collections;
 import java.util.HashMap;
@@ -84,6 +86,11 @@ public static Map<String, String> toQueryParameters(String uri) {
     return Collections.emptyMap();
   }
 
+  @Override
+  public ExceptionEventExtractor<CamelRequest> getExceptionEventExtractor(SpanKind spanKind) {
+    return ExceptionEventExtractor.create("camel.exception");
+  }
+
   @Override
   public boolean shouldStartNewSpan() {
     return true;

instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java

@@ -32,11 +32,15 @@
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
 
 import io.opentelemetry.api.common.AttributesBuilder;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.instrumentation.api.incubator.instrumenter.ExceptionEventExtractor;
+import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbExceptionEventExtractors;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlQuery;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlQuerySanitizer;
 import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection;
+import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelRequest;
 import java.net.URI;
 import java.util.Map;
 import javax.annotation.Nullable;
@@ -56,6 +60,11 @@ class DbSpanDecorator extends BaseSpanDecorator {
     this.system = system;
   }
 
+  @Override
+  public ExceptionEventExtractor<CamelRequest> getExceptionEventExtractor(SpanKind spanKind) {
+    return DbExceptionEventExtractors.client();
+  }
+
   @Override
   public String getOperationName(
       Exchange exchange, Endpoint endpoint, CamelDirection camelDirection) {

instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java

@@ -30,11 +30,15 @@
 import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
 
 import io.opentelemetry.api.common.AttributesBuilder;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
+import io.opentelemetry.instrumentation.api.incubator.instrumenter.ExceptionEventExtractor;
+import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExceptionEventExtractors;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection;
+import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelRequest;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Set;
@@ -49,6 +53,14 @@ class HttpSpanDecorator extends BaseSpanDecorator {
   private static final Set<String> knownMethods =
       AgentCommonConfig.get().getKnownHttpRequestMethods();
 
+  @Override
+  public ExceptionEventExtractor<CamelRequest> getExceptionEventExtractor(SpanKind spanKind) {
+    if (spanKind == SpanKind.SERVER) {
+      return HttpExceptionEventExtractors.server();
+    }
+    return HttpExceptionEventExtractors.client();
+  }
+
   protected String getProtocol() {
     return "http";
   }

instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/MessagingSpanDecorator.java

@@ -28,7 +28,10 @@
 
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.instrumentation.api.incubator.instrumenter.ExceptionEventExtractor;
+import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingExceptionEventExtractors;
 import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection;
+import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelRequest;
 import java.net.URI;
 import java.util.Map;
 import org.apache.camel.Endpoint;
@@ -42,6 +45,14 @@ public MessagingSpanDecorator(String component) {
     this.component = component;
   }
 
+  @Override
+  public ExceptionEventExtractor<CamelRequest> getExceptionEventExtractor(SpanKind spanKind) {
+    if (spanKind == SpanKind.CONSUMER) {
+      return MessagingExceptionEventExtractors.process();
+    }
+    return MessagingExceptionEventExtractors.client();
+  }
+
   @Override
   public String getOperationName(
       Exchange exchange, Endpoint endpoint, CamelDirection camelDirection) {

instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceAnnotationsTest.java

@@ -6,6 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.extannotations;
 
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
+import static io.opentelemetry.instrumentation.api.internal.SemconvExceptionSignal.emitExceptionAsSpanEvents;
 import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionAssertions;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static org.assertj.core.api.Assertions.catchThrowable;
@@ -84,7 +85,7 @@ void testExceptionExit() {
                 span ->
                     span.hasName("SayTracedHello.sayError")
                         .hasStatus(StatusData.error())
-                        .hasException(thrown)
+                        .hasException(emitExceptionAsSpanEvents() ? thrown : null)
                         .hasAttributesSatisfyingExactly(assertCodeFunction("sayError"))));
   }
 

instrumentation/graphql-java/graphql-java-20.0/library/src/test/java/io/opentelemetry/instrumentation/graphql/v20_0/GraphqlTest.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.graphql.v20_0;
 
+import static io.opentelemetry.instrumentation.api.internal.SemconvExceptionSignal.emitExceptionAsSpanEvents;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE;
@@ -310,13 +311,19 @@ void dataFetcherException() {
                             equalTo(GRAPHQL_FIELD_NAME, "bookById"),
                             equalTo(GRAPHQL_FIELD_PATH, "/bookById"))
                         .hasStatus(StatusData.error())
-                        .hasException(new IllegalStateException("fetching book failed")),
+                        .hasException(
+                            emitExceptionAsSpanEvents()
+                                ? new IllegalStateException("fetching book failed")
+                                : null),
                 span ->
                     span.hasName("fetchBookById")
                         .hasKind(SpanKind.INTERNAL)
                         .hasParent(spanWithName("bookById"))
                         .hasStatus(StatusData.error())
-                        .hasException(new IllegalStateException("fetching book failed"))));
+                        .hasException(
+                            emitExceptionAsSpanEvents()
+                                ? new IllegalStateException("fetching book failed")
+                                : null)));
   }
 
   // test data fetcher returning an error