From d7206d7accba4389d01c22206e10a60f8e3582ef Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Thu, 28 May 2026 14:26:19 +0200 Subject: [PATCH 1/5] update Signed-off-by: Gregor Zeitlinger --- AGENTS.md | 44 ++++++++++---------------------------------- mise.toml | 2 +- 2 files changed, 11 insertions(+), 35 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index f9da50dcd..f5362da8e 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -102,7 +102,15 @@ Pre-built instrumentations: - Do not prefix PR titles with `[codex]`. - Match the PR title type to the primary user-facing change. -## Linting and Validation +## Linting + +Run `mise run lint:fix` before committing changes. +If output includes `fixed`, keep those changes. +If output includes `partial` or `review`, address the remaining issues and +run `mise run lint:fix` again. + +Example output: +flint: fixed: gofmt — commit before pushing | partial: cargo-clippy **CRITICAL**: These checks MUST be run before creating any commits. CI will fail if these checks fail. @@ -117,39 +125,6 @@ commits. CI will fail if these checks fail. - Build succeeds (tests are skipped; run `mise run test` or `mise run test-all` for tests) -### Non-Java Files (Markdown, YAML, JSON, shell scripts) - -- **ALWAYS** run `mise run lint` after modifying non-Java - files (runs super-linter + link checking + BOM check) -- `mise run lint:fix` autofixes linting issues -- Super-linter will **autofix** many issues - (formatting, trailing whitespace, etc.) -- It only reports ERROR-level issues - (configured via `LOG_LEVEL=ERROR` in - `.github/super-linter.env`) -- Common issues caught: - - Lines exceeding 100 characters in Markdown files - - Missing language tags in fenced code blocks - - Table formatting issues - - YAML/JSON syntax errors - -### Running Linters - -```bash -# After modifying Java files (run BEFORE committing) -mise run build - -# After modifying non-Java files (run BEFORE committing) -mise run lint -# or to autofix: mise run lint:fix -``` - -### Before Pushing - -**ALWAYS** run `mise run lint` before pushing to verify -all lints pass. CI runs the same checks and will fail -if any lint is violated. - ## Testing - JUnit 5 (Jupiter) with `@Test` annotations @@ -179,3 +154,4 @@ if any lint is violated. Source compatibility: Java 8. Tests run on Java 25 (configured in `mise.toml`). + diff --git a/mise.toml b/mise.toml index ad08f6eec..2ad40bf28 100644 --- a/mise.toml +++ b/mise.toml @@ -7,7 +7,7 @@ protoc = "35.0" # Linters actionlint = "1.7.12" -"aqua:grafana/flint" = "0.22.2" +"aqua:grafana/flint" = "0.22.3" "aqua:jonwiggins/xmloxide" = "v0.4.3" "aqua:owenlamont/ryl" = "0.10.0" biome = "2.4.12" From 63c2c22d35764746b034c797c2f30a9caf4e44f7 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Thu, 28 May 2026 14:26:57 +0200 Subject: [PATCH 2/5] zizmor Signed-off-by: Gregor Zeitlinger --- .github/renovate.json5 | 2 +- mise.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 6628e12ed..d4b4ad83f 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,6 +1,6 @@ { $schema: "https://docs.renovatebot.com/renovate-schema.json", - extends: ["config:best-practices", "config:recommended", "github>grafana/flint#v0.22.2"], + extends: ["config:best-practices", "config:recommended", "github>grafana/flint#v0.22.3"], platformCommit: "enabled", automerge: true, ignorePaths: [ diff --git a/mise.toml b/mise.toml index 2ad40bf28..eb1617703 100644 --- a/mise.toml +++ b/mise.toml @@ -21,6 +21,7 @@ shellcheck = "v0.11.0" shfmt = "3.13.1" taplo = "0.10.0" typos = "1.46.3" +zizmor = "1.25.2" [env] FLINT_CONFIG_DIR = ".github/config" From 601455240285f3c51ab73bc574a30a316db6aa95 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Thu, 28 May 2026 20:04:53 +0200 Subject: [PATCH 3/5] fix zizmor issues - update flint Signed-off-by: Gregor Zeitlinger --- .github/renovate-tracked-deps.json | 7 ++++--- .github/workflows/micrometer-compatibility.yml | 10 ++++------ .github/workflows/release-please.yml | 3 ++- AGENTS.md | 1 - mise.toml | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/renovate-tracked-deps.json b/.github/renovate-tracked-deps.json index 41cab4338..5e402b59c 100644 --- a/.github/renovate-tracked-deps.json +++ b/.github/renovate-tracked-deps.json @@ -36,12 +36,12 @@ "mise" ] }, - ".github/workflows/micrometer-compatibility.yml": { + ".github/workflows/lint.yml": { "regex": [ "mise" ] }, - ".github/workflows/lint.yml": { + ".github/workflows/micrometer-compatibility.yml": { "regex": [ "mise" ] @@ -138,7 +138,8 @@ "shellcheck", "shfmt", "taplo", - "typos" + "typos", + "zizmor" ] }, "mvnw": { diff --git a/.github/workflows/micrometer-compatibility.yml b/.github/workflows/micrometer-compatibility.yml index efd0afb41..6e0cec822 100644 --- a/.github/workflows/micrometer-compatibility.yml +++ b/.github/workflows/micrometer-compatibility.yml @@ -35,9 +35,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run Micrometer compatibility tests - run: | - if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then - export MICROMETER_REPOSITORY="${{ github.event.inputs.micrometer-repository }}" - export MICROMETER_REF="${{ github.event.inputs.micrometer-ref }}" - fi - mise run micrometer:test + env: + MICROMETER_REPOSITORY: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.micrometer-repository || 'micrometer-metrics/micrometer' }} + MICROMETER_REF: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.micrometer-ref || 'main' }} + run: mise run micrometer:test diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index b72ee5457..edc4d177c 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -28,6 +28,7 @@ jobs: if: ${{ steps.release-please.outputs.releases_created == 'true' }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAG_NAME: ${{ steps.release-please.outputs.tag_name }} run: > gh workflow run release.yml --repo "${GITHUB_REPOSITORY}" - -f tag=${{ steps.release-please.outputs.tag_name }} + -f "tag=${TAG_NAME}" diff --git a/AGENTS.md b/AGENTS.md index f5362da8e..24481b8e5 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -154,4 +154,3 @@ commits. CI will fail if these checks fail. Source compatibility: Java 8. Tests run on Java 25 (configured in `mise.toml`). - diff --git a/mise.toml b/mise.toml index eb1617703..392fb6b1d 100644 --- a/mise.toml +++ b/mise.toml @@ -7,7 +7,7 @@ protoc = "35.0" # Linters actionlint = "1.7.12" -"aqua:grafana/flint" = "0.22.3" +"aqua:grafana/flint" = "0.22.4" "aqua:jonwiggins/xmloxide" = "v0.4.3" "aqua:owenlamont/ryl" = "0.10.0" biome = "2.4.12" From b8c3196ee8b7ff942f9993a6ba84dc7fc0bd442e Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Thu, 28 May 2026 20:06:30 +0200 Subject: [PATCH 4/5] update flint Signed-off-by: Gregor Zeitlinger --- .github/renovate.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index d4b4ad83f..4284ec290 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,6 +1,6 @@ { $schema: "https://docs.renovatebot.com/renovate-schema.json", - extends: ["config:best-practices", "config:recommended", "github>grafana/flint#v0.22.3"], + extends: ["config:best-practices", "config:recommended", "github>grafana/flint#v0.22.4"], platformCommit: "enabled", automerge: true, ignorePaths: [ From 60a052a0d62a461c2f44224e99ead5e3d0ebdc79 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Thu, 28 May 2026 20:30:34 +0200 Subject: [PATCH 5/5] mark generated Signed-off-by: Gregor Zeitlinger --- .gitattributes | 3 +++ .github/config/flint.toml | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..b54b74652 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +CHANGELOG.md linguist-generated +**/src/main/generated/** linguist-generated +docs/** linguist-documentation diff --git a/.github/config/flint.toml b/.github/config/flint.toml index e11556a6a..45ec061d4 100644 --- a/.github/config/flint.toml +++ b/.github/config/flint.toml @@ -1,7 +1,5 @@ [settings] -# These paths are generated, vendored, or handled by other checks. -exclude = ["CHANGELOG.md", "**/src/main/generated/**", "docs/themes/**", "mvnw", "simpleclient-archive/**"] -setup_migration_version = 2 +exclude = ["docs/themes/**", "mvnw", "simpleclient-archive/**"] [checks.renovate-deps] exclude_managers = ["github-actions", "github-runners", "maven"]