Update spotless

benchmark-overhead/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   id("java")
-  id("com.diffplug.spotless") version "6.1.2"
+  id("com.diffplug.spotless") version "6.7.2"
 }
 
 spotless {

conventions/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
   `kotlin-dsl`
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "6.4.2"
+  id("com.diffplug.spotless") version "6.7.2"
 }
 
 spotless {
@@ -39,7 +39,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:6.4.2")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.7.2")
   implementation("com.google.guava:guava:31.1-jre")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
   implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")

conventions/src/main/kotlin/otel.spotless-conventions.gradle.kts

@@ -25,12 +25,14 @@ spotless {
   }
   plugins.withId("org.jetbrains.kotlin.jvm") {
     kotlin {
-      ktlint().userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports"))
+      ktlint().userData(mapOf("continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports"))
+        .editorConfigOverride(mapOf("indent_size" to "2")) // not sure why it's not using the setting from .editorconfig
       licenseHeaderFile(rootProject.file("buildscripts/spotless.license.java"), "(package|import|class|// Includes work from:)")
     }
   }
   kotlinGradle {
-    ktlint().userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports"))
+    ktlint().userData(mapOf("continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports"))
+      .editorConfigOverride(mapOf("indent_size" to "2")) // not sure why it's not using the setting from .editorconfig
   }
   format("misc") {
     // not using "**/..." to help keep spotless fast

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/weaklockfree/AbstractWeakConcurrentMap.java

@@ -57,7 +57,9 @@ protected AbstractWeakConcurrentMap() {
     this(new ConcurrentHashMap<>());
   }
 
-  /** @param target ConcurrentMap implementation that this class wraps. */
+  /**
+   * @param target ConcurrentMap implementation that this class wraps.
+   */
   protected AbstractWeakConcurrentMap(ConcurrentMap<WeakKey<K>, V> target) {
     this.target = target;
   }

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/weaklockfree/WeakConcurrentMap.java

@@ -74,7 +74,9 @@ protected LookupKey<?> initialValue() {
 
   private final boolean reuseKeys;
 
-  /** @param cleanerThread {@code true} if a thread should be started that removes stale entries. */
+  /**
+   * @param cleanerThread {@code true} if a thread should be started that removes stale entries.
+   */
   public WeakConcurrentMap(boolean cleanerThread) {
     this(cleanerThread, isPersistentClassLoader(LookupKey.class.getClassLoader()));
   }
@@ -152,7 +154,9 @@ protected void resetLookupKey(LookupKey<K> lookupKey) {
     lookupKey.reset();
   }
 
-  /** @return The cleaner thread or {@code null} if no such thread was set. */
+  /**
+   * @return The cleaner thread or {@code null} if no such thread was set.
+   */
   public Thread getCleanerThread() {
     return thread;
   }