Merge remote-tracking branch 'upstream/main' into executor

.github/renovate.json5

@@ -0,0 +1,122 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ],
+  "ignorePaths": ["instrumentation/**"],
+  "packageRules": [
+    {
+      "matchPackagePrefixes": ["ch.qos.logback:"],
+      "groupName": "logback packages"
+    },
+    {
+      "matchPackagePrefixes": ["com.google.guava:"],
+      "groupName": "guava packages"
+    },
+    {
+      "matchPackagePrefixes": ["com.gradle.enterprise"],
+      "groupName": "gradle enterprise packages"
+    },
+    {
+      "matchPackagePrefixes": ["org.eclipse.jetty:"],
+      "groupName": "jetty packages"
+    },
+    {
+      // OpenTelemetry SDK updates are handled by auto-update-otel-sdk.yml
+      "matchPackagePrefixes": ["io.opentelemetry:"],
+      "enabled": false
+    },
+    {
+      // junit-pioneer 2+ requires Java 11+
+      "matchPackageNames": ["org.junit-pioneer:junit-pioneer"],
+      "matchUpdateTypes": ["major"],
+      "enabled": false
+    },
+    {
+      // mockito 5+ requires Java 11+
+      "matchPackagePrefixes": ["org.mockito:"],
+      "matchUpdateTypes": ["major"],
+      "enabled": false
+    },
+    {
+      // intentionally using Spring Boot 2 in this smoke tests
+      "matchFileNames": ["smoke-tests/images/spring-boot/build.gradle.kts"],
+      "matchPackageNames": ["org.springframework.boot", "org.springframework.boot:spring-boot-dependencies"],
+      "matchUpdateTypes": ["major"],
+      "enabled": false,
+    },
+    {
+      // intentionally using logback 1.2 in this smoke tests
+      "matchFileNames": ["smoke-tests/images/spring-boot/build.gradle.kts"],
+      "matchPackagePrefixes": ["ch.qos.logback:"],
+      "matchUpdateTypes": ["major", "minor"],
+      "enabled": false
+    },
+    {
+      // intentionally using slf4j 1 in this smoke tests
+      "matchFileNames": ["smoke-tests/images/spring-boot/build.gradle.kts"],
+      "matchPackagePrefixes": ["org.slf4j:"],
+      "matchUpdateTypes": ["major"],
+      "enabled": false
+    },
+    {
+      // intentionally aligning both netty 4.0 and 4.1 version in this convention
+      "matchFileNames": ["conventions/src/main/kotlin/otel.java-conventions.gradle.kts"],
+      "matchPackageNames": ["io.netty:netty-bom"],
+      "matchUpdateTypes": ["major", "minor"],
+      "enabled": false
+    },
+    {
+      // intentionally using scala 2.11 in otel.scala-conventions.gradle.kts
+      "matchFileNames": ["conventions/src/main/kotlin/otel.scala-conventions.gradle.kts"],
+      "matchPackagePrefixes": ["org.scala-lang:scala-library"],
+      "matchUpdateTypes": ["major", "minor"],
+      "enabled": false
+    },
+    {
+      // intentionally using Java 11 in some examples
+      // not using matchUpdateTypes "major", because renovate wants to bump "11-jre" to "11.0.19_7-jre"
+      "matchPackageNames": ["eclipse-temurin"],
+      "enabled": false
+    },
+    {
+      // using old version of this obscure artifact to test instrumentation of Java 1.1 bytecode
+      "matchPackageNames": ["net.sf.jt400:jt400"],
+      "matchCurrentVersion": "6.1",
+      "enabled": false
+    },
+    {
+      // pinned version for compatibility
+      "matchPackageNames": ["javax.servlet:javax.servlet-api"],
+      "matchCurrentVersion": "3.0.1",
+      "enabled": false
+    },
+    {
+      // pinned version for compatibility
+      "matchPackageNames": ["jakarta.servlet:jakarta.servlet-api"],
+      "matchCurrentVersion": "5.0.0",
+      "enabled": false
+    },
+    {
+      // intentionally using logback 1.3 in dependency management (for Java 8 support)
+      "matchFileNames": ["dependencyManagement/build.gradle.kts"],
+      "matchPackagePrefixes": ["ch.qos.logback:"],
+      "matchUpdateTypes": ["major", "minor"],
+      "enabled": false
+    },
+    {
+      // intentionally using Spring Boot 2 in dependency management (for Java 8 support)
+      "matchFileNames": ["dependencyManagement/build.gradle.kts"],
+      "matchPackagePrefixes": ["org.springframework.boot:spring-boot-dependencies"],
+      "matchUpdateTypes": ["major"],
+      "enabled": false
+    },
+    {
+      // pinned version to Jetty 8 (Servlet 3.0) for compatibility
+      "matchFileNames": ["examples/distro/instrumentation/servlet-3/build.gradle"],
+      "matchPackagePrefixes": ["org.eclipse.jetty:"],
+      "matchUpdateTypes": ["major"],
+      "enabled": false
+    }
+  ]
+}

.github/repository-settings.md

@@ -35,7 +35,7 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf
 
 Same settings as above for [`main`](#main).
 
-### `opentelemetrybot/**/**` and `gradlew-update-*`
+### `renovate/**/**`, `opentelemetrybot/**/**`, and `gradlew-update-*`
 
 Same settings as
 for [`dependabot/**/**`](https://github.com/open-telemetry/community/blob/main/docs/how-to-configure-new-repository.md#branch-protection-rule-dependabot)

.github/scripts/draft-change-log-entries.sh

@@ -45,7 +45,7 @@ echo
 
 git log --reverse \
         --perl-regexp \
-        --author='^(?!dependabot\[bot\] )' \
+        --author='^(?!renovate\[bot\] )' \
         --pretty=format:"- %s" \
         "$range" \
   | sed -E 's,\(#([0-9]+)\)$,\n  ([#\1](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/\1)),'

.github/scripts/generate-release-contributors.sh

@@ -78,11 +78,13 @@ query($q: String!, $endCursor: String) {
   | sed 's/^\["//' \
   | sed 's/".*//')
 
+# TODO (trask) can remove dependabot line after next release
 echo "$contributors1" "$contributors2" \
   | sed 's/ /\n/g' \
   | sort -uf \
   | grep -v linux-foundation-easycla \
   | grep -v github-actions \
   | grep -v dependabot \
+  | grep -v renovate \
   | grep -v opentelemetrybot \
   | sed 's/^/@/'

.github/scripts/markdown-link-check-config.json

@@ -6,10 +6,10 @@
   ],
   "ignorePatterns": [
     {
-      "pattern": "https://github.com/open-telemetry/opentelemetry-java-instrumentation/network/updates"
+      "pattern": "^https://developer\\.mend\\.io/github/open-telemetry/opentelemetry-java-instrumentation$"
     },
     {
-      "pattern": "^https://github.com/open-telemetry/opentelemetry-java-contrib/pulls/app%2Fdependabot$"
+      "pattern": "^https://github.com/open-telemetry/opentelemetry-java-contrib/pulls/app%2Frenovate"
     },
     {
       "pattern": "^https://kotlinlang\\.org/docs/coroutines-overview\\.html$"

RELEASING.md

@@ -19,10 +19,10 @@ the second Monday of the month (roughly a few of days after the monthly minor re
 ## Preparing a new major or minor release
 
 - Check that
-  [dependabot has run](https://github.com/open-telemetry/opentelemetry-java-instrumentation/network/updates)
+  [renovate has run](https://developer.mend.io/github/open-telemetry/opentelemetry-java-instrumentation)
   sometime in the past day (this link is only accessible if you have write access to the
   repository), and check that all
-  [dependabot PRs](https://github.com/open-telemetry/opentelemetry-java-contrib/pulls/app%2Fdependabot)
+  [renovate PRs](https://github.com/open-telemetry/opentelemetry-java-contrib/pulls/app%2Frenovate)
   have been merged.
 - Close the [release milestone](https://github.com/open-telemetry/opentelemetry-java-instrumentation/milestones)
   if there is one.

buildscripts/checkstyle.xml

@@ -335,7 +335,7 @@
         value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
     </module>
     <module name="JavadocMethod">
-      <property name="scope" value="public"/>
+      <property name="accessModifiers" value="public"/>
       <property name="allowMissingParamTags" value="true"/>
       <property name="allowMissingReturnTag" value="true"/>
       <property name="allowedAnnotations" value="Override, Test"/>

conventions/build.gradle.kts

@@ -55,7 +55,7 @@ dependencies {
 
   // When updating, update above in plugins too
   implementation("com.diffplug.spotless:spotless-plugin-gradle:6.20.0")
-  implementation("com.google.guava:guava:32.1.1-jre")
+  implementation("com.google.guava:guava:32.1.2-jre")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
   implementation("com.github.johnrengelman:shadow:8.1.1")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
@@ -68,7 +68,7 @@ dependencies {
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.1")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.1.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.6.0")
-  implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.1")
+  implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.2")
 
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.10.0"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")

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

@@ -115,6 +115,8 @@ tasks {
         // lots of low level APIs use arrays
         disable("AvoidObjectArrays")
 
+        disable("BanClassLoader")
+
         // YodaConditions may improve safety in some cases. The argument of increased
         // cognitive load is dubious.
         disable("YodaCondition")

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

@@ -3,7 +3,7 @@ plugins {
 }
 
 jacoco {
-  toolVersion = "0.8.8"
+  toolVersion = "0.8.10"
 }
 
 tasks {