Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java into scope-config

Author: jack-berg

.github/repository-settings.md

@@ -66,7 +66,7 @@ Same settings as above for `main`, except:
 
 * `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
 * `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
-* `GRADLE_ENTERPRISE_ACCESS_KEY` - owned by [@jack-berg](https://github.com/jack-berg)
+* `DEVELOCITY_ACCESS_KEY` - owned by [@jack-berg](https://github.com/jack-berg)
   * Generated at https://ge.opentelemetry.io > My settings > Access keys
   * format of env var is `ge.opentelemetry.io=<access key>`,
     see [docs](https://docs.gradle.com/enterprise/gradle-plugin/#via_environment_variable)

.github/workflows/gradle-wrapper-validation.yml

@@ -13,4 +13,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: gradle/[email protected].2
+      - uses: gradle/[email protected].3

README.md

@@ -261,18 +261,18 @@ dependency as follows, replacing `{{artifact-id}}` with the value from the "Arti
 
 ### SDK Exporters
 
-| Component                                                             | Description                                                                  | Artifact ID                                          | Version                                                     | Javadoc                                                                                                                                                                                                             |
-|-----------------------------------------------------------------------|------------------------------------------------------------------------------|------------------------------------------------------|-------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [OTLP Exporters](./exporters/otlp/all)                                | OTLP gRPC & HTTP exporters, including traces, metrics, and logs              | `opentelemetry-exporter-otlp`                        | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-otlp.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-otlp)                                               |
-| [OTLP Logging Exporters](./exporters/logging-otlp)                    | Logging exporters in OTLP JSON encoding, including traces, metrics, and logs | `opentelemetry-exporter-logging-otlp`                | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-logging-otlp.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-logging-otlp)                               |
-| [OTLP Common](./exporters/otlp/common)                                | Shared OTLP components (internal)                                            | `opentelemetry-exporter-otlp-common`                 | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-otlp-common.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-otlp-common)                                 |
-| [Logging Exporter](./exporters/logging)                               | Logging exporters, including metrics, traces, and logs                       | `opentelemetry-exporter-logging`                     | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-logging.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-logging)                                         |
-| [Zipkin Exporter](./exporters/zipkin)                                 | Zipkin trace exporter                                                        | `opentelemetry-exporter-zipkin`                      | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-zipkin.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-zipkin)                                           |
-| [Prometheus Exporter](./exporters/prometheus)                         | Prometheus metric exporter                                                   | `opentelemetry-exporter-prometheus`                  | <!--VERSION_UNSTABLE-->1.37.0-alpha<!--/VERSION_UNSTABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-prometheus.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-prometheus)                                   |
-| [Exporter Common](./exporters/common)                                 | Shared exporter components (internal)                                        | `opentelemetry-exporter-common`                      | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-common.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-common)                                           |
-| [OkHttp Sender](./exporters/sender/okhttp)                            | OkHttp implementation of HttpSender (internal)                               | `opentelemetry-exporter-sender-okhttp`               | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-sender-okhttp.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-sender-okhttp)                             |
-| [JDK Sender](./exporters/sender/okhttp)                               | Java 11+ native HttpClient implementation of HttpSender (internal)           | `opentelemetry-exporter-sender-jdk`                  | <!--VERSION_UNSTABLE-->1.37.0-alpha<!--/VERSION_UNSTABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-sender-jdk.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-sender-jdk)                                   |                                                                                                                                                            |
-| [gRPC ManagedChannel Sender](./exporters/sender/grpc-managed-channel) | gRPC ManagedChannel implementation of GrpcSender (internal)                  | `opentelemetry-exporter-sender-grpc-managed-channel` | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-sender-grpc-managed-channel.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-sender-grpc-managed-channel) |                                                                                                                                                            |
+| Component                                                             | Description                                                                  | Artifact ID                                                             | Version                                                     | Javadoc                                                                                                                                                                                                             |
+|-----------------------------------------------------------------------|------------------------------------------------------------------------------|-------------------------------------------------------------------------|-------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [OTLP Exporters](./exporters/otlp/all)                                | OTLP gRPC & HTTP exporters, including traces, metrics, and logs              | `opentelemetry-exporter-otlp`                                           | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-otlp.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-otlp)                                               |
+| [OTLP Logging Exporters](./exporters/logging-otlp)                    | Logging exporters in OTLP JSON encoding, including traces, metrics, and logs | `opentelemetry-exporter-logging-otlp`                                   | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-logging-otlp.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-logging-otlp)                               |
+| [OTLP Common](./exporters/otlp/common)                                | Shared OTLP components (internal)                                            | `opentelemetry-exporter-otlp-common`                                    | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-otlp-common.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-otlp-common)                                 |
+| [Logging Exporter](./exporters/logging)                               | Logging exporters, including metrics, traces, and logs                       | `opentelemetry-exporter-logging`                                        | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-logging.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-logging)                                         |
+| [Zipkin Exporter](./exporters/zipkin)                                 | Zipkin trace exporter                                                        | `opentelemetry-exporter-zipkin`                                         | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-zipkin.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-zipkin)                                           |
+| [Prometheus Exporter](./exporters/prometheus)                         | Prometheus metric exporter                                                   | `opentelemetry-exporter-prometheus`                                     | <!--VERSION_UNSTABLE-->1.37.0-alpha<!--/VERSION_UNSTABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-prometheus.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-prometheus)                                   |
+| [Exporter Common](./exporters/common)                                 | Shared exporter components (internal)                                        | `opentelemetry-exporter-common`                                         | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-common.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-common)                                           |
+| [OkHttp Sender](./exporters/sender/okhttp)                            | OkHttp implementation of HttpSender (internal)                               | `opentelemetry-exporter-sender-okhttp`                                  | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-sender-okhttp.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-sender-okhttp)                             |
+| [JDK Sender](./exporters/sender/okhttp)                               | Java 11+ native HttpClient implementation of HttpSender (internal)           | `opentelemetry-exporter-sender-jdk` TODO: remove `-alpha` after release | <!--VERSION_UNSTABLE-->1.37.0-alpha<!--/VERSION_UNSTABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-sender-jdk.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-sender-jdk)                                   |                                                                                                                                                            |
+| [gRPC ManagedChannel Sender](./exporters/sender/grpc-managed-channel) | gRPC ManagedChannel implementation of GrpcSender (internal)                  | `opentelemetry-exporter-sender-grpc-managed-channel`                    | <!--VERSION_STABLE-->1.37.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-sender-grpc-managed-channel.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-sender-grpc-managed-channel) |                                                                                                                                                            |
 
 ### SDK Extensions
 

api/all/src/main/java/io/opentelemetry/api/metrics/Meter.java

@@ -65,7 +65,7 @@ public interface Meter {
    * callbacks).
    *
    * @param name the name of the Counter. Instrument names must consist of 255 or fewer characters
-   *     including alphanumeric, _, ., -, and start with a letter.
+   *     including alphanumeric, _, ., -, /, and start with a letter.
    * @return a builder for configuring a Counter instrument. Defaults to recording long values, but
    *     may be changed.
    * @see <a
@@ -81,7 +81,7 @@ public interface Meter {
    * callbacks).
    *
    * @param name the name of the UpDownCounter. Instrument names must consist of 255 or fewer
-   *     characters including alphanumeric, _, ., -, and start with a letter.
+   *     characters including alphanumeric, _, ., -, /, and start with a letter.
    * @return a builder for configuring an UpDownCounter instrument. Defaults to recording long
    *     values, but may be changed.
    * @see <a
@@ -94,7 +94,7 @@ public interface Meter {
    * Constructs a Histogram instrument.
    *
    * @param name the name of the Histogram. Instrument names must consist of 255 or fewer characters
-   *     including alphanumeric, _, ., -, and start with a letter.
+   *     including alphanumeric, _, ., -, /, and start with a letter.
    * @return a builder for configuring a Histogram synchronous instrument. Defaults to recording
    *     double values, but may be changed.
    * @see <a
@@ -107,7 +107,7 @@ public interface Meter {
    * Constructs an Asynchronous Gauge instrument.
    *
    * @param name the name of the Gauge. Instrument names must consist of 255 or fewer characters
-   *     including alphanumeric, _, ., -, and start with a letter.
+   *     including alphanumeric, _, ., -, /, and start with a letter.
    * @return a builder used for configuring a Gauge instrument. Defaults to recording double values,
    *     but may be changed.
    * @see <a

api/incubator/src/test/java/io/opentelemetry/api/incubator/trace/ExtendedTracerTest.java

@@ -24,7 +24,7 @@
 import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension;
 import io.opentelemetry.sdk.trace.data.StatusData;
 import io.opentelemetry.semconv.ClientAttributes;
-import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes;
+import io.opentelemetry.semconv.ExceptionAttributes;
 import java.time.Instant;
 import java.util.Collections;
 import java.util.Map;
@@ -85,16 +85,14 @@ void wrapInSpan() {
                                         .hasName("exception")
                                         .hasAttributesSatisfyingExactly(
                                             equalTo(
-                                                ExceptionIncubatingAttributes.EXCEPTION_TYPE,
+                                                ExceptionAttributes.EXCEPTION_TYPE,
                                                 "java.lang.IllegalStateException"),
                                             satisfies(
-                                                ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE,
+                                                ExceptionAttributes.EXCEPTION_STACKTRACE,
                                                 string ->
                                                     string.contains(
                                                         "java.lang.IllegalStateException: ex")),
-                                            equalTo(
-                                                ExceptionIncubatingAttributes.EXCEPTION_MESSAGE,
-                                                "ex")))),
+                                            equalTo(ExceptionAttributes.EXCEPTION_MESSAGE, "ex")))),
             trace -> trace.hasSpansSatisfyingExactly(a -> a.hasName("another test")));
   }
 

dependencyManagement/build.gradle.kts

@@ -11,12 +11,12 @@ val DEPENDENCY_BOMS = listOf(
   "com.fasterxml.jackson:jackson-bom:2.17.0",
   "com.google.guava:guava-bom:33.1.0-jre",
   "com.google.protobuf:protobuf-bom:3.25.3",
-  "com.linecorp.armeria:armeria-bom:1.27.3",
+  "com.linecorp.armeria:armeria-bom:1.28.0",
   "com.squareup.okhttp3:okhttp-bom:4.12.0",
   "com.squareup.okio:okio-bom:3.9.0", // applies to transitive dependencies of okhttp
   "io.grpc:grpc-bom:1.63.0",
   "io.netty:netty-bom:4.1.108.Final",
-  "io.zipkin.brave:brave-bom:6.0.2",
+  "io.zipkin.brave:brave-bom:6.0.3",
   "io.zipkin.reporter2:zipkin-reporter-bom:3.3.0",
   "org.assertj:assertj-bom:3.25.3",
   "org.junit:junit-bom:5.10.2",
@@ -29,7 +29,7 @@ val errorProneVersion = "2.26.1"
 val jmhVersion = "1.37"
 // Mockito 5.x.x requires Java 11 https://github.com/mockito/mockito/releases/tag/v5.0.0
 val mockitoVersion = "4.11.0"
-val slf4jVersion = "2.0.12"
+val slf4jVersion = "2.0.13"
 val opencensusVersion = "0.31.1"
 val prometheusClientVersion = "0.16.0"
 
@@ -59,15 +59,15 @@ val DEPENDENCIES = listOf(
   "com.google.code.findbugs:jsr305:3.0.2",
   "com.google.guava:guava-beta-checker:1.0",
   "com.sun.net.httpserver:http:20070405",
-  "com.tngtech.archunit:archunit-junit5:1.2.1",
+  "com.tngtech.archunit:archunit-junit5:1.3.0",
   "com.uber.nullaway:nullaway:0.10.25",
   "edu.berkeley.cs.jqf:jqf-fuzz:1.7", // jqf-fuzz version 1.8+ requires Java 11+
   "eu.rekawek.toxiproxy:toxiproxy-java:2.1.7",
   "io.github.netmikey.logunit:logunit-jul:2.0.0",
   "io.jaegertracing:jaeger-client:1.8.1",
   "io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.29.0-alpha",
-  "io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.24.0-alpha",
-  "io.opentelemetry.proto:opentelemetry-proto:1.1.0-alpha",
+  "io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.25.0-alpha",
+  "io.opentelemetry.proto:opentelemetry-proto:1.2.0-alpha",
   "io.opentracing:opentracing-api:0.33.0",
   "io.opentracing:opentracing-noop:0.33.0",
   "io.prometheus:prometheus-metrics-exporter-httpserver:1.2.1",

docs/apidiffs/current_vs_latest/opentelemetry-exporter-sender-jdk.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of  against 
+No changes.

docs/apidiffs/current_vs_latest/opentelemetry-sdk-trace.txt

@@ -1,4 +1,7 @@
 Comparing source compatibility of  against 
+***  MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.sdk.trace.ReadableSpan  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.api.common.Attributes getAttributes()
 ***  MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.trace.SdkTracerProviderBuilder  (not serializable)
 	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
 	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.trace.SdkTracerProviderBuilder addTracerConfiguratorCondition(java.util.function.Predicate<io.opentelemetry.sdk.common.InstrumentationScopeInfo>, io.opentelemetry.sdk.trace.TracerConfig)