Merge branch 'open-telemetry:main' into cc/add-config-based-mdc-attribute

Author: cleverchuk

.github/renovate.json5

@@ -14,7 +14,7 @@
       "groupName": "guava packages"
     },
     {
-      "matchPackageNames": ["io.quarkus", "io.quarkus:quarkus-bom"],
+      "matchPackagePrefixes": ["io.quarkus"],
       "groupName": "quarkus packages"
     },
     {
@@ -37,6 +37,10 @@
       "matchPackagePrefixes": ["net.bytebuddy:"],
       "groupName": "byte buddy packages"
     },
+    {
+      "matchPackagePrefixes": ["com.fasterxml.jackson"],
+      "groupName": "jackson packages"
+    },
     {
       // prevent update to 2.4-groovy-4.0-SNAPSHOT
       "matchPackageNames": ["org.spockframework:spock-bom"],

CHANGELOG.md

@@ -2,6 +2,69 @@
 
 ## Unreleased
 
+## Version 1.31.0 (2023-10-12)
+
+### 🌟 New javaagent instrumentation
+
+- Apache Pekko
+  ([#9527](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9527))
+
+### 📈 Enhancements
+
+- Add instrumentation for vert.x sql client withTransaction method
+  ([#9462](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9462))
+- Improve hibernate reactive instrumentation
+  ([#9486](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9486))
+- Support application.yaml files in SpringBootServiceNameDetector
+  ([#9515](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9515))
+- Add Spring Boot service version finder / ResourceProvider
+  ([#9480](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9480))
+- Split hibernate reactive instrumentation
+  ([#9531](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9531))
+- Rework reactor netty context tracking
+  ([#9286](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9286))
+- Improve spring data reactive instrumentation
+  ([#9561](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9561))
+- Support akka http latest version
+  ([#9573](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9573))
+- Enhance AWS SDK Instrumentation with Detailed HTTP Error Information
+  ([#9448](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9448))
+- Update HTTP metrics' descriptions
+  ([#9635](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9635))
+- Remove server.socket.address from HTTP/RPC metrics
+  ([#9633](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9633))
+- Remove 0 bucket from stable HTTP metrics
+  ([#9631](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9631))
+- Suppress nested http client spans in aws2 instrumentation
+  ([#9634](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9634))
+- Implement spec changes for grpc server span error status
+  ([#9641](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9641))
+- Improve vertx-sql client context propagation
+  ([#9640](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9640))
+- Add url.scheme to HTTP client metrics
+  ([#9642](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9642))
+- Add support for newVirtualThreadPerTaskExecutor
+  ([#9616](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9616))
+- Implement error.type attribute in HTTP semconv
+  ([#9466](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9466))
+- Emit package events
+  ([#9301](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9301))
+- Added Automatic-Module-Name header to MANIFEST.MF in instrumentation libraries
+  ([#9140](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9140))
+- Support paths in `peer.service` mappings
+  ([#9061](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9061))
+- Compile ktor library instrumentation for earlier kotlin version
+  ([#9661](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9661))
+
+### 🛠️ Bug fixes
+
+- Fix NPE happening when .headersWhen() is used (reactor-netty)
+  ([#9511](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9511))
+- Spring webflux: add user spans as children of the controller span
+  ([#9572](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9572))
+- Make netty ChannelPipeline removeLast return user handler
+  ([#9584](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9584))
+
 ## Version 1.30.0 (2023-09-14)
 
 ### Migration notes

benchmark-overhead/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
   testImplementation("org.testcontainers:postgresql:1.19.1")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
-  testImplementation("com.squareup.okhttp3:okhttp:4.11.0")
+  testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
   testImplementation("org.jooq:joox:2.0.0")
   testImplementation("com.jayway.jsonpath:json-path:2.8.0")
   testImplementation("org.slf4j:slf4j-simple:2.0.9")

conventions/src/main/kotlin/otel.jacoco-conventions.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 jacoco {
-  toolVersion = "0.8.10"
+  toolVersion = "0.8.11"
 }
 
 tasks {

dependencyManagement/build.gradle.kts

@@ -26,7 +26,7 @@ val groovyVersion = "4.0.15"
 // configurations.testRuntimeClasspath.resolutionStrategy.force "com.google.guava:guava:19.0"
 
 val DEPENDENCY_BOMS = listOf(
-  "com.fasterxml.jackson:jackson-bom:2.15.2",
+  "com.fasterxml.jackson:jackson-bom:2.15.3",
   "com.squareup.okio:okio-bom:3.6.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
   "com.google.guava:guava-bom:32.1.3-jre",
   "org.apache.groovy:groovy-bom:${groovyVersion}",

examples/distro/build.gradle

@@ -14,7 +14,7 @@ buildscript {
   dependencies {
     classpath "com.diffplug.spotless:spotless-plugin-gradle:6.22.0"
     classpath "gradle.plugin.com.github.johnrengelman:shadow:8.0.0"
-    classpath "io.opentelemetry.instrumentation:gradle-plugins:1.31.0-alpha-SNAPSHOT"
+    classpath "io.opentelemetry.instrumentation:gradle-plugins:1.32.0-alpha-SNAPSHOT"
   }
 }
 
@@ -30,8 +30,8 @@ subprojects {
       opentelemetrySdk           : "1.31.0",
 
       // these lines are managed by .github/scripts/update-version.sh
-      opentelemetryJavaagent     : "1.31.0-SNAPSHOT",
-      opentelemetryJavaagentAlpha: "1.31.0-alpha-SNAPSHOT",
+      opentelemetryJavaagent     : "1.32.0-SNAPSHOT",
+      opentelemetryJavaagentAlpha: "1.32.0-alpha-SNAPSHOT",
 
       autoservice                : "1.1.1",
       junit                      : "5.10.0"

examples/distro/instrumentation/servlet-3/build.gradle

@@ -27,7 +27,7 @@ dependencies {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
 
-  testImplementation "com.squareup.okhttp3:okhttp:4.11.0"
+  testImplementation "com.squareup.okhttp3:okhttp:4.12.0"
   testImplementation "javax.servlet:javax.servlet-api:3.0.1"
   testImplementation "org.eclipse.jetty:jetty-server:8.2.0.v20160908"
   testImplementation "org.eclipse.jetty:jetty-servlet:8.2.0.v20160908"

examples/distro/smoke-tests/build.gradle

@@ -4,9 +4,9 @@ plugins {
 
 dependencies {
   testImplementation("org.testcontainers:testcontainers:1.19.1")
-  testImplementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
+  testImplementation("com.fasterxml.jackson.core:jackson-databind:2.15.3")
   testImplementation("com.google.protobuf:protobuf-java-util:3.24.4")
-  testImplementation("com.squareup.okhttp3:okhttp:4.11.0")
+  testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")
 

examples/extension/build.gradle

@@ -13,8 +13,8 @@ plugins {
   id "com.github.johnrengelman.shadow" version "8.1.1"
   id "com.diffplug.spotless" version "6.22.0"
 
-  id "io.opentelemetry.instrumentation.muzzle-generation" version "1.31.0-alpha-SNAPSHOT"
-  id "io.opentelemetry.instrumentation.muzzle-check" version "1.31.0-alpha-SNAPSHOT"
+  id "io.opentelemetry.instrumentation.muzzle-generation" version "1.32.0-alpha-SNAPSHOT"
+  id "io.opentelemetry.instrumentation.muzzle-check" version "1.32.0-alpha-SNAPSHOT"
 }
 
 group 'io.opentelemetry.example'
@@ -26,8 +26,8 @@ ext {
     opentelemetrySdk           : "1.31.0",
 
     // these lines are managed by .github/scripts/update-version.sh
-    opentelemetryJavaagent     : "1.31.0-SNAPSHOT",
-    opentelemetryJavaagentAlpha: "1.31.0-alpha-SNAPSHOT",
+    opentelemetryJavaagent     : "1.32.0-SNAPSHOT",
+    opentelemetryJavaagentAlpha: "1.32.0-alpha-SNAPSHOT",
 
     junit                      : "5.10.0"
   ]
@@ -100,9 +100,9 @@ dependencies {
 
   //All dependencies below are only for tests
   testImplementation("org.testcontainers:testcontainers:1.19.1")
-  testImplementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
+  testImplementation("com.fasterxml.jackson.core:jackson-databind:2.15.3")
   testImplementation("com.google.protobuf:protobuf-java-util:3.24.4")
-  testImplementation("com.squareup.okhttp3:okhttp:4.11.0")
+  testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha")
 

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientPeerServiceAttributesExtractor.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.api.instrumenter.http;
+
+import io.opentelemetry.api.common.AttributesBuilder;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceResolver;
+import io.opentelemetry.instrumentation.api.instrumenter.url.UrlParser;
+import io.opentelemetry.semconv.SemanticAttributes;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
+
+/**
+ * Extractor of the {@code peer.service} span attribute, described in <a
+ * href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/span-general.md#general-remote-service-attributes">the
+ * specification</a>.
+ */
+public final class HttpClientPeerServiceAttributesExtractor<REQUEST, RESPONSE>
+    implements AttributesExtractor<REQUEST, RESPONSE> {
+
+  private final HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter;
+  private final PeerServiceResolver peerServiceResolver;
+
+  // visible for tests
+  HttpClientPeerServiceAttributesExtractor(
+      HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter,
+      PeerServiceResolver peerServiceResolver) {
+    this.attributesGetter = attributesGetter;
+    this.peerServiceResolver = peerServiceResolver;
+  }
+
+  /**
+   * Returns a new {@link HttpClientPeerServiceAttributesExtractor} that will use the passed {@code
+   * attributesGetter} instance to determine the value of the {@code peer.service} attribute.
+   */
+  public static <REQUEST, RESPONSE>
+      HttpClientPeerServiceAttributesExtractor<REQUEST, RESPONSE> create(
+          HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter,
+          PeerServiceResolver peerServiceResolver) {
+    return new HttpClientPeerServiceAttributesExtractor<>(attributesGetter, peerServiceResolver);
+  }
+
+  @Override
+  public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {}
+
+  @Override
+  public void onEnd(
+      AttributesBuilder attributes,
+      Context context,
+      REQUEST request,
+      @Nullable RESPONSE response,
+      @Nullable Throwable error) {
+
+    if (peerServiceResolver.isEmpty()) {
+      // optimization for common case
+      return;
+    }
+
+    String serverAddress = attributesGetter.getServerAddress(request);
+    Integer serverPort = attributesGetter.getServerPort(request);
+    Supplier<String> pathSupplier = () -> getUrlPath(attributesGetter, request);
+    String peerService = mapToPeerService(serverAddress, serverPort, pathSupplier);
+    if (peerService == null) {
+      String serverSocketDomain = attributesGetter.getServerSocketDomain(request, response);
+      Integer serverSocketPort = attributesGetter.getServerSocketPort(request, response);
+      peerService = mapToPeerService(serverSocketDomain, serverSocketPort, null);
+    }
+    if (peerService != null) {
+      attributes.put(SemanticAttributes.PEER_SERVICE, peerService);
+    }
+  }
+
+  @Nullable
+  private String mapToPeerService(
+      @Nullable String host, @Nullable Integer port, @Nullable Supplier<String> pathSupplier) {
+    if (host == null) {
+      return null;
+    }
+    return peerServiceResolver.resolveService(host, port, pathSupplier);
+  }
+
+  @Nullable
+  private String getUrlPath(
+      HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter, REQUEST request) {
+    String urlFull = attributesGetter.getUrlFull(request);
+    if (urlFull == null) {
+      return null;
+    }
+    return UrlParser.getPath(urlFull);
+  }
+}

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractor.java

@@ -11,7 +11,6 @@
 import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter;
 import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.semconv.SemanticAttributes;
-import java.util.Map;
 import javax.annotation.Nullable;
 
 /**
@@ -23,24 +22,24 @@ public final class PeerServiceAttributesExtractor<REQUEST, RESPONSE>
     implements AttributesExtractor<REQUEST, RESPONSE> {
 
   private final ServerAttributesGetter<REQUEST, RESPONSE> attributesGetter;
-  private final Map<String, String> peerServiceMapping;
+  private final PeerServiceResolver peerServiceResolver;
 
   // visible for tests
   PeerServiceAttributesExtractor(
       ServerAttributesGetter<REQUEST, RESPONSE> attributesGetter,
-      Map<String, String> peerServiceMapping) {
+      PeerServiceResolver peerServiceResolver) {
     this.attributesGetter = attributesGetter;
-    this.peerServiceMapping = peerServiceMapping;
+    this.peerServiceResolver = peerServiceResolver;
   }
 
   /**
    * Returns a new {@link PeerServiceAttributesExtractor} that will use the passed {@code
-   * netAttributesExtractor} instance to determine the value of the {@code peer.service} attribute.
+   * attributesGetter} instance to determine the value of the {@code peer.service} attribute.
    */
   public static <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> create(
       ServerAttributesGetter<REQUEST, RESPONSE> attributesGetter,
-      Map<String, String> peerServiceMapping) {
-    return new PeerServiceAttributesExtractor<>(attributesGetter, peerServiceMapping);
+      PeerServiceResolver peerServiceResolver) {
+    return new PeerServiceAttributesExtractor<>(attributesGetter, peerServiceResolver);
   }
 
   @Override
@@ -54,27 +53,29 @@ public void onEnd(
       @Nullable RESPONSE response,
       @Nullable Throwable error) {
 
-    if (peerServiceMapping.isEmpty()) {
+    if (peerServiceResolver.isEmpty()) {
       // optimization for common case
       return;
     }
 
     String serverAddress = attributesGetter.getServerAddress(request);
-    String peerService = mapToPeerService(serverAddress);
+    Integer serverPort = attributesGetter.getServerPort(request);
+    String peerService = mapToPeerService(serverAddress, serverPort);
     if (peerService == null && SemconvStability.emitOldHttpSemconv()) {
       String serverSocketDomain = attributesGetter.getServerSocketDomain(request, response);
-      peerService = mapToPeerService(serverSocketDomain);
+      Integer serverSocketPort = attributesGetter.getServerSocketPort(request, response);
+      peerService = mapToPeerService(serverSocketDomain, serverSocketPort);
     }
     if (peerService != null) {
       attributes.put(SemanticAttributes.PEER_SERVICE, peerService);
     }
   }
 
   @Nullable
-  private String mapToPeerService(@Nullable String endpoint) {
-    if (endpoint == null) {
+  private String mapToPeerService(@Nullable String host, @Nullable Integer port) {
+    if (host == null) {
       return null;
     }
-    return peerServiceMapping.get(endpoint);
+    return peerServiceResolver.resolveService(host, port, null);
   }
 }

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceResolver.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.api.instrumenter.net;
+
+import java.util.Map;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
+
+public interface PeerServiceResolver {
+
+  public boolean isEmpty();
+
+  @Nullable
+  public String resolveService(
+      String host, @Nullable Integer port, @Nullable Supplier<String> pathSupplier);
+
+  static PeerServiceResolver create(Map<String, String> mapping) {
+    return new PeerServiceResolverImpl(mapping);
+  }
+}