Merge branch 'main' into mdcli2

trask · web-flow · commit b08d6baaeb2f · 2025-11-24T22:19:57.000-08:00
diff --git a/.github/config/lychee.toml b/.github/config/lychee.toml
@@ -1,5 +1,5 @@
 # Lychee configuration file
-# See https://lychee.cli.rs/config/
+# See https://lychee.cli.rs/guides/config/
 
 timeout = 30
 retry_wait_time = 5
diff --git a/.github/workflows/reusable-link-check.yml b/.github/workflows/reusable-link-check.yml
@@ -16,13 +16,16 @@ jobs:
 
       - uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
 
-      - name: Link check - relative links (all files)
+      - name: Link check for pull requests
         if: github.event_name == 'pull_request'
         env:
           GITHUB_TOKEN: ${{ github.token }}
-        run: mise run lint:local-links
+        run: |
+          mise run lint:local-links
+          mise run lint:links-in-modified-files --base origin/${{ github.base_ref }} --head ${{ github.event.pull_request.head.sha }} --event pull_request
 
-      - name: Link check (modified files only)
+      - name: Link check for pushes and scheduled workflows
+        if: github.event_name != 'pull_request'
         env:
           GITHUB_TOKEN: ${{ github.token }}
-        run: mise run lint:links-in-modified-files --base origin/${{ github.base_ref }} --head ${{ github.event.pull_request.head.sha }} --event ${{ github.event_name }}
+        run: mise run lint:links
diff --git a/docs/contributing/documenting-instrumentation.md b/docs/contributing/documenting-instrumentation.md
@@ -182,9 +182,9 @@ List of possible options:
 * [RPC_SERVER_SPANS](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/rpc/rpc-spans.md#rpc-server-span)
 * [RPC_SERVER_METRICS](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/rpc/rpc-metrics.md#rpc-server)
 * [MESSAGING_SPANS](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/messaging/messaging-spans.md)
-* [DATABASE_CLIENT_SPANS](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/database/database-spans.md)
-* [DATABASE_CLIENT_METRICS](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/database/database-metrics.md)
-* [DATABASE_POOL_METRICS](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/database/database-metrics.md)
+* [DATABASE_CLIENT_SPANS](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/db/database-spans.md)
+* [DATABASE_CLIENT_METRICS](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/db/database-metrics.md)
+* [DATABASE_POOL_METRICS](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/db/database-metrics.md)
 * [JVM_RUNTIME_METRICS](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/runtime/jvm-metrics.md)
 * [GRAPHQL_SERVER_SPANS](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/graphql/graphql-spans.md)
 * [FAAS_SERVER_SPANS](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/faas/faas-spans.md)
diff --git a/docs/supported-libraries.md b/docs/supported-libraries.md
@@ -182,7 +182,7 @@ These are the supported libraries and frameworks:
 
 **[6]** Database Client Metrics are available for those who opt-in to [semantic convention stability](https://opentelemetry.io/docs/specs/semconv/non-normative/db-migration/).
 
-[Elasticsearch Client Spans]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/database/elasticsearch.md
+[Elasticsearch Client Spans]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/db/elasticsearch.md
 [HTTP Server Spans]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-spans.md#http-server
 [HTTP Client Spans]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-spans.md#http-client-span
 [HTTP Server Metrics]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md#http-server
@@ -192,9 +192,9 @@ These are the supported libraries and frameworks:
 [RPC Server Metrics]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/rpc/rpc-metrics.md#rpc-server
 [RPC Client Metrics]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/rpc/rpc-metrics.md#rpc-client
 [Messaging Spans]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/messaging/messaging-spans.md
-[Database Client Spans]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/database/database-spans.md
-[Database Client Metrics]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/database/database-metrics.md
-[Database Pool Metrics]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/database/database-metrics.md
+[Database Client Spans]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/db/database-spans.md
+[Database Client Metrics]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/db/database-metrics.md
+[Database Pool Metrics]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/db/database-metrics.md
 [JVM Runtime Metrics]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/runtime/jvm-metrics.md
 [System Metrics]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/system/system-metrics.md
 [GraphQL Server Spans]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/graphql/graphql-spans.md
diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java
@@ -27,7 +27,7 @@
 
 /**
  * Extractor of <a
- * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/database/database-spans.md">database
+ * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/db/database-spans.md">database
  * client attributes</a>.
  *
  * <p>This class delegates to a type-specific {@link DbClientAttributesGetter} for individual
diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbConnectionPoolMetrics.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbConnectionPoolMetrics.java
@@ -22,7 +22,7 @@
 
 /**
  * A helper class that models the <a
- * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/database/database-metrics.md#connection-pools">database
+ * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/db/database-metrics.md#connection-pools">database
  * client connection pool metrics semantic conventions</a>.
  */
 public final class DbConnectionPoolMetrics {
diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java
@@ -27,7 +27,7 @@
 
 /**
  * Extractor of <a
- * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/database/database-spans.md">database
+ * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/db/database-spans.md">database
  * attributes</a>. This class is designed with SQL (or SQL-like) database clients in mind.
  *
  * <p>It sets the same set of attributes as {@link DbClientAttributesExtractor} plus an additional
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/v2_0/test/Resource.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/v2_0/test/Resource.java
@@ -5,20 +5,25 @@
 
 package io.opentelemetry.instrumentation.jaxrs.v2_0.test;
 
+import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
+
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
 
 @Path("/ignored")
 public interface Resource {
   @Path("ignored")
+  @Produces(TEXT_PLAIN)
   String hello(String name);
 
   @Path("/test")
   interface SubResource extends Cloneable, Resource {
     @Override
     @POST
     @Path("/hello/{name}")
+    @Produces(TEXT_PLAIN)
     String hello(@PathParam("name") String name);
   }
 
@@ -42,12 +47,14 @@ class Test3 implements SubResource {
     @Override
     @POST
     @Path("/hi/{name}")
+    @Produces(TEXT_PLAIN)
     public String hello(@PathParam("name") String name) {
       return "Test3 " + name + "!";
     }
 
     @POST
     @Path("/nested")
+    @Produces(TEXT_PLAIN)
     public String nested() {
       return hello("nested");
     }
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts
@@ -34,7 +34,7 @@ muzzle {
 }
 
 dependencies {
-  compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")
+  library("javax.ws.rs:javax.ws.rs-api:2.0")
   library("org.jboss.resteasy:resteasy-jaxrs:3.1.0.Final")
 
   implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent"))
diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/v3_0/test/Resource.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/v3_0/test/Resource.java
@@ -5,20 +5,25 @@
 
 package io.opentelemetry.instrumentation.jaxrs.v3_0.test;
 
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
+
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
 
 @Path("/ignored")
 public interface Resource {
   @Path("ignored")
+  @Produces(TEXT_PLAIN)
   String hello(String name);
 
   @Path("/test")
   interface SubResource extends Cloneable, Resource {
     @Override
     @POST
     @Path("/hello/{name}")
+    @Produces(TEXT_PLAIN)
     String hello(@PathParam("name") String name);
   }
 
@@ -42,12 +47,14 @@ class Test3 implements SubResource {
     @Override
     @POST
     @Path("/hi/{name}")
+    @Produces(TEXT_PLAIN)
     public String hello(@PathParam("name") String name) {
       return "Test3 " + name + "!";
     }
 
     @POST
     @Path("/nested")
+    @Produces(TEXT_PLAIN)
     public String nested() {
       return hello("nested");
     }
diff --git a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParser.java b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParser.java
@@ -1151,7 +1151,7 @@ private static void populateStandardProperties(DbInfo.Builder builder, Map<?, ?>
   }
 
   // see
-  // https://github.com/open-telemetry/semantic-conventions/blob/main/docs/database/database-spans.md
+  // https://github.com/open-telemetry/semantic-conventions/blob/main/docs/db/database-spans.md
   private static String toDbSystem(String type) {
     switch (type) {
       case "as400": // IBM AS400 Database
diff --git a/instrumentation/ratpack/ratpack-1.7/library/README.md b/instrumentation/ratpack/ratpack-1.7/library/README.md
@@ -1,6 +1,6 @@
 # Library Instrumentation for Ratpack version 1.7 and higher
 
-Provides OpenTelemetry instrumentation for [Ratpack](https://ratpack.io/), enabling HTTP client and
+Provides OpenTelemetry instrumentation for [Ratpack](https://github.com/ratpack/ratpack), enabling HTTP client and
 server spans and metrics.
 
 ## Quickstart
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/DeclarativeConfigLoggingExporterAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/DeclarativeConfigLoggingExporterAutoConfiguration.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.logging;
+
+import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
+
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.exporter.logging.LoggingSpanExporter;
+import io.opentelemetry.instrumentation.logging.internal.AbstractSpanLoggingCustomizerProvider;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.OtelEnabled;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
+@Conditional(OtelEnabled.class)
+@ConditionalOnClass(LoggingSpanExporter.class)
+@Configuration
+public class DeclarativeConfigLoggingExporterAutoConfiguration {
+  @Bean
+  public DeclarativeConfigurationCustomizerProvider spanLoggingCustomizerProvider() {
+    return new SpanLoggingCustomizerProvider();
+  }
+
+  static class SpanLoggingCustomizerProvider extends AbstractSpanLoggingCustomizerProvider {
+    @Override
+    protected boolean isEnabled(OpenTelemetryConfigurationModel model) {
+      DeclarativeConfigProperties instrumentation =
+          SdkConfigProvider.create(model).getInstrumentationConfig();
+      if (instrumentation == null) {
+        return false;
+      }
+
+      return instrumentation
+          .getStructured("java", empty())
+          .getStructured("spring_starter", empty())
+          .getBoolean("debug", false);
+    }
+  }
+}
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/SpanLoggingCustomizerProviderTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/SpanLoggingCustomizerProviderTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.logging;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+class SpanLoggingCustomizerProviderTest {
+
+  @ParameterizedTest
+  @CsvSource({
+    "true, false, true",
+    "false, false, false",
+    ", false, false", // empty value means property is not set
+    "invalid, false, false",
+    "true, true, true",
+  })
+  @SuppressWarnings("StringConcatToTextBlock") // latest dep allows text blocks
+  void addSpanLoggingExporter(String propertyValue, boolean alreadyAdded, boolean expected) {
+    String debug =
+        propertyValue == null
+            ? ""
+            : "instrumentation/development: \n"
+                + "  java: \n"
+                + "    spring_starter: \n"
+                + "      debug: "
+                + propertyValue;
+
+    String yaml =
+        alreadyAdded
+            ? "file_format: \"1.0-rc.1\"\n"
+                + "tracer_provider:\n"
+                + "  processors:\n"
+                + "    - simple:\n"
+                + "        exporter:\n"
+                + "          console: {}\n"
+            : "file_format: \"1.0-rc.1\"\n" + debug;
+
+    OpenTelemetryConfigurationModel model =
+        applyCustomizer(
+            DeclarativeConfiguration.parse(
+                new ByteArrayInputStream(yaml.getBytes(StandardCharsets.UTF_8))),
+            new DeclarativeConfigLoggingExporterAutoConfiguration.SpanLoggingCustomizerProvider());
+
+    String console = "ConsoleExporterModel";
+    if (expected) {
+      assertThat(model.toString()).containsOnlyOnce(console);
+    } else {
+      assertThat(model.toString()).doesNotContain(console);
+    }
+  }
+
+  private static OpenTelemetryConfigurationModel applyCustomizer(
+      OpenTelemetryConfigurationModel model,
+      DeclarativeConfigLoggingExporterAutoConfiguration.SpanLoggingCustomizerProvider provider) {
+    List<Function<OpenTelemetryConfigurationModel, OpenTelemetryConfigurationModel>> customizers =
+        new ArrayList<>();
+    provider.customize(c -> customizers.add(c));
+    for (Function<OpenTelemetryConfigurationModel, OpenTelemetryConfigurationModel> customizer :
+        customizers) {
+      model = customizer.apply(model);
+    }
+    return model;
+  }
+}
diff --git a/instrumentation/spring/spring-pulsar-1.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-pulsar-1.0/javaagent/build.gradle.kts
@@ -12,6 +12,8 @@ muzzle {
   }
 }
 
+val latestDepTest = findProperty("testLatestDeps") as Boolean
+
 dependencies {
   library("org.springframework.pulsar:spring-pulsar:1.0.0")
   implementation(project(":instrumentation:pulsar:pulsar-2.8:javaagent"))
@@ -23,12 +25,11 @@ dependencies {
   testLibrary("org.springframework.boot:spring-boot-starter-test:3.2.4")
   testLibrary("org.springframework.boot:spring-boot-starter:3.2.4")
 
-  // tests don't work with spring boot 4 yet
-  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.+") // documented limitation
-  latestDepTestLibrary("org.springframework.boot:spring-boot-starter:3.+") // documented limitation
+  if (latestDepTest) {
+    testLibrary("org.springframework.boot:spring-boot-starter-pulsar:latest.release")
+  }
 }
 
-val latestDepTest = findProperty("testLatestDeps") as Boolean
 val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"
 
 testing {
@@ -38,9 +39,9 @@ testing {
         implementation(project(":instrumentation:spring:spring-pulsar-1.0:testing"))
 
         if (latestDepTest) {
-          implementation("org.springframework.pulsar:spring-pulsar:latest.release")
-          implementation("org.springframework.boot:spring-boot-starter-test:3.+")
-          implementation("org.springframework.boot:spring-boot-starter:3.+")
+          implementation("org.springframework.boot:spring-boot-starter-pulsar:latest.release")
+          implementation("org.springframework.boot:spring-boot-starter-test:latest.release")
+          implementation("org.springframework.boot:spring-boot-starter:latest.release")
         } else {
           implementation("org.springframework.pulsar:spring-pulsar:1.0.0")
           implementation("org.springframework.boot:spring-boot-starter-test:3.2.4")
diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/SpanLoggingCustomizerProvider.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/SpanLoggingCustomizerProvider.java
diff --git a/sdk-autoconfigure-support/build.gradle.kts b/sdk-autoconfigure-support/build.gradle.kts
diff --git a/sdk-autoconfigure-support/src/main/java/io/opentelemetry/instrumentation/logging/internal/AbstractSpanLoggingCustomizerProvider.java b/sdk-autoconfigure-support/src/main/java/io/opentelemetry/instrumentation/logging/internal/AbstractSpanLoggingCustomizerProvider.java

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`
`28`	`28`	`/**`
`29`	`29`	`* Extractor of <a`
`30`		`- * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/database/database-spans.md">database`
	`30`	`+ * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/db/database-spans.md">database`
`31`	`31`	`* client attributes</a>.`
`32`	`32`	`*`
`33`	`33`	`* <p>This class delegates to a type-specific {@link DbClientAttributesGetter} for individual`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ muzzle {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`dependencies {`
`37`		`- compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")`
	`37`	`+ library("javax.ws.rs:javax.ws.rs-api:2.0")`
`38`	`38`	`library("org.jboss.resteasy:resteasy-jaxrs:3.1.0.Final")`
`39`	`39`
`40`	`40`	`implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent"))`