From ab87535b3368f40f4c0cf9e475aafa24aad973f0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Sep 2025 21:26:35 +0000 Subject: [PATCH 1/2] fix(deps): update spotless packages to v8 --- benchmark-overhead/build.gradle.kts | 2 +- conventions/build.gradle.kts | 4 ++-- examples/distro/build.gradle | 2 +- examples/extension/build.gradle | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/benchmark-overhead/build.gradle.kts b/benchmark-overhead/build.gradle.kts index cc80fd9d225a..923c7949b439 100644 --- a/benchmark-overhead/build.gradle.kts +++ b/benchmark-overhead/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("java") - id("com.diffplug.spotless") version "7.2.1" + id("com.diffplug.spotless") version "8.0.0" } spotless { diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts index d3423a89ea2d..a11708e230f2 100644 --- a/conventions/build.gradle.kts +++ b/conventions/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `kotlin-dsl` // When updating, update below in dependencies too - id("com.diffplug.spotless") version "7.2.1" + id("com.diffplug.spotless") version "8.0.0" } spotless { @@ -54,7 +54,7 @@ dependencies { implementation("org.apache.maven:maven-aether-provider:3.3.9") // When updating, update above in plugins too - implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1") + implementation("com.diffplug.spotless:spotless-plugin-gradle:8.0.0") implementation("com.google.guava:guava:33.5.0-jre") implementation("com.gradleup.shadow:shadow-gradle-plugin:9.2.1") implementation("org.apache.httpcomponents:httpclient:4.5.14") diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index 92c4cffa0fa2..65a26926ec1e 100644 --- a/examples/distro/build.gradle +++ b/examples/distro/build.gradle @@ -12,7 +12,7 @@ buildscript { } } dependencies { - classpath "com.diffplug.spotless:spotless-plugin-gradle:7.2.1" + classpath "com.diffplug.spotless:spotless-plugin-gradle:8.0.0" classpath "com.gradleup.shadow:shadow-gradle-plugin:9.2.1" classpath "io.opentelemetry.instrumentation:gradle-plugins:2.21.0-alpha-SNAPSHOT" } diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index 05c120e5e4e1..5facbfa6000a 100644 --- a/examples/extension/build.gradle +++ b/examples/extension/build.gradle @@ -11,7 +11,7 @@ plugins { See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin. */ id "com.gradleup.shadow" version "9.2.1" - id "com.diffplug.spotless" version "7.2.1" + id "com.diffplug.spotless" version "8.0.0" id "io.opentelemetry.instrumentation.muzzle-generation" version "2.21.0-alpha-SNAPSHOT" id "io.opentelemetry.instrumentation.muzzle-check" version "2.21.0-alpha-SNAPSHOT" From d54cf8a05dfa4dc71b7aedfad3409fa7032cdbb4 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Wed, 24 Sep 2025 21:35:32 +0000 Subject: [PATCH 2/2] ./gradlew spotlessApply --- .../customchecks/OtelInternalJavadocTest.java | 4 ++-- .../auditors/SupportedLibrariesAuditorTest.java | 9 ++++++--- .../docs/auditors/SuppressionListAuditorTest.java | 13 ++++++++----- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/custom-checks/src/test/java/io/opentelemetry/javaagent/customchecks/OtelInternalJavadocTest.java b/custom-checks/src/test/java/io/opentelemetry/javaagent/customchecks/OtelInternalJavadocTest.java index 5db736b584fd..7b2144bb3d9f 100644 --- a/custom-checks/src/test/java/io/opentelemetry/javaagent/customchecks/OtelInternalJavadocTest.java +++ b/custom-checks/src/test/java/io/opentelemetry/javaagent/customchecks/OtelInternalJavadocTest.java @@ -14,7 +14,7 @@ class OtelInternalJavadocTest { void test() { doTest( "internal/InternalJavadocPositiveCases.java", - """ +""" package io.opentelemetry.javaagent.customchecks.internal; // BUG: Diagnostic contains: doesn't end with any of the applicable javadoc disclaimers @@ -30,7 +30,7 @@ public static class Two {} """); doTest( "internal/InternalJavadocNegativeCases.java", - """ +""" package io.opentelemetry.javaagent.customchecks.internal; /** diff --git a/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/auditors/SupportedLibrariesAuditorTest.java b/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/auditors/SupportedLibrariesAuditorTest.java index d344b39b5e96..d9800ced64d9 100644 --- a/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/auditors/SupportedLibrariesAuditorTest.java +++ b/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/auditors/SupportedLibrariesAuditorTest.java @@ -73,7 +73,8 @@ void testPerformAuditWithMissingItems() throws IOException, InterruptedException } private static String createLocalSupportedLibrariesContent() { - return """ + return +""" # Supported libraries, frameworks, application servers, and JVMs We automatically instrument and support a huge number of libraries, frameworks, @@ -105,7 +106,8 @@ private static String createLocalSupportedLibrariesContent() { } private static String createRemoteSupportedLibrariesContent() { - return """ + return +""" # Supported libraries, frameworks, application servers, and JVMs We automatically instrument and support a huge number of libraries, frameworks, @@ -137,7 +139,8 @@ private static String createRemoteSupportedLibrariesContent() { } private static String createRemoteSupportedLibrariesContentMissing() { - return """ + return +""" # Supported libraries, frameworks, application servers, and JVMs We automatically instrument and support a huge number of libraries, frameworks, diff --git a/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/auditors/SuppressionListAuditorTest.java b/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/auditors/SuppressionListAuditorTest.java index cc73bc6d2584..1f8c999d352f 100644 --- a/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/auditors/SuppressionListAuditorTest.java +++ b/instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/auditors/SuppressionListAuditorTest.java @@ -81,7 +81,7 @@ void testGetAuditorName() { @Test void testParseDocumentationDisabledList() { String testFile = - """ +""" ## Enable manual instrumentation only You can suppress all auto instrumentations but have support for manual @@ -116,7 +116,7 @@ void testParseDocumentationDisabledList() { @Test void testParseInstrumentationList() { String testList = - """ +""" libraries: activej: - name: activej-http-6.0 @@ -191,7 +191,8 @@ void testIdentifyMissingItemsWithHyphenatedMatch() { } private static String createDisableListContent() { - return """ + return +""" ## Enable manual instrumentation only You can suppress all auto instrumentations but have support for manual @@ -216,7 +217,8 @@ private static String createDisableListContent() { } private static String createDisableListContentMissing() { - return """ + return +""" ## Enable manual instrumentation only You can suppress all auto instrumentations but have support for manual @@ -240,7 +242,8 @@ private static String createDisableListContentMissing() { } private static String createInstrumentationListContent() { - return """ + return +""" libraries: activej: - name: activej-http-6.0