Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java into otlp-configurable-executor

Author: jack-berg

.github/workflows/codeql.yml

@@ -37,7 +37,7 @@ jobs:
         uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
         with:
           languages: java, actions
           # using "latest" helps to keep up with the latest Kotlin support
@@ -51,4 +51,4 @@ jobs:
         run: ./gradlew assemble --no-build-cache --no-daemon
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11

.github/workflows/ossf-scorecard.yml

@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
         with:
           sarif_file: results.sarif

CHANGELOG.md

@@ -123,6 +123,7 @@ default LogRecordBuilder setAllAttributes(Attributes attributes) {
    * @param key the key for this attribute.
    * @param value the value for this attribute.
    * @return this.
+   * @since 1.48.0
    */
   default LogRecordBuilder setAttribute(String key, String value) {
     return setAttribute(stringKey(key), value);
@@ -138,6 +139,7 @@ default LogRecordBuilder setAttribute(String key, String value) {
    * @param key the key for this attribute.
    * @param value the value for this attribute.
    * @return this.
+   * @since 1.48.0
    */
   default LogRecordBuilder setAttribute(String key, long value) {
     return setAttribute(longKey(key), value);
@@ -153,6 +155,7 @@ default LogRecordBuilder setAttribute(String key, long value) {
    * @param key the key for this attribute.
    * @param value the value for this attribute.
    * @return this.
+   * @since 1.48.0
    */
   default LogRecordBuilder setAttribute(String key, double value) {
     return setAttribute(doubleKey(key), value);
@@ -168,6 +171,7 @@ default LogRecordBuilder setAttribute(String key, double value) {
    * @param key the key for this attribute.
    * @param value the value for this attribute.
    * @return this.
+   * @since 1.48.0
    */
   default LogRecordBuilder setAttribute(String key, boolean value) {
     return setAttribute(booleanKey(key), value);
@@ -183,6 +187,7 @@ default LogRecordBuilder setAttribute(String key, boolean value) {
    * @param key the key for this attribute.
    * @param value the value for this attribute.
    * @return this.
+   * @since 1.48.0
    */
   default LogRecordBuilder setAttribute(String key, int value) {
     return setAttribute(key, (long) value);

README.md

@@ -13,7 +13,7 @@ val DEPENDENCY_BOMS = listOf(
   // (which is EPL licensed) or armeria bom (which is Apache licensed but is getting flagged
   // by FOSSA for containing EPL-licensed)
 
-  "com.fasterxml.jackson:jackson-bom:2.18.2",
+  "com.fasterxml.jackson:jackson-bom:2.18.3",
   "com.google.guava:guava-bom:33.4.0-jre",
   "com.google.protobuf:protobuf-bom:4.29.3",
   "com.squareup.okhttp3:okhttp-bom:4.12.0",
@@ -73,7 +73,7 @@ val DEPENDENCIES = listOf(
   "io.prometheus:simpleclient_httpserver:${prometheusClientVersion}",
   "javax.annotation:javax.annotation-api:1.3.2",
   "com.github.stefanbirkner:system-rules:1.19.0",
-  "com.google.api.grpc:proto-google-common-protos:2.53.0",
+  "com.google.api.grpc:proto-google-common-protos:2.54.0",
   "com.google.code.findbugs:jsr305:3.0.2",
   "com.google.guava:guava-beta-checker:1.0",
   "com.sun.net.httpserver:http:20070405",

api/all/src/main/java/io/opentelemetry/api/logs/LogRecordBuilder.java

@@ -0,0 +1,8 @@
+Comparing source compatibility of opentelemetry-api-1.48.0.jar against opentelemetry-api-1.47.0.jar
+***  MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.api.logs.LogRecordBuilder  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.api.logs.LogRecordBuilder setAttribute(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.api.logs.LogRecordBuilder setAttribute(java.lang.String, long)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.api.logs.LogRecordBuilder setAttribute(java.lang.String, double)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.api.logs.LogRecordBuilder setAttribute(java.lang.String, boolean)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.api.logs.LogRecordBuilder setAttribute(java.lang.String, int)

dependencyManagement/build.gradle.kts

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-context-1.48.0.jar against opentelemetry-context-1.47.0.jar
+No changes.

docs/apidiffs/1.48.0_vs_1.47.0/opentelemetry-api.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-exporter-common-1.48.0.jar against opentelemetry-exporter-common-1.47.0.jar
+No changes.

docs/apidiffs/1.48.0_vs_1.47.0/opentelemetry-context.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-exporter-logging-otlp-1.48.0.jar against opentelemetry-exporter-logging-otlp-1.47.0.jar
+No changes.