Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmark-overhead/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("java")
id("com.diffplug.spotless") version "7.2.1"
id("com.diffplug.spotless") version "8.0.0"
}

spotless {
Expand Down
4 changes: 2 additions & 2 deletions conventions/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -30,7 +30,7 @@ public static class Two {}
""");
doTest(
"internal/InternalJavadocNegativeCases.java",
"""
"""
package io.opentelemetry.javaagent.customchecks.internal;

/**
Expand Down
2 changes: 1 addition & 1 deletion examples/distro/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/extension/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -116,7 +116,7 @@ void testParseDocumentationDisabledList() {
@Test
void testParseInstrumentationList() {
String testList =
"""
"""
libraries:
activej:
- name: activej-http-6.0
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -240,7 +242,8 @@ private static String createDisableListContentMissing() {
}

private static String createInstrumentationListContent() {
return """
return
"""
libraries:
activej:
- name: activej-http-6.0
Expand Down