Update to gradle 7.5.1 (#415)

* Update to gradle 7.5.1

* Update to 7.5.1

* Fix

* Fix

dependencyManagement/build.gradle.kts

@@ -1,9 +1,9 @@
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
 plugins {
-    `java-platform`
+  `java-platform`
 
-    id("com.github.ben-manes.versions")
+  id("com.github.ben-manes.versions")
 }
 
 data class DependencySet(val group: String, val version: String, val modules: List<String>)
@@ -15,103 +15,103 @@ rootProject.extra["versions"] = dependencyVersions
 val otelVersion = "1.17.0"
 
 val DEPENDENCY_BOMS = listOf(
-    "com.fasterxml.jackson:jackson-bom:2.13.2.20220328",
-    "com.google.guava:guava-bom:31.0.1-jre",
-    "com.linecorp.armeria:armeria-bom:1.14.0",
-    "org.junit:junit-bom:5.8.2",
-    "com.linecorp.armeria:armeria-bom:1.9.1",
-    "io.grpc:grpc-bom:1.42.1",
-    "io.opentelemetry:opentelemetry-bom:$otelVersion",
-    "io.opentelemetry:opentelemetry-bom-alpha:${otelVersion}-alpha",
-    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelVersion}-alpha",
-    "org.testcontainers:testcontainers-bom:1.16.3"
+  "com.fasterxml.jackson:jackson-bom:2.13.2.20220328",
+  "com.google.guava:guava-bom:31.0.1-jre",
+  "com.linecorp.armeria:armeria-bom:1.14.0",
+  "org.junit:junit-bom:5.8.2",
+  "com.linecorp.armeria:armeria-bom:1.9.1",
+  "io.grpc:grpc-bom:1.42.1",
+  "io.opentelemetry:opentelemetry-bom:$otelVersion",
+  "io.opentelemetry:opentelemetry-bom-alpha:${otelVersion}-alpha",
+  "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelVersion}-alpha",
+  "org.testcontainers:testcontainers-bom:1.16.3"
 )
 
 val DEPENDENCY_SETS = listOf(
-    DependencySet(
-        "com.google.auto.service",
-        "1.0.1",
-        listOf("auto-service", "auto-service-annotations")
-    ),
-    DependencySet(
-        "com.google.auto.value",
-        "1.9",
-        listOf("auto-value", "auto-value-annotations")
-    ),
-    DependencySet(
-        "com.google.errorprone",
-        "2.14.0",
-        listOf("error_prone_annotations", "error_prone_core")
-    ),
-    DependencySet(
-        "io.prometheus",
-        "0.12.0",
-        listOf("simpleclient", "simpleclient_common", "simpleclient_httpserver")
-    ),
-    DependencySet(
-        "org.mockito",
-        "4.3.1",
-        listOf("mockito-core", "mockito-junit-jupiter")
-    ),
-    DependencySet(
-        "org.slf4j",
-        "1.7.36",
-        listOf("slf4j-api", "slf4j-simple", "log4j-over-slf4j", "jcl-over-slf4j", "jul-to-slf4j")
-    )
+  DependencySet(
+    "com.google.auto.service",
+    "1.0.1",
+    listOf("auto-service", "auto-service-annotations")
+  ),
+  DependencySet(
+    "com.google.auto.value",
+    "1.9",
+    listOf("auto-value", "auto-value-annotations")
+  ),
+  DependencySet(
+    "com.google.errorprone",
+    "2.14.0",
+    listOf("error_prone_annotations", "error_prone_core")
+  ),
+  DependencySet(
+    "io.prometheus",
+    "0.12.0",
+    listOf("simpleclient", "simpleclient_common", "simpleclient_httpserver")
+  ),
+  DependencySet(
+    "org.mockito",
+    "4.3.1",
+    listOf("mockito-core", "mockito-junit-jupiter")
+  ),
+  DependencySet(
+    "org.slf4j",
+    "1.7.36",
+    listOf("slf4j-api", "slf4j-simple", "log4j-over-slf4j", "jcl-over-slf4j", "jul-to-slf4j")
+  )
 )
 
 val DEPENDENCIES = listOf(
-    "io.opentelemetry.javaagent:opentelemetry-javaagent:$otelVersion",
-    "com.google.code.findbugs:annotations:3.0.1u2",
-    "com.google.code.findbugs:jsr305:3.0.2",
-    "com.squareup.okhttp3:okhttp:4.9.3",
-    "com.uber.nullaway:nullaway:0.9.5",
-    "org.assertj:assertj-core:3.22.0",
-    "org.awaitility:awaitility:4.1.1",
-    "org.junit-pioneer:junit-pioneer:1.5.0",
-    "org.skyscreamer:jsonassert:1.5.0"
+  "io.opentelemetry.javaagent:opentelemetry-javaagent:$otelVersion",
+  "com.google.code.findbugs:annotations:3.0.1u2",
+  "com.google.code.findbugs:jsr305:3.0.2",
+  "com.squareup.okhttp3:okhttp:4.9.3",
+  "com.uber.nullaway:nullaway:0.9.5",
+  "org.assertj:assertj-core:3.22.0",
+  "org.awaitility:awaitility:4.1.1",
+  "org.junit-pioneer:junit-pioneer:1.7.0",
+  "org.skyscreamer:jsonassert:1.5.0"
 )
 
 javaPlatform {
-    allowDependencies()
+  allowDependencies()
 }
 
 dependencies {
-    for (bom in DEPENDENCY_BOMS) {
-        api(enforcedPlatform(bom))
-        val split = bom.split(':')
-        dependencyVersions[split[0]] = split[2]
+  for (bom in DEPENDENCY_BOMS) {
+    api(enforcedPlatform(bom))
+    val split = bom.split(':')
+    dependencyVersions[split[0]] = split[2]
+  }
+  constraints {
+    for (set in DEPENDENCY_SETS) {
+      for (module in set.modules) {
+        api("${set.group}:${module}:${set.version}")
+        dependencyVersions[set.group] = set.version
+      }
     }
-    constraints {
-        for (set in DEPENDENCY_SETS) {
-            for (module in set.modules) {
-                api("${set.group}:${module}:${set.version}")
-                dependencyVersions[set.group] = set.version
-            }
-        }
-        for (dependency in DEPENDENCIES) {
-            api(dependency)
-            val split = dependency.split(':')
-            dependencyVersions[split[0]] = split[2]
-        }
+    for (dependency in DEPENDENCIES) {
+      api(dependency)
+      val split = dependency.split(':')
+      dependencyVersions[split[0]] = split[2]
     }
+  }
 }
 
 fun isNonStable(version: String): Boolean {
-    val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
-    val regex = "^[0-9,.v-]+(-r)?$".toRegex()
-    val isGuava = version.endsWith("-jre")
-    val isStable = stableKeyword || regex.matches(version) || isGuava
-    return isStable.not()
+  val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
+  val regex = "^[0-9,.v-]+(-r)?$".toRegex()
+  val isGuava = version.endsWith("-jre")
+  val isStable = stableKeyword || regex.matches(version) || isGuava
+  return isStable.not()
 }
 
 tasks {
-    named<DependencyUpdatesTask>("dependencyUpdates") {
-        revision = "release"
-        checkConstraints = true
+  named<DependencyUpdatesTask>("dependencyUpdates") {
+    revision = "release"
+    checkConstraints = true
 
-        rejectVersionIf {
-            isNonStable(candidate.version)
-        }
+    rejectVersionIf {
+      isNonStable(candidate.version)
     }
+  }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

runtime-attach/runtime-attach/build.gradle.kts

@@ -20,15 +20,9 @@ dependencies {
   testImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent")
   testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
-  testImplementation("org.junit-pioneer:junit-pioneer")
   testImplementation("org.assertj:assertj-core")
 }
 
-tasks.test {
-  useJUnitPlatform()
-  setForkEvery(1) // One JVM by test class to avoid a test class launching a runtime attachment influences the behavior of another test class
-}
-
 tasks {
   jar {
     inputs.files(agent)
@@ -37,4 +31,36 @@ tasks {
     })
     rename { "otel-agent.jar" }
   }
+
+  withType<Test>().configureEach {
+    setForkEvery(1) // One JVM by test class to avoid a test class launching a runtime attachment influences the behavior of another test class
+  }
+
+  val testAgentDisabledByEnvironmentVariable by registering(Test::class) {
+    filter {
+      includeTestsMatching("AgentDisabledByEnvironmentVariableTest")
+    }
+    include("**/AgentDisabledByEnvironmentVariableTest.*")
+    environment("OTEL_JAVAAGENT_ENABLED", "false")
+  }
+
+  val testAgentDisabledBySystemProperty by registering(Test::class) {
+    filter {
+      includeTestsMatching("AgentDisabledBySystemPropertyTest")
+    }
+    include("**/AgentDisabledBySystemPropertyTest.*")
+    jvmArgs("-Dotel.javaagent.enabled=false")
+  }
+
+  test {
+    filter {
+      excludeTestsMatching("AgentDisabledByEnvironmentVariableTest")
+      excludeTestsMatching("AgentDisabledBySystemPropertyTest")
+    }
+  }
+
+  check {
+    dependsOn(testAgentDisabledByEnvironmentVariable)
+    dependsOn(testAgentDisabledBySystemProperty)
+  }
 }

runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledByEnvironmentVariableTest.java

@@ -9,12 +9,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.instrumentation.annotations.WithSpan;
 import org.junit.jupiter.api.Test;
-import org.junitpioneer.jupiter.SetEnvironmentVariable;
-import org.junitpioneer.jupiter.SetSystemProperty;
 
-public class AgentDisabledTest extends AbstractAttachmentTest {
+public class AgentDisabledByEnvironmentVariableTest extends AbstractAttachmentTest {
 
-  @SetEnvironmentVariable(key = "OTEL_JAVAAGENT_ENABLED", value = "false")
   @Test
   void shouldNotAttachWhenAgentDisabledWithEnvVariable() {
     RuntimeAttach.attachJavaagentToCurrentJVM();
@@ -25,11 +22,4 @@ public class AgentDisabledTest extends AbstractAttachmentTest {
   void verifyNoAttachment() {
     assertThat(isAttached()).as("Agent should not be attached").isFalse();
   }
-
-  @SetSystemProperty(key = "otel.javaagent.enabled", value = "false")
-  @Test
-  void shouldNotAttachWhenAgentDisabledWithProperty() {
-    RuntimeAttach.attachJavaagentToCurrentJVM();
-    verifyNoAttachment();
-  }
 }

runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledBySystemPropertyTest.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.contrib.attach;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.opentelemetry.instrumentation.annotations.WithSpan;
+import org.junit.jupiter.api.Test;
+
+public class AgentDisabledBySystemPropertyTest extends AbstractAttachmentTest {
+
+  @Test
+  void shouldNotAttachWhenAgentDisabledWithProperty() {
+    RuntimeAttach.attachJavaagentToCurrentJVM();
+    verifyNoAttachment();
+  }
+
+  @WithSpan
+  void verifyNoAttachment() {
+    assertThat(isAttached()).as("Agent should not be attached").isFalse();
+  }
+}