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

.editorconfig

@@ -1,7 +1,52 @@
 root = true
 
+[*]
+max_line_length = 100
+indent_size = 2
+
+[*.md]
+max_line_length = 120
+
+[CHANGELOG.md]
+max_line_length = off
+
+[*.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 = 120
 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,18 @@
+[settings]
+exclude = [
+  "CHANGELOG.md",
+  "gradlew",
+  "gradlew.bat",
+]
+
+[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,71 +1,105 @@
 # 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
 
 ## CI
 
 - PR builds test against Java 8, 11, 17, 21
-- Linting: super-linter, lychee (link checker), markdownlint, codespell
+- Linting: flint v2 (google-java-format, ktlint, markdownlint,
+  editorconfig-checker, lychee, codespell, shellcheck, shfmt,
+  actionlint, prettier)
 - `CHECK_GENERATED_FILES=true` validates that auto-generated code is up to date
 - OWASP dependency check fails build on CVE CVSS >= 7.0
 - Releases are scheduled weekly (Friday 09:00 UTC) or triggered manually
 
 ## 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

@@ -1,7 +1,9 @@
 # Contributing
 
-This project is a javaagent distribution of the OpenTelemetry Java instrumentation agent. It is modeled after the
-[OpenTelemetry Java instrumentation agent distro template](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/examples/distro/README.md).
+This project is a javaagent distribution of the
+OpenTelemetry Java instrumentation agent. It is modeled
+after the [OpenTelemetry Java instrumentation agent distro
+template](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/examples/distro/README.md).
 
 ## Build
 
@@ -18,8 +20,9 @@ javaagent.jar as well as our custom extension.
 
 ## Code formatting
 
-- Java: `./gradlew spotlessApply`
-- Markdown lint: `markdownlint -f .` (`-f` fixes simple violations, requires [markdownlint](https://github.com/DavidAnson/markdownlint#markdownlint))
+- Java and repo lint fixes: `mise run lint:fix`
+- Markdown lint: `mise run lint`
+- Markdown lint fixes: `mise run lint:fix`
 - Markdown link checker: `lychee --include-fragments --max-retries 6 .`
   (requires [lychee](https://github.com/lycheeverse/lychee))
 
@@ -52,5 +55,6 @@ See [RELEASING](RELEASING.md).
 
 ## Known Issues
 
-The tests occasionally fail due to TestContainers not starting in time. Please rerun the build for now, until a new
-wait strategy can be determined.
+The tests occasionally fail due to TestContainers not
+starting in time. Please rerun the build for now, until a
+new wait strategy can be determined.

README.md

@@ -7,16 +7,24 @@
 
 # Grafana OpenTelemetry Distribution for Java
 
+<!-- editorconfig-checker-disable -->
+
 [![Build](https://github.com/grafana/grafana-opentelemetry-java/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/grafana/grafana-opentelemetry-java/actions/workflows/build.yml)
 [![Slack](https://img.shields.io/badge/join%20slack-%23app--o11y-brightgreen.svg?logo=slack)](https://grafana.slack.com/archives/C05E87XRK3J)
 
+<!-- editorconfig-checker-enable -->
+
 ## About
 
 Grafana Distribution of [OpenTelemetry Instrumentation for Java] -
 optimized for [Grafana Cloud Application Observability].
 
+<!-- editorconfig-checker-disable -->
+
 ![Application Observability](https://grafana.com/media/blog/otel-distro-java/application-observability-grafana-cloud-overview-go.png)
 
+<!-- editorconfig-checker-enable -->
+
 This project provides a Java agent JAR that can be attached to any Java 8+ application and dynamically
 injects bytecode to capture telemetry from a number of popular libraries and frameworks.
 
@@ -31,7 +39,8 @@ Why use this distribution instead of [OpenTelemetry Instrumentation for Java] (u
 - **Fast Bugfixes**: We can fix bugs faster without waiting for the next release of
   upstream.
 - **Cost Optimized**: You can save costs by sending only the metrics that are actually used by the dashboards in
-  [Grafana Cloud Application Observability] ([opt-in](https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/setup/instrument/java/configuration/#data-saver)).
+  [Grafana Cloud Application Observability]
+  ([opt-in docs]).
 
 > **Open Source Friendly**:
 >
@@ -44,7 +53,9 @@ Why use this distribution instead of [OpenTelemetry Instrumentation for Java] (u
 
 ## Documentation
 
-The documentation can be found in [OpenTelemetry / Instrument an Application / Grafana Java Agent](https://grafana.com/docs/opentelemetry/instrument/grafana-java/).
+The documentation can be found in
+[OpenTelemetry / Instrument an Application / Grafana Java
+Agent](https://grafana.com/docs/opentelemetry/instrument/grafana-java/).
 
 ### Compatibility
 
@@ -57,7 +68,8 @@ The documentation can be found in [OpenTelemetry / Instrument an Application / G
 Follow these steps if you want to migrate from this distribution to the upstream project
 OpenTelemetry Instrumentation for Java:
 
-- If you use [Data Saver](https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/instrument/jvm/#data-saver),
+- If you use
+  [Data Saver],
   you can filter the metrics in the OpenTelemetry Collector instead
   ([docs](https://opentelemetry.io/docs/collector/transforming-telemetry/#basic-filtering)).
 - Add the environment variables below for the best experience with Application Observability:
@@ -79,6 +91,12 @@ To engage with the Grafana Cloud Application Observability community:
 - [File an issue](https://github.com/grafana/grafana-opentelemetry-java/issues/new)
   for bugs, enhancements, and feature suggestions.
 
+<!-- editorconfig-checker-disable -->
+
 [OpenTelemetry Instrumentation for Java]: https://github.com/open-telemetry/opentelemetry-java-instrumentation
 [Grafana Cloud Application Observability]: https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/
 [how to send telemetry data to Grafana Cloud Databases]: https://grafana.com/docs/opentelemetry/collector/send-otlp-to-grafana-cloud-databases/
+[Data Saver]: https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/instrument/jvm/#data-saver
+[opt-in docs]: https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/setup/instrument/java/configuration/#data-saver
+
+<!-- editorconfig-checker-enable -->

RELEASING.md

@@ -28,8 +28,11 @@ The release version will match the version specified by the `otelInstrumentation
 1. Click the link in the workflow run summary to the untagged release created by the workflow.
 1. Click the edit button (pencil icon) at the top right of the release notes.
 1. Verify that the release notes are correct. Make any manual adjustments if necessary.
-   - Include a link to the upstream release notes,
-     e.g. _"Update to [OpenTelemetry 2.9.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/CHANGELOG.md#version-290-2024-10-17)"_.
+   - Include a link to the upstream release notes, e.g.
+     <!-- editorconfig-checker-disable -->
+     _"Update to
+     [OpenTelemetry 2.9.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/CHANGELOG.md#version-290-2024-10-17)"_.
+     <!-- editorconfig-checker-enable -->
 1. Verify that the `grafana-opentelemetry-java.jar` and `LICENSE` assets have been attached.
 1. Click on **Publish release**.
 

biome.jsonc

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