Merge branch 'main' into db-networking-attributes

Author: trask

.github/renovate.json5

@@ -190,9 +190,7 @@
       enabled: false,
     },
     {
-      // intentionally using Spring Boot 2 in this smoke tests
-      // new versions of Spring Boot 3 are tested with
-      // https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/dc4330e0a3060bd7d8c4090ad0b8fc4727e68113/settings.gradle.kts#L43-L45
+      // intentionally using Spring Boot 2 in these smoke tests
       matchFileNames: [
         'smoke-tests/images/spring-boot/build.gradle.kts',
         'smoke-tests-otel-starter/spring-boot-2/build.gradle.kts',
@@ -203,42 +201,28 @@
       ],
       matchPackageNames: [
         'org.slf4j:slf4j-api',
-        'org.springframework.boot:org.springframework.boot.gradle.plugin', // this is for plugin id "org.springframework.boot"
-        'org.springframework.boot:spring-boot-dependencies',
+        'org.springframework.boot:**',
       ],
       matchUpdateTypes: [
         'major',
-        'minor',
       ],
       enabled: false,
     },
     {
-      // intentionally using Spring Boot 2 in this smoke tests
+      // intentionally using Logback 1.2 (for Spring Boot 2) in these smoke tests
       matchFileNames: [
+        'smoke-tests/images/spring-boot/build.gradle.kts',
         'smoke-tests-otel-starter/spring-boot-2/build.gradle.kts',
         'smoke-tests-otel-starter/spring-boot-reactive-2/build.gradle.kts',
       ],
       matchPackageNames: [
-        'ch.qos.logback:logback-classic',
-      ],
-      matchUpdateTypes: [
-        'minor',
-      ],
-      enabled: false,
-    },
-    {
-      // intentionally using logback 1.2 in this smoke tests
-      matchFileNames: [
-        'smoke-tests/images/spring-boot/build.gradle.kts',
+        'ch.qos.logback:**',
       ],
       matchUpdateTypes: [
         'major',
         'minor',
       ],
       enabled: false,
-      matchPackageNames: [
-        'ch.qos.logback:**',
-      ],
     },
     {
       // intentionally using slf4j 1 in this smoke tests
@@ -377,11 +361,11 @@
       datasourceTemplate: 'java-version',
       managerFilePatterns: [
         '.github/workflows/**',
-        '**/*.gradle.kts'
+        '**/*.gradle.kts',
       ],
       matchStrings: [
-        '(?<currentValue>\\d+) # renovate: datasource=java-version',
-        '"(?<currentValue>\\d+)" // renovate: datasource=java-version',
+        '(?<currentValue>\\d+) # renovate\\(java-version\\)',
+        '"(?<currentValue>\\d+)" // renovate\\(java-version\\)',
       ],
       depNameTemplate: 'java',
       extractVersionTemplate: '^(?<version>\\d+)',
@@ -390,7 +374,7 @@
       customType: 'regex',
       datasourceTemplate: 'pypi',
       managerFilePatterns: [
-        '/^.github/workflows//',
+        '.github/workflows/**',
       ],
       matchStrings: [
         'pip install (?<depName>[^=]+)==(?<currentValue>[^\\s]+)',
@@ -400,7 +384,7 @@
       customType: 'regex',
       datasourceTemplate: 'npm',
       managerFilePatterns: [
-        '/^.github/workflows//',
+        '.github/workflows/**',
       ],
       matchStrings: [
         'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',

.github/repository-settings.md

@@ -11,8 +11,8 @@ private admin repo.
 - `FLAKY_TEST_REPORTER_ACCESS_KEY` - owned by [@laurit](https://github.com/laurit)
 - `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
 - `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
-- `GRADLE_PUBLISH_KEY`
-- `GRADLE_PUBLISH_SECRET`
+- `GRADLE_PUBLISH_KEY` - owned by [@trask](https://github.com/trask)
+- `GRADLE_PUBLISH_SECRET` - owned by [@trask](https://github.com/trask)
 - `NVD_API_KEY` - stored in OpenTelemetry-Java 1Password
   - Generated at https://nvd.nist.gov/developers/request-an-api-key
   - Key is associated with [@trask](https://github.com/trask)'s gmail address

.github/workflows/build-common.yml

@@ -246,7 +246,7 @@ jobs:
           - 11
           - 17
           - 21
-          - 25 # renovate: datasource=java-version
+          - 25 # renovate(java-version)
           - 25-deny-unsafe
         vm:
           - hotspot

.github/workflows/reusable-pr-smoke-test-images.yml

@@ -30,7 +30,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      LATEST_JAVA_VERSION: 25 # renovate: datasource=java-version
+      LATEST_JAVA_VERSION: 25 # renovate(java-version)
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 

.github/workflows/reusable-publish-smoke-test-images.yml

@@ -33,7 +33,7 @@ jobs:
       contents: read
       packages: write
     env:
-      LATEST_JAVA_VERSION: 25 # renovate: datasource=java-version
+      LATEST_JAVA_VERSION: 25 # renovate(java-version)
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 

benchmark-overhead/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers-postgresql")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
-  testImplementation("com.squareup.okhttp3:okhttp:5.3.0")
+  testImplementation("com.squareup.okhttp3:okhttp:5.3.1")
   testImplementation("org.jooq:joox:2.0.1")
   testImplementation("com.jayway.jsonpath:json-path:2.10.0")
   testImplementation("org.slf4j:slf4j-simple:2.0.17")

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 
 buildscript {
   dependencies {
-    classpath("com.squareup.okhttp3:okhttp:5.3.0")
+    classpath("com.squareup.okhttp3:okhttp:5.3.1")
   }
 }
 

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

@@ -140,6 +140,7 @@ tasks {
           // This check causes too many failures, ignore the ones in tests
           disable("OtelCanIgnoreReturnValueSuggester")
           disable("OtelInternalJavadoc")
+          disable("SuppressWarningsWithoutExplanation")
         }
       }
     }

declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridge.java

@@ -16,6 +16,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.BiFunction;
+import java.util.function.Function;
 import javax.annotation.Nullable;
 
 /**
@@ -106,18 +107,17 @@ public Duration getDuration(String propertyName) {
     return Duration.ofMillis(millis);
   }
 
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings("unchecked") // we expect to have only lists of strings in override values
   @Override
   public List<String> getList(String propertyName) {
     List<String> propertyValue =
         getPropertyValue(
             propertyName,
-            List.class,
+            o -> (List<String>) o,
             (properties, lastPart) -> properties.getScalarList(lastPart, String.class));
     return propertyValue == null ? Collections.emptyList() : propertyValue;
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public Map<String, String> getMap(String propertyName) {
     DeclarativeConfigProperties propertyValue =
@@ -147,7 +147,15 @@ private <T> T getPropertyValue(
       String property,
       Class<T> clazz,
       BiFunction<DeclarativeConfigProperties, String, T> extractor) {
-    T override = clazz.cast(overrideValues.get(property));
+    return getPropertyValue(property, clazz::cast, extractor);
+  }
+
+  @Nullable
+  private <T> T getPropertyValue(
+      String property,
+      Function<Object, T> converter,
+      BiFunction<DeclarativeConfigProperties, String, T> extractor) {
+    T override = converter.apply(overrideValues.get(property));
     if (override != null) {
       return override;
     }

dependencyManagement/build.gradle.kts

@@ -37,7 +37,7 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.1"
-val errorProneVersion = "2.43.0"
+val errorProneVersion = "2.44.0"
 val byteBuddyVersion = "1.18.1"
 val asmVersion = "9.9"
 val jmhVersion = "1.37"
@@ -104,7 +104,7 @@ val DEPENDENCIES = listOf(
   "io.opentelemetry.contrib:opentelemetry-cloudfoundry-resources:${otelContribVersion}",
   "io.opentelemetry.contrib:opentelemetry-baggage-processor:${otelContribVersion}",
   "io.opentelemetry.contrib:opentelemetry-samplers:${otelContribVersion}",
-  "io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha",
+  "io.opentelemetry.proto:opentelemetry-proto:1.9.0-alpha",
   "io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
   "org.assertj:assertj-core:3.27.6",
   "org.awaitility:awaitility:4.3.0",