Merge branch 'main' into http-request-response-wrappers

Author: trask

benchmark-overhead/README.md

@@ -79,6 +79,7 @@ Currently, we test:
 - no agent versus latest released agent
 - no agent versus latest snapshot
 - latest release vs. latest snapshot
+- latest snapshot with indy enabled
 
 Additional configurations can be created by submitting a PR against the `Configs` class.
 

benchmark-overhead/src/test/java/io/opentelemetry/agents/Agent.java

@@ -22,6 +22,12 @@ public class Agent {
       new Agent("latest", "latest mainstream release", OTEL_LATEST);
   public static final Agent LATEST_SNAPSHOT =
       new Agent("snapshot", "latest available snapshot version from main");
+  public static final Agent LATEST_SNAPSHOT_INDY =
+      new Agent(
+          "snapshot-indy",
+          "latest available snapshot version from main with indy enabled",
+          null,
+          Collections.singletonList("-Dotel.javaagent.experimental.indy=true"));
 
   private final String name;
   private final String description;

benchmark-overhead/src/test/java/io/opentelemetry/agents/AgentResolver.java

@@ -24,7 +24,7 @@ public Optional<Path> resolve(Agent agent) throws Exception {
     if (Agent.NONE.equals(agent)) {
       return Optional.empty();
     }
-    if (Agent.LATEST_SNAPSHOT.equals(agent)) {
+    if (Agent.LATEST_SNAPSHOT.equals(agent) || Agent.LATEST_SNAPSHOT_INDY.equals(agent)) {
       return snapshotResolver.resolve();
     }
     if (agent.hasUrl()) {

benchmark-overhead/src/test/java/io/opentelemetry/config/Configs.java

@@ -15,7 +15,8 @@ public enum Configs {
       TestConfig.builder()
           .name("release")
           .description("compares no agent, latest stable, and latest snapshot agents")
-          .withAgents(Agent.NONE, Agent.LATEST_RELEASE, Agent.LATEST_SNAPSHOT)
+          .withAgents(
+              Agent.NONE, Agent.LATEST_RELEASE, Agent.LATEST_SNAPSHOT, Agent.LATEST_SNAPSHOT_INDY)
           .warmupSeconds(60)
           .build());
 

conventions/src/main/kotlin/io.opentelemetry.instrumentation.library-instrumentation.gradle.kts

@@ -10,3 +10,11 @@ dependencies {
 
   testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
 }
+
+testing {
+  suites.withType(JvmTestSuite::class).configureEach {
+    dependencies {
+      implementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
+    }
+  }
+}

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

@@ -467,7 +467,7 @@ configurations.configureEach {
       substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")).using(project(":javaagent-extension-api"))
       substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")).using(project(":javaagent-tooling"))
       substitute(module("io.opentelemetry.javaagent:opentelemetry-agent-for-testing")).using(project(":testing:agent-for-testing"))
-      substitute(module("io.opentelemetry.javaagent:opentelemetry-testing-common")).using(project(":testing-common"))
+      substitute(module("io.opentelemetry.javaagent:opentelemetry-testing-common")).using(project(":testing-common:with-shaded-dependencies"))
       substitute(module("io.opentelemetry.javaagent:opentelemetry-muzzle")).using(project(":muzzle"))
       substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent")).using(project(":javaagent"))
     }

dependencyManagement/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 data class DependencySet(val group: String, val version: String, val modules: List<String>)
 
 // this line is managed by .github/scripts/update-sdk-version.sh
-val otelSdkVersion = "1.55.0"
+val otelSdkVersion = "1.56.0"
 val otelContribVersion = "1.51.0-alpha"
 val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 

docs/instrumentation-list.yaml

@@ -1170,9 +1170,88 @@ libraries:
         - name: server.port
           type: LONG
   async:
+  - name: async-http-client-1.8
+    display_name: AsyncHttpClient
+    description: |
+      This instrumentation enables HTTP client spans and HTTP client metrics for the AsyncHttpClient HTTP client.
+    semantic_conventions:
+    - HTTP_CLIENT_SPANS
+    - HTTP_CLIENT_METRICS
+    library_link: https://github.com/AsyncHttpClient/async-http-client
+    source_path: instrumentation/async-http-client/async-http-client-1.8
+    scope:
+      name: io.opentelemetry.async-http-client-1.8
+      schema_url: https://opentelemetry.io/schemas/1.37.0
+    target_versions:
+      javaagent:
+      - com.ning:async-http-client:[1.8.0,1.9.0)
+    configurations:
+    - name: otel.instrumentation.http.known-methods
+      description: |
+        Configures the instrumentation to recognize an alternative set of HTTP request methods. All other methods will be treated as `_OTHER`.
+      type: list
+      default: CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE
+    - name: otel.instrumentation.http.client.capture-request-headers
+      description: List of HTTP request headers to capture in HTTP client telemetry.
+      type: list
+      default: ''
+    - name: otel.instrumentation.http.client.capture-response-headers
+      description: List of HTTP response headers to capture in HTTP client telemetry.
+      type: list
+      default: ''
+    - name: otel.instrumentation.common.peer-service-mapping
+      description: Used to specify a mapping from host names or IP addresses to peer
+        services.
+      type: map
+      default: ''
+    - name: otel.instrumentation.http.client.emit-experimental-telemetry
+      description: |
+        Enable the capture of experimental HTTP client telemetry. Adds the `http.request.body.size` and `http.response.body.size` attributes to spans, and records `http.client.request.size` and `http.client.response.size` metrics.
+      type: boolean
+      default: false
+    - name: otel.instrumentation.http.client.experimental.redact-query-parameters
+      description: Redact sensitive URL parameters. See https://opentelemetry.io/docs/specs/semconv/http/http-spans.
+      type: boolean
+      default: true
+    telemetry:
+    - when: default
+      metrics:
+      - name: http.client.request.duration
+        description: Duration of HTTP client requests.
+        type: HISTOGRAM
+        unit: s
+        attributes:
+        - name: http.request.method
+          type: STRING
+        - name: http.response.status_code
+          type: LONG
+        - name: server.address
+          type: STRING
+        - name: server.port
+          type: LONG
+      spans:
+      - span_kind: CLIENT
+        attributes:
+        - name: error.type
+          type: STRING
+        - name: http.request.method
+          type: STRING
+        - name: http.request.method_original
+          type: STRING
+        - name: http.response.status_code
+          type: LONG
+        - name: peer.service
+          type: STRING
+        - name: server.address
+          type: STRING
+        - name: server.port
+          type: LONG
+        - name: url.full
+          type: STRING
   - name: async-http-client-1.9
-    description: This instrumentation enables HTTP client spans and HTTP client metrics
-      for version 1 of the AsyncHttpClient (AHC) HTTP client.
+    display_name: AsyncHttpClient
+    description: |
+      This instrumentation enables HTTP client spans and HTTP client metrics for the AsyncHttpClient HTTP client.
     semantic_conventions:
     - HTTP_CLIENT_SPANS
     - HTTP_CLIENT_METRICS
@@ -1248,8 +1327,9 @@ libraries:
         - name: url.full
           type: STRING
   - name: async-http-client-2.0
-    description: This instrumentation enables HTTP client spans and HTTP client metrics
-      for version 2 of the AsyncHttpClient (AHC) HTTP client.
+    display_name: AsyncHttpClient
+    description: |
+      This instrumentation enables HTTP client spans and HTTP client metrics for the AsyncHttpClient HTTP client.
     semantic_conventions:
     - HTTP_CLIENT_SPANS
     - HTTP_CLIENT_METRICS

examples/distro/README.md

@@ -44,7 +44,7 @@ The `InstrumenterCustomizerProvider` extension point allows you to customize ins
 - Add custom attributes and metrics to existing instrumentations
 - Customize context
 - Transform span names to match your naming conventions
-- Apply customizations conditionally based on instrumentation name
+- Apply customizations conditionally based on instrumentation name or type (HTTP client, HTTP server, DB client, etc.)
 
 ### I don't want this span at all
 

examples/distro/build.gradle

@@ -27,7 +27,7 @@ subprojects {
   ext {
     versions = [
       // this line is managed by .github/scripts/update-sdk-version.sh
-      opentelemetrySdk           : "1.55.0",
+      opentelemetrySdk           : "1.56.0",
 
       // these lines are managed by .github/scripts/update-version.sh
       opentelemetryJavaagent     : "2.22.0-SNAPSHOT",