cleanup

Author: jaydeluca

buildSrc/src/main/kotlin/io/opentelemetry/gradle/WeaverTasks.kt

@@ -60,7 +60,6 @@ abstract class WeaverTasks @Inject constructor(
 
   @TaskAction
   fun runWeaver() {
-    // Validate Docker is available
     validateDockerAvailable()
 
     val mounts = mutableListOf(

buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts

@@ -30,13 +30,11 @@ val latestReleasedVersion: String by lazy {
 
 class AllowNewAbstractMethodOnAutovalueClasses : AbstractRecordingSeenMembers() {
   override fun maybeAddViolation(member: JApiCompatibility): Violation? {
-    val allowableAutovalueChanges = setOf(
-      JApiCompatibilityChangeType.METHOD_ABSTRACT_ADDED_TO_CLASS,
-      JApiCompatibilityChangeType.METHOD_ADDED_TO_PUBLIC_CLASS,
-      JApiCompatibilityChangeType.ANNOTATION_ADDED
-    )
+    val allowableAutovalueChanges = setOf(JApiCompatibilityChangeType.METHOD_ABSTRACT_ADDED_TO_CLASS,
+      JApiCompatibilityChangeType.METHOD_ADDED_TO_PUBLIC_CLASS, JApiCompatibilityChangeType.ANNOTATION_ADDED)
     if (member.compatibilityChanges.filter { !allowableAutovalueChanges.contains(it.type) }.isEmpty() &&
-      member is JApiMethod && isAutoValueClass(member.getjApiClass())) {
+      member is JApiMethod && isAutoValueClass(member.getjApiClass()))
+    {
       return Violation.accept(member, "Autovalue will automatically add implementation")
     }
     if (member.compatibilityChanges.isEmpty() &&
@@ -46,8 +44,10 @@ class AllowNewAbstractMethodOnAutovalueClasses : AbstractRecordingSeenMembers()
     return null
   }
 
-  fun isAutoValueClass(japiClass: JApiClass): Boolean = japiClass.newClass.get().getAnnotation(AutoValue::class.java) != null ||
-    japiClass.newClass.get().getAnnotation(AutoValue.Builder::class.java) != null
+  fun isAutoValueClass(japiClass: JApiClass): Boolean {
+    return japiClass.newClass.get().getAnnotation(AutoValue::class.java) != null ||
+        japiClass.newClass.get().getAnnotation(AutoValue.Builder::class.java) != null
+  }
 }
 
 class SourceIncompatibleRule : AbstractRecordingSeenMembers() {

buildSrc/src/main/kotlin/otel.weaver-conventions.gradle.kts

@@ -137,7 +137,7 @@ if (hasWeaverModel) {
     }
   }
 
-  // Make spotless tasks depend on weaver generation
+  // Make spotless tasks always run after the generate task
   tasks
     .matching {
       it.name == "spotlessJava" || it.name == "spotlessJavaApply" || it.name == "spotlessApply"

docs/weaver.md

@@ -86,7 +86,6 @@ Generates Java code, markdown documentation, and YAML configuration.
 
 - Outputs to `src/main/java/{configured-package}/`
 - **Automatically formats** generated code with `spotlessJavaApply`
-- Runs before `compileJava` task
 
 ### Generate Documentation
 

samplers/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
 
 description = "Sampler which makes its decision based on semantic attributes values"
 otelJava.moduleName.set("io.opentelemetry.contrib.sampler")
+
 dependencies {
   api("io.opentelemetry:opentelemetry-sdk")