Sync with upstream gradle files

Author: trask

agent/instrumentation/azure-functions/build.gradle.kts

@@ -12,8 +12,10 @@ muzzle {
 val otelInstrumentationAlphaVersion: String by project
 
 dependencies {
+  compileOnly(project(":agent:agent-bootstrap"))
   compileOnly(project(":agent:instrumentation:azure-functions-worker-stub"))
 
+  testImplementation(project(":agent:agent-bootstrap"))
   testImplementation(project(":agent:instrumentation:azure-functions-worker-stub"))
 
   // TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin

agent/instrumentation/micrometer-1.0/build.gradle.kts

@@ -23,10 +23,12 @@ muzzle {
 val otelInstrumentationAlphaVersion: String by project
 
 dependencies {
+  compileOnly(project(":agent:agent-bootstrap"))
   compileOnly("io.micrometer:micrometer-core:1.0.0")
   compileOnly("org.springframework.boot:spring-boot-actuator-autoconfigure:2.2.0.RELEASE")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:$otelInstrumentationAlphaVersion")
 
+  testImplementation(project(":agent:agent-bootstrap"))
   testImplementation("com.microsoft.azure:azure-spring-boot-metrics-starter:2.2.3") {
     exclude("io.micrometer", "micrometer-core")
   }

buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts

@@ -1,70 +1,5 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 plugins {
-  id("ai.java-conventions")
-  id("ai.shadow-conventions")
-
-  id("io.opentelemetry.instrumentation.muzzle-generation")
-  id("io.opentelemetry.instrumentation.muzzle-check")
-}
-
-val otelInstrumentationAlphaVersion: String by project
-
-val testInstrumentation by configurations.creating
-
-dependencies {
-  compileOnly("io.opentelemetry:opentelemetry-sdk")
-  compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
-  compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
-  compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
-  compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator")
-  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion")
-  annotationProcessor("com.google.auto.service:auto-service")
-  compileOnly("com.google.auto.service:auto-service")
-  compileOnly(project(":agent:agent-bootstrap"))
-
-  testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common:$otelInstrumentationAlphaVersion")
-  // the bootstrap module is provided by the javaagent in the instrumentation test runtime, no need to include it
-  // (especially when it's not being shaded)
-  testCompileOnly(project(":agent:agent-bootstrap"))
-}
-
-tasks.named<ShadowJar>("shadowJar").configure {
-  configurations = listOf(project.configurations.runtimeClasspath.get(), testInstrumentation)
-
-  archiveFileName.set("agent-testing.jar")
-}
-
-evaluationDependsOn(":agent:agent-for-testing")
-
-tasks.withType<Test>().configureEach {
-  val shadowJar = tasks.shadowJar.get()
-  val agentShadowJar = project(":agent:agent-for-testing").tasks.shadowJar.get()
-
-  inputs.file(shadowJar.archiveFile)
-
-  dependsOn(shadowJar)
-  dependsOn(agentShadowJar)
-
-  jvmArgs("-Dotel.javaagent.debug=true")
-  jvmArgs("-javaagent:${agentShadowJar.archiveFile.get().asFile.absolutePath}")
-  jvmArgs("-Dotel.javaagent.experimental.initializer.jar=${shadowJar.archiveFile.get().asFile.absolutePath}")
-  jvmArgs("-Dotel.javaagent.testing.additional-library-ignores.enabled=false")
-  jvmArgs("-Dotel.javaagent.testing.fail-on-context-leak=true")
-  // prevent sporadic gradle deadlocks, see SafeLogger for more details
-  jvmArgs("-Dotel.javaagent.testing.transform-safe-logging.enabled=true")
-  // Reduce noise in assertion messages since we don't need to verify this in most tests. We check
-  // in smoke tests instead.
-  jvmArgs("-Dotel.javaagent.add-thread-details=false")
-  // needed for proper GlobalMeterProvider registration
-  jvmArgs("-Dotel.metrics.exporter=otlp")
+  id("ai.javaagent-testing")
 
-  // The sources are packaged into the testing jar so we need to make sure to exclude from the test
-  // classpath, which automatically inherits them, to ensure our shaded versions are used.
-  classpath = classpath.filter {
-    if (file("$buildDir/resources/main") == it || file("$buildDir/classes/java/main") == it) {
-      return@filter false
-    }
-    return@filter true
-  }
+  id("io.opentelemetry.instrumentation.javaagent-instrumentation")
 }

buildSrc/src/main/kotlin/ai.javaagent-testing.gradle.kts

@@ -0,0 +1,23 @@
+// mostly copied from otel.javaagent-testing.gradle.kts
+
+plugins {
+  id("io.opentelemetry.instrumentation.javaagent-testing")
+
+  id("ai.java-conventions")
+}
+
+evaluationDependsOn(":agent:agent-for-testing")
+
+dependencies {
+  annotationProcessor("com.google.auto.service:auto-service")
+  compileOnly("com.google.auto.service:auto-service")
+
+  testImplementation("org.testcontainers:testcontainers")
+}
+
+configurations.configureEach {
+  if (name.endsWith("testruntimeclasspath", ignoreCase = true)) {
+    // Added by agent, don't let Gradle bring it in when running tests.
+    exclude(module = "javaagent-bootstrap")
+  }
+}

buildSrc/src/main/kotlin/io.opentelemetry.instrumentation.base.gradle.kts

@@ -1,3 +1,5 @@
+// mostly copied from upstream
+
 /** Common setup for manual instrumentation of libraries and javaagent instrumentation. */
 
 plugins {

dependencyManagement/build.gradle.kts

@@ -69,6 +69,7 @@ val DEPENDENCIES = listOf(
   "io.opentelemetry.contrib:opentelemetry-jfr-connection:${otelContribVersion}-alpha",
   "io.opentelemetry.contrib:opentelemetry-runtime-attach-core:${otelContribVersion}-alpha",
   "com.google.code.findbugs:jsr305:3.0.2",
+  "com.google.code.findbugs:annotations:3.0.1",
   "com.github.spotbugs:spotbugs-annotations:4.9.3"
 )