From b758828f03b51eb0c76bc01bab9b280682630538 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Apr 2025 19:25:52 +0000 Subject: [PATCH 1/3] fix(deps): update errorproneversion to v2.38.0 --- dependencyManagement/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 1fdcbe4fe069..400e1bb6f64b 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -38,7 +38,7 @@ val DEPENDENCY_BOMS = listOf( val autoServiceVersion = "1.1.1" val autoValueVersion = "1.11.0" -val errorProneVersion = "2.37.0" +val errorProneVersion = "2.38.0" val byteBuddyVersion = "1.17.5" val asmVersion = "9.8" val jmhVersion = "1.37" From c3130c9e2fa1d4a79a7301f511b11921e1297410 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Sat, 19 Apr 2025 10:02:42 +0300 Subject: [PATCH 2/3] update disabled rules --- .../src/main/kotlin/otel.errorprone-conventions.gradle.kts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts index 781458b094c7..e88b9e98d984 100644 --- a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts @@ -62,7 +62,6 @@ tasks { disable("UnnecessarilyFullyQualified") // TODO (trask) use animal sniffer - disable("Java7ApiChecker") disable("Java8ApiChecker") disable("AndroidJdkLibsChecker") @@ -124,8 +123,8 @@ tasks { disable("NonFinalStaticField") - // We get this warning in modules that compile for old java versions - disable("StringConcatToTextBlock") + // Requires adding compile dependency to JSpecify + disable("AddNullMarkedToPackageInfo") if (testLatestDeps) { // Some latest dep tests are compiled for java 17 although the base version uses an older From 045dccb8f83b0d3b506d82312111b49530026cfe Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Sat, 19 Apr 2025 13:11:06 +0300 Subject: [PATCH 3/3] fix errorprone failures --- .../docs/parsers/GradleParserTest.java | 127 ++++++++++-------- .../spring/batch/v3_0/jsr/TestBatchlet.java | 8 -- .../v3_0/jsr/TestPartitionedItemReader.java | 32 ----- 3 files changed, 68 insertions(+), 99 deletions(-) diff --git a/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/parsers/GradleParserTest.java b/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/parsers/GradleParserTest.java index 4aef9105446e..a3340c062378 100644 --- a/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/parsers/GradleParserTest.java +++ b/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/parsers/GradleParserTest.java @@ -16,13 +16,14 @@ class GradleParserTest { @Test void testExtractMuzzleVersions_SinglePassBlock() { String gradleBuildFileContent = - "muzzle {\n" - + " pass {\n" - + " group.set(\"org.elasticsearch.client\")\n" - + " module.set(\"rest\")\n" - + " versions.set(\"[5.0,6.4)\")\n" - + " }\n" - + "}"; + """ + muzzle { + pass { + group.set("org.elasticsearch.client") + module.set("rest") + versions.set("[5.0,6.4)") + } + }"""; DependencyInfo info = GradleParser.parseGradleFile(gradleBuildFileContent, InstrumentationType.JAVAAGENT); assertThat(info.versions().size()).isEqualTo(1); @@ -33,7 +34,10 @@ void testExtractMuzzleVersions_SinglePassBlock() { @Test void testExtractLibraryVersion() { String gradleBuildFileContent = - "dependencies {\n" + " library(\"org.apache.httpcomponents:httpclient:4.3\")\n" + "}"; + """ + dependencies { + library("org.apache.httpcomponents:httpclient:4.3") + }"""; DependencyInfo info = GradleParser.parseGradleFile(gradleBuildFileContent, InstrumentationType.LIBRARY); assertThat(info.versions().size()).isEqualTo(1); @@ -44,11 +48,12 @@ void testExtractLibraryVersion() { @Test void testExtractLibraryUpperVersion() { String gradleBuildFileContent = - "dependencies {\n" - + " library(\"org.apache.httpcomponents:httpclient:4.3\")\n" - + " testImplementation(project(\":instrumentation:apache-httpclient:apache-httpclient-4.3:testing\"))\n" - + " latestDepTestLibrary(\"org.apache.httpcomponents:httpclient:4.+\") // see apache-httpclient-5.0 module\n" - + "}"; + """ + dependencies { + library("org.apache.httpcomponents:httpclient:4.3") + testImplementation(project(":instrumentation:apache-httpclient:apache-httpclient-4.3:testing")) + latestDepTestLibrary("org.apache.httpcomponents:httpclient:4.+") // see apache-httpclient-5.0 module + }"""; DependencyInfo info = GradleParser.parseGradleFile(gradleBuildFileContent, InstrumentationType.LIBRARY); @@ -122,35 +127,37 @@ void testExtractMinimumJavaVersionIgnoredWithinIfCondition() { @Test void testExtractMuzzleVersions_MultiplePassBlocks() { String gradleBuildFileContent = - "plugins {\n" - + " id(\"otel.javaagent-instrumentation\")\n" - + " id(\"otel.nullaway-conventions\")\n" - + " id(\"otel.scala-conventions\")\n" - + "}\n" - + "\n" - + "val zioVersion = \"2.0.0\"\n" - + "val scalaVersion = \"2.12\"\n" - + "\n" - + "muzzle {\n" - + " pass {\n" - + " group.set(\"dev.zio\")\n" - + " module.set(\"zio_2.12\")\n" - + " versions.set(\"[$zioVersion,)\")\n" - + " assertInverse.set(true)\n" - + " }\n" - + " pass {\n" - + " group.set(\"dev.zio\")\n" - + " module.set(\"zio_2.13\")\n" - + " versions.set(\"[$zioVersion,)\")\n" - + " assertInverse.set(true)\n" - + " }\n" - + " pass {\n" - + " group.set(\"dev.zio\")\n" - + " module.set(\"zio_3\")\n" - + " versions.set(\"[$zioVersion,)\")\n" - + " assertInverse.set(true)\n" - + " }\n" - + "}\n"; + """ + plugins { + id("otel.javaagent-instrumentation") + id("otel.nullaway-conventions") + id("otel.scala-conventions") + } + + val zioVersion = "2.0.0" + val scalaVersion = "2.12" + + muzzle { + pass { + group.set("dev.zio") + module.set("zio_2.12") + versions.set("[$zioVersion,)") + assertInverse.set(true) + } + pass { + group.set("dev.zio") + module.set("zio_2.13") + versions.set("[$zioVersion,)") + assertInverse.set(true) + } + pass { + group.set("dev.zio") + module.set("zio_3") + versions.set("[$zioVersion,)") + assertInverse.set(true) + } + } + """; DependencyInfo info = GradleParser.parseGradleFile(gradleBuildFileContent, InstrumentationType.JAVAAGENT); @@ -162,23 +169,25 @@ void testExtractMuzzleVersions_MultiplePassBlocks() { @Test void testExtractLogbackLibrary() { String gradleBuildFileContent = - "compileOnly(\"ch.qos.logback:logback-classic\") {\n" - + " version {\n" - + " // compiling against newer version than the earliest supported version (1.0.0) to support\n" - + " // features added in 1.3.0\n" - + " strictly(\"1.3.0\")\n" - + " }\n" - + "}\n" - + "compileOnly(\"org.slf4j:slf4j-api\") {\n" - + " version {\n" - + " strictly(\"2.0.0\")\n" - + " }\n" - + "}\n" - + "compileOnly(\"net.logstash.logback:logstash-logback-encoder\") {\n" - + " version {\n" - + " strictly(\"3.0\")\n" - + " }\n" - + "}\n"; + """ + compileOnly("ch.qos.logback:logback-classic") { + version { + // compiling against newer version than the earliest supported version (1.0.0) to support + // features added in 1.3.0 + strictly("1.3.0") + } + } + compileOnly("org.slf4j:slf4j-api") { + version { + strictly("2.0.0") + } + } + compileOnly("net.logstash.logback:logstash-logback-encoder") { + version { + strictly("3.0") + } + } + """; DependencyInfo info = GradleParser.parseGradleFile(gradleBuildFileContent, InstrumentationType.LIBRARY); diff --git a/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestBatchlet.java b/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestBatchlet.java index 813b0bbcf8d0..5cf23df57d69 100644 --- a/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestBatchlet.java +++ b/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestBatchlet.java @@ -25,12 +25,4 @@ public String process() { @Override public void stop() {} - - public String getFail() { - return fail; - } - - public void setFail(String fail) { - this.fail = fail; - } } diff --git a/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestPartitionedItemReader.java b/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestPartitionedItemReader.java index d3b0820e2f48..68ac2aeb4689 100644 --- a/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestPartitionedItemReader.java +++ b/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestPartitionedItemReader.java @@ -45,36 +45,4 @@ public Object readItem() { public Serializable checkpointInfo() { return null; } - - public String getStartStr() { - return startStr; - } - - public void setStartStr(String startStr) { - this.startStr = startStr; - } - - public String getEndStr() { - return endStr; - } - - public void setEndStr(String endStr) { - this.endStr = endStr; - } - - public int getStart() { - return start; - } - - public void setStart(int start) { - this.start = start; - } - - public int getEnd() { - return end; - } - - public void setEnd(int end) { - this.end = end; - } }