chore: migrate from flint v1 (super-linter) to flint v2 binary

.editorconfig

@@ -1,7 +1,49 @@
 root = true
 
+[*]
+max_line_length = 100
+indent_size = 2
+
+[*.md]
+max_line_length = 200
+
+[*.yml]
+max_line_length = 200
+
+[*.yaml]
+max_line_length = 200
+
+[*.json]
+max_line_length = 120
+
+[*.json5]
+max_line_length = 120
+
+[Dockerfile*]
+max_line_length = 200
+
+[{*.gradle,build.gradle,settings.gradle}]
+max_line_length = 150
+
+[*.xml]
+max_line_length = 200
+
 [build.gradle]
 indent_size = 2
 
 [*.java]
+max_line_length = 230
 indent_size = 2
+
+# ktlint overrides
+[{*.kt,*.kts}]
+max_line_length = 160
+continuation_indent_size = 2
+ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_package-name = disabled
+ktlint_standard_max-line-length = disabled
+ktlint_standard_trailing-comma-on-call-site = disabled
+ktlint_standard_trailing-comma-on-declaration-site = disabled
+ktlint_standard_wrapping = disabled
+ktlint_standard_property-naming = disabled
+ktlint_standard_function-literal = disabled

.github/config/flint.toml

@@ -0,0 +1,17 @@
+[settings]
+exclude = [
+  "CHANGELOG.md",
+  "gradlew",
+]
+
+[checks.license-header]
+text = """
+/*
+ * Copyright Grafana Labs
+ * SPDX-License-Identifier: Apache-2.0
+ */
+"""
+patterns = ["**/*.java", "**/*.kt"]
+
+[checks.renovate-deps]
+exclude_managers = ["github-actions", "github-runners"]

.github/renovate-tracked-deps.json

@@ -33,7 +33,6 @@
   },
   "build.gradle": {
     "gradle": [
-      "com.diffplug.spotless:spotless-plugin-gradle",
       "com.google.auto.service:auto-service",
       "com.google.auto.service:auto-service-annotations",
       "com.gradleup.shadow:shadow-gradle-plugin",
@@ -66,15 +65,23 @@
   },
   "mise.toml": {
     "mise": [
+      "actionlint",
+      "cargo:xmloxide",
+      "editorconfig-checker",
+      "github:google/google-java-format",
+      "github:grafana/flint",
+      "github:pinterest/ktlint",
+      "hadolint",
       "java",
       "lychee",
       "node",
+      "npm:@biomejs/biome",
+      "npm:markdownlint-cli2",
+      "npm:prettier",
       "npm:renovate",
-      "ubi:google/google-java-format"
-    ],
-    "regex": [
-      "ghcr.io/super-linter/super-linter",
-      "grafana/flint"
+      "pipx:codespell",
+      "shellcheck",
+      "shfmt"
     ]
   },
   "scripts/otel_operator/Dockerfile": {

.github/renovate.json5

@@ -3,7 +3,7 @@
   extends: [
     "config:best-practices",
     "config:recommended",
-    "github>grafana/flint",
+    "github>grafana/flint#v0.20.3",
   ],
   platformCommit: "enabled",
   automerge: true,

AGENTS.md

@@ -1,58 +1,88 @@
 # AGENTS.md
 
-This file provides guidance to AI coding agents when working with code in this repository.
+This file provides guidance to AI coding agents when working
+with code in this repository.
 
 ## What This Is
 
-A javaagent distribution of the [OpenTelemetry Java instrumentation agent](https://github.com/open-telemetry/opentelemetry-java-instrumentation), optimized for Grafana Cloud Application Observability. It wraps the upstream agent and adds Grafana-specific extensions (tested instrumentation filtering, metric filtering, resource attribute truncation, default config).
+A javaagent distribution of the
+[OpenTelemetry Java instrumentation
+agent](https://github.com/open-telemetry/opentelemetry-java-instrumentation),
+optimized for Grafana Cloud Application Observability. It
+wraps the upstream agent and adds Grafana-specific
+extensions (tested instrumentation filtering, metric
+filtering, resource attribute truncation, default config).
 
 ## Build Commands
 
 ```sh
 ./gradlew build                    # full build (compiles, tests, assembles agent JAR)
-./gradlew spotlessApply            # auto-format Java (Google Java Format) and misc files
+mise run lint:fix                  # auto-fix Java/Markdown/YAML/shell lint issues via flint
 ./gradlew :custom:test             # run unit tests only
 ./gradlew :custom:test --tests '*MetricFilterTest'  # run a single test class
 SMOKE_TEST_JAVA_VERSION=8 ./gradlew :smoke-tests:test  # run smoke tests (requires env var)
 ```
 
 The final artifact is `agent/build/libs/grafana-opentelemetry-java.jar`.
 
-Smoke tests only run when `SMOKE_TEST_JAVA_VERSION` env var is set (or running in IntelliJ). They use TestContainers and test the entire javaagent with a real application.
+Smoke tests only run when `SMOKE_TEST_JAVA_VERSION` env var
+is set (or running in IntelliJ). They use TestContainers
+and test the entire javaagent with a real application.
 
 ## Modules
 
-- **`:custom`** — Grafana extensions: instrumentation filtering, metric filtering, resource truncation, version logging. Entry point is `GrafanaAutoConfigCustomizerProvider` (implements OpenTelemetry's `AutoConfigurationCustomizerProvider` SPI). Has checkstyle enforcement.
-- **`:agent`** — Packages the upstream OTEL javaagent + custom extensions into a single shadow JAR via a 3-step process (relocate → isolate → merge) to avoid classpath conflicts.
-- **`:smoke-tests`** — Integration tests using TestContainers that run a Spring Boot app with the full javaagent attached.
+- **`:custom`** — Grafana extensions: instrumentation
+  filtering, metric filtering, resource truncation, version
+  logging. Entry point is
+  `GrafanaAutoConfigCustomizerProvider` (implements
+  OpenTelemetry's `AutoConfigurationCustomizerProvider`
+  SPI). Has checkstyle enforcement.
+- **`:agent`** — Packages the upstream OTEL javaagent +
+  custom extensions into a single shadow JAR via a 3-step
+  process (relocate → isolate → merge) to avoid classpath
+  conflicts.
+- **`:smoke-tests`** — Integration tests using
+  TestContainers that run a Spring Boot app with the full
+  javaagent attached.
 
 ## Architecture
 
-The distro extends upstream OTEL via the `AutoConfigurationCustomizerProvider` SPI. Key customization points in `:custom`:
+The distro extends upstream OTEL via the
+`AutoConfigurationCustomizerProvider` SPI. Key
+customization points in `:custom`:
 
-- `TestedInstrumentationsCustomizer` — optionally limits active instrumentations to a curated list in `Instrumentations.java` (controlled by `grafana.otel.use-tested-instrumentations` property)
+- `TestedInstrumentationsCustomizer` — optionally limits
+  active instrumentations to a curated list in
+  `Instrumentations.java` (controlled by
+  `grafana.otel.use-tested-instrumentations` property)
 - `MetricsCustomizer` / `MetricFilter` — filters metrics
 - `ResourceCustomizer` — truncates resource attribute values (default 2048 chars)
-- `DistributionVersion.java` — **auto-generated** by `custom/build.gradle` `manageVersionClass` task; do not edit manually
+- `DistributionVersion.java` — **auto-generated** by
+  `custom/build.gradle` `manageVersionClass` task; do not
+  edit manually
 
-Package relocation (`gradle/shadow.gradle`) moves OpenTelemetry classes to `io.opentelemetry.javaagent.shaded.*` to prevent conflicts with instrumented application code. Resource providers are excluded from relocation.
+Package relocation (`gradle/shadow.gradle`) moves
+OpenTelemetry classes to
+`io.opentelemetry.javaagent.shaded.*` to prevent conflicts
+with instrumented application code. Resource providers are
+excluded from relocation.
 
 ## Linting
 
 After modifying non-Java files (Markdown, YAML, Dockerfiles, shell scripts, etc.), always run linting via mise:
 
 ```sh
-mise run lint:super-linter    # run super-linter only
-mise run fix                  # auto-fix lint issues
+mise run lint                 # run lint checks
+mise run lint:fix             # auto-fix lint issues
 ```
 
 Lint tasks are sourced from [grafana/flint](https://github.com/grafana/flint).
 
 ## Code Conventions
 
 - Java 8 compilation target (`-Werror`), Java 17 for tests
-- Google Java Format via Spotless, checkstyle (Google style) on `:custom`
-- License header: Apache 2.0 / Grafana Labs (enforced by Spotless)
+- Google Java Format, ktlint, and checkstyle (Google style) on `:custom`
+- License header: Apache 2.0 / Grafana Labs (enforced by flint)
 - Package root: `com.grafana.extensions.*`
 - JUnit 5 + AssertJ for assertions, LogUnit for log capture
 
@@ -67,5 +97,7 @@ Lint tasks are sourced from [grafana/flint](https://github.com/grafana/flint).
 ## Dependency Management
 
 - Upstream OTEL version tracked in `build.gradle` → `otelInstrumentationVersion`
-- Renovate manages dependency updates; extends `github>grafana/flint` preset for mise task and tool version updates (see `.github/renovate.json5`)
+- Renovate manages dependency updates; extends
+  `github>grafana/flint` preset for mise task and tool
+  version updates (see `.github/renovate.json5`)
 - `mise.toml` manages tool versions (Java, lychee) and lint tasks

CONTRIBUTING.md

@@ -18,7 +18,7 @@ javaagent.jar as well as our custom extension.
 
 ## Code formatting
 
-- Java: `./gradlew spotlessApply`
+- Java and repo lint fixes: `mise run lint:fix`
 - Markdown lint: `markdownlint -f .` (`-f` fixes simple violations, requires [markdownlint](https://github.com/DavidAnson/markdownlint#markdownlint))
 - Markdown link checker: `lychee --include-fragments --max-retries 6 .`
   (requires [lychee](https://github.com/lycheeverse/lychee))

biome.jsonc

@@ -0,0 +1,7 @@
+{
+  // Keep JSON formatting aligned with the repo's two-space style.
+  "formatter": {
+    "indentStyle": "space",
+    "indentWidth": 2
+  }
+}

build.gradle

@@ -11,7 +11,6 @@ buildscript {
     }
   }
   dependencies {
-    classpath "com.diffplug.spotless:spotless-plugin-gradle:8.4.0"
     classpath "com.gradleup.shadow:shadow-gradle-plugin:9.4.1"
     classpath "io.opentelemetry.instrumentation:gradle-plugins:${otelInstrumentationVersion}-alpha"
   }
@@ -21,7 +20,6 @@ subprojects {
   version = rootProject.version
 
   apply plugin: "java"
-  apply plugin: "com.diffplug.spotless"
 
   ext {
     versions = [
@@ -48,32 +46,6 @@ subprojects {
     mavenCentral()
   }
 
-  spotless {
-    java {
-      googleJavaFormat()
-      licenseHeaderFile(rootProject.file("buildscripts/spotless.license.java"), "(package|import|public)")
-      target("src/**/*.java")
-    }
-
-    format 'misc', {
-      // not using "**/..." to help keep spotless fast
-      target(
-        ".gitignore",
-        ".gitattributes",
-        ".gitconfig",
-        ".editorconfig",
-        "*.md",
-        "src/**/*.md",
-        "docs/**/*.md",
-        "*.sh",
-        "src/**/*.properties",
-      )
-      leadingTabsToSpaces()
-      trimTrailingWhitespace()
-      endWithNewline()
-    }
-  }
-
   dependencies {
     // these serve as a test of the instrumentation boms
     implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions.opentelemetryJavaagentAlpha}"))