Merge branch 'open-telemetry:main' into patch-1

Author: anhermon

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

@@ -19,6 +19,9 @@
     },
     {
       "pattern": "^https://micrometer\\.io"
+    },
+    {
+      "pattern": "^https://central\\.sonatype\\.com"
     }
   ]
 }

README.md

@@ -152,6 +152,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
 Triagers ([@open-telemetry/java-instrumentation-triagers](https://github.com/orgs/open-telemetry/teams/java-instrumentation-triagers)):
 
 - [Gregor Zeitlinger](https://github.com/zeitlinger), Grafana Labs
+- [Jean Bisutti](https://github.com/jeanbisutti), Microsoft
 
 Approvers ([@open-telemetry/java-instrumentation-approvers](https://github.com/orgs/open-telemetry/teams/java-instrumentation-approvers)):
 

benchmark-overhead/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
   testImplementation("org.jooq:joox:2.0.0")
   testImplementation("com.jayway.jsonpath:json-path:2.8.0")
-  testImplementation("org.slf4j:slf4j-simple:2.0.9")
+  testImplementation("org.slf4j:slf4j-simple:2.0.11")
 
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }

conventions/build.gradle.kts

@@ -60,7 +60,7 @@ dependencies {
   implementation("com.github.johnrengelman:shadow:8.1.1")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
   implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.16.1")
-  implementation("org.owasp:dependency-check-gradle:9.0.7")
+  implementation("org.owasp:dependency-check-gradle:9.0.8")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.1")
   // When updating, also update dependencyManagement/build.gradle.kts
   implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.14.11")
@@ -73,5 +73,5 @@ dependencies {
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.10.1"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-  testImplementation("org.assertj:assertj-core:3.24.2")
+  testImplementation("org.assertj:assertj-core:3.25.1")
 }

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

@@ -407,7 +407,7 @@ codenarc {
 checkstyle {
   configFile = rootProject.file("buildscripts/checkstyle.xml")
   // this version should match the version of google_checks.xml used as basis for above configuration
-  toolVersion = "10.12.6"
+  toolVersion = "10.12.7"
   maxWarnings = 0
 }
 
@@ -416,6 +416,7 @@ dependencyCheck {
   suppressionFile = "buildscripts/dependency-check-suppressions.xml"
   failBuildOnCVSS = 7.0f // fail on high or critical CVE
   nvd.apiKey = System.getenv("NVD_API_KEY")
+  nvd.delay = 3500 // until next dependency check release (https://github.com/jeremylong/DependencyCheck/pull/6333)
 }
 
 idea {

dependencyManagement/build.gradle.kts

@@ -8,7 +8,7 @@ val dependencyVersions = hashMapOf<String, String>()
 rootProject.extra["versions"] = dependencyVersions
 
 // this line is managed by .github/scripts/update-sdk-version.sh
-val otelSdkVersion = "1.33.0"
+val otelSdkVersion = "1.34.0"
 val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 
 // Need both BOM and groovy jars
@@ -39,12 +39,12 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.10.4"
-val errorProneVersion = "2.23.0"
+val errorProneVersion = "2.24.1"
 val byteBuddyVersion = "1.14.11"
 val asmVersion = "9.6"
 val jmhVersion = "1.37"
 val mockitoVersion = "4.11.0"
-val slf4jVersion = "2.0.9"
+val slf4jVersion = "2.0.11"
 
 val CORE_DEPENDENCIES = listOf(
   "io.opentelemetry.semconv:opentelemetry-semconv:1.21.0-alpha",
@@ -84,7 +84,7 @@ val DEPENDENCIES = listOf(
   "com.github.stefanbirkner:system-lambda:1.2.1",
   "com.github.stefanbirkner:system-rules:1.19.0",
   "uk.org.webcompere:system-stubs-jupiter:2.0.3",
-  "com.uber.nullaway:nullaway:0.10.18",
+  "com.uber.nullaway:nullaway:0.10.19",
   "commons-beanutils:commons-beanutils:1.9.4",
   "commons-cli:commons-cli:1.6.0",
   "commons-codec:commons-codec:1.16.0",
@@ -98,7 +98,7 @@ val DEPENDENCIES = listOf(
   "io.netty:netty:3.10.6.Final",
   "io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.28.0-alpha",
   "io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha",
-  "org.assertj:assertj-core:3.24.2",
+  "org.assertj:assertj-core:3.25.1",
   "org.awaitility:awaitility:4.2.0",
   "com.google.code.findbugs:annotations:3.0.1u2",
   "com.google.code.findbugs:jsr305:3.0.2",

docs/contributing/intellij-setup-and-troubleshooting.md

@@ -31,6 +31,16 @@ on which you are not actively working.
 Specifically, unload all modules, and then selectively load the modules on which you need to work.
 IntelliJ will prompt you to load additional modules on which the selected modules depend.
 
+If you are working on a specific instrumentation, you can load only the modules for that instrumentation.
+For example, to load the modules for the Spring Boot autoconfigure instrumentation, run:
+
+```shell
+./docs/contributing/selectModules.kts instrumentation/spring/spring-boot-autoconfigure/
+```
+
+Install the [Kotlin executable](https://kotlinlang.org/docs/tutorials/command-line.html)
+if you don't have it already.
+
 ## Troubleshooting
 
 Occasionally, Intellij gets confused, maybe due to the number of modules in this project,

docs/contributing/selectModules.kts

@@ -0,0 +1,83 @@
+#!/usr/bin/env kotlin
+
+//install kotlin compiler: https://kotlinlang.org/docs/tutorials/command-line.html
+import java.io.File
+
+val includeRegex = Regex("include\\(\"(.*?)\"\\)")
+val projectRegex = "project\\(\"([^\"]+)\"(, configuration = \".*\")?\\)".toRegex()
+val keepModules = mutableSetOf<Module>()
+var root = ""
+
+main(args)
+
+fun main(args: Array<String>) {
+  if (args.isEmpty()) {
+    println("Usage: ./docs/contributing/selectModules.kts instrumentation/spring/spring-boot-autoconfigure/ <module to include2> ...")
+    return
+  }
+
+  (args.map {
+    moduleOfArg(
+      File(File(it).absolutePath),
+      "/" + it.trimStart('.', '/').trimEnd('/')
+    )
+  } + listOf(":javaagent"))
+    .map { Module(it) }
+    .forEach(Module::addSelfAndChildren)
+
+  File("$root/conventions/src/main/kotlin").listFiles()!!
+    .filter { it.name.endsWith(".kts") }
+    .forEach {
+      children(it).forEach(Module::addSelfAndChildren)
+    }
+
+  println("removing modules except:\n${keepModules.map { it.name }.sorted().joinToString("\n")}")
+
+  val target = File("$root/settings.gradle.kts")
+  val text = target.readText().lines().flatMap { line ->
+    includeRegex.matchEntire(line)?.let { it.groupValues[1] }?.let { module ->
+      if (Module(module) in keepModules) {
+        listOf(line)
+      } else {
+        emptyList()
+      }
+    } ?: listOf(line)
+
+
+  }.joinToString("\n")
+  target.writeText(text)
+}
+
+data class Module(val name: String) {
+  fun children(): List<Module> {
+    val file = moduleFile()
+    return children(file)
+  }
+
+  private fun moduleFile(): File = File("$root/${name.replace(":", "/")}/build.gradle.kts")
+
+  fun addSelfAndChildren() {
+    if (!keepModules.add(this)) {
+      return
+    }
+
+    children().forEach(Module::addSelfAndChildren)
+  }
+}
+
+fun moduleOfArg(file: File, name: String): String {
+  val settings = File(file, "settings.gradle.kts")
+  return if (settings.exists()) {
+    root = file.absolutePath
+    name.substringAfter(root).replace("/", ":")
+  } else {
+    moduleOfArg(file.parentFile, name)
+  }
+}
+
+fun children(file: File) = file.readText().lines().flatMap { line ->
+  projectRegex.find(line)?.let { it.groupValues[1] }?.let { module ->
+    listOf(Module(module))
+  } ?: emptyList()
+}
+