From aa9f24aba25362b28a567b95c55a1b830976b350 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Mon, 11 May 2026 15:51:07 +0000 Subject: [PATCH] chore: upgrade flint to v0.22.2 Signed-off-by: Gregor Zeitlinger --- .codespellrc | 6 - .github/config/_typos.toml | 10 + .github/renovate-tracked-deps.json | 286 +++++++++++++++-------------- mise.toml | 10 +- 4 files changed, 162 insertions(+), 150 deletions(-) delete mode 100644 .codespellrc create mode 100644 .github/config/_typos.toml diff --git a/.codespellrc b/.codespellrc deleted file mode 100644 index a1634fb0c..000000000 --- a/.codespellrc +++ /dev/null @@ -1,6 +0,0 @@ -[codespell] -# nd: legitimate variable name in quantile algorithms -# atmost: AssertJ atMost() matcher -# re-use: hyphenated form used in comments -# errorprone: Google ErrorProne tool name -ignore-words-list = nd,atmost,re-use,errorprone diff --git a/.github/config/_typos.toml b/.github/config/_typos.toml new file mode 100644 index 000000000..291218241 --- /dev/null +++ b/.github/config/_typos.toml @@ -0,0 +1,10 @@ +[default] +extend-ignore-re = [ + 're-use', + '\.atMost\(', + 'errorprone', + 'com\.google\.errorprone', + '\bNormalDistribution nd\b', + '\bnd\.inverseCumulativeProbability\(', + 'BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTI0MDUxMDE0MzY1NloYDzIxMjQw', +] diff --git a/.github/renovate-tracked-deps.json b/.github/renovate-tracked-deps.json index 2dde2330f..adfef7f3e 100644 --- a/.github/renovate-tracked-deps.json +++ b/.github/renovate-tracked-deps.json @@ -1,142 +1,150 @@ { - ".github/renovate.json5": { - "renovate-config-presets": [ - "grafana/flint" - ] - }, - ".github/workflows/acceptance-tests.yml": { - "regex": [ - "mise" - ] - }, - ".github/workflows/build.yml": { - "regex": [ - "mise" - ] - }, - ".github/workflows/generate-protobuf.yml": { - "regex": [ - "mise" - ] - }, - ".github/workflows/github-pages.yaml": { - "regex": [ - "mise" - ] - }, - ".github/workflows/java-version-matrix-tests.yml": { - "regex": [ - "mise" - ] - }, - ".github/workflows/lint.yml": { - "regex": [ - "mise" - ] - }, - ".github/workflows/native-tests.yml": { - "regex": [ - "mise" - ] - }, - ".github/workflows/nightly-benchmarks.yml": { - "regex": [ - "mise" - ] - }, - ".github/workflows/release.yml": { - "regex": [ - "mise" - ] - }, - ".github/workflows/test-release-build.yml": { - "regex": [ - "mise" - ] - }, - ".mise/envs/native/mise.toml": { - "mise": [ - "java" - ] - }, - ".mvn/wrapper/maven-wrapper.properties": { - "maven-wrapper": [ - "maven" - ] - }, - "examples/example-custom-buckets/docker-compose.yaml": { - "docker-compose": [ - "eclipse-temurin", - "grafana/grafana", - "prom/prometheus" - ] - }, - "examples/example-exemplars-tail-sampling/docker-compose.yaml": { - "docker-compose": [ - "grafana/grafana", - "grafana/k6", - "grafana/tempo", - "opentelemetry-java-agent", - "otel/opentelemetry-collector-contrib", - "prom/prometheus" - ] - }, - "examples/example-exporter-opentelemetry/docker-compose.yaml": { - "docker-compose": [ - "openjdk", - "otel/opentelemetry-collector-contrib", - "prom/prometheus" - ] - }, - "examples/example-exporter-opentelemetry/oats-tests/agent/Dockerfile": { - "dockerfile": [ - "eclipse-temurin" - ] - }, - "examples/example-exporter-opentelemetry/oats-tests/http/Dockerfile": { - "dockerfile": [ - "eclipse-temurin" - ] - }, - "examples/example-native-histogram/docker-compose.yaml": { - "docker-compose": [ - "eclipse-temurin", - "grafana/grafana", - "prom/prometheus" - ] - }, - "mise.toml": { - "mise": [ - "actionlint", - "aqua:owenlamont/ryl", - "biome", - "editorconfig-checker", - "github:google/google-java-format", - "github:grafana/flint", - "github:jonwiggins/xmloxide", - "github:koalaman/shellcheck", - "go:github.com/grafana/oats", - "hugo", - "java", - "lychee", - "node", - "npm:renovate", - "pipx:codespell", - "protoc", - "ruff", - "rumdl", - "shfmt", - "taplo" - ] - }, - "mvnw": { - "maven-wrapper": [ - "maven-wrapper" - ] - }, - "mvnw.cmd": { - "maven-wrapper": [ - "maven-wrapper" - ] + "meta": { + "protoc": { + "packageName": "protocolbuffers/protobuf", + "datasource": "github-releases" + } + }, + "files": { + ".github/renovate.json5": { + "renovate-config-presets": [ + "grafana/flint" + ] + }, + ".github/workflows/acceptance-tests.yml": { + "regex": [ + "mise" + ] + }, + ".github/workflows/build.yml": { + "regex": [ + "mise" + ] + }, + ".github/workflows/generate-protobuf.yml": { + "regex": [ + "mise" + ] + }, + ".github/workflows/github-pages.yaml": { + "regex": [ + "mise" + ] + }, + ".github/workflows/java-version-matrix-tests.yml": { + "regex": [ + "mise" + ] + }, + ".github/workflows/lint.yml": { + "regex": [ + "mise" + ] + }, + ".github/workflows/native-tests.yml": { + "regex": [ + "mise" + ] + }, + ".github/workflows/nightly-benchmarks.yml": { + "regex": [ + "mise" + ] + }, + ".github/workflows/release.yml": { + "regex": [ + "mise" + ] + }, + ".github/workflows/test-release-build.yml": { + "regex": [ + "mise" + ] + }, + ".mise/envs/native/mise.toml": { + "mise": [ + "java" + ] + }, + ".mvn/wrapper/maven-wrapper.properties": { + "maven-wrapper": [ + "maven" + ] + }, + "examples/example-custom-buckets/docker-compose.yaml": { + "docker-compose": [ + "eclipse-temurin", + "grafana/grafana", + "prom/prometheus" + ] + }, + "examples/example-exemplars-tail-sampling/docker-compose.yaml": { + "docker-compose": [ + "grafana/grafana", + "grafana/k6", + "grafana/tempo", + "opentelemetry-java-agent", + "otel/opentelemetry-collector-contrib", + "prom/prometheus" + ] + }, + "examples/example-exporter-opentelemetry/docker-compose.yaml": { + "docker-compose": [ + "openjdk", + "otel/opentelemetry-collector-contrib", + "prom/prometheus" + ] + }, + "examples/example-exporter-opentelemetry/oats-tests/agent/Dockerfile": { + "dockerfile": [ + "eclipse-temurin" + ] + }, + "examples/example-exporter-opentelemetry/oats-tests/http/Dockerfile": { + "dockerfile": [ + "eclipse-temurin" + ] + }, + "examples/example-native-histogram/docker-compose.yaml": { + "docker-compose": [ + "eclipse-temurin", + "grafana/grafana", + "prom/prometheus" + ] + }, + "mise.toml": { + "mise": [ + "actionlint", + "aqua:grafana/flint", + "aqua:jonwiggins/xmloxide", + "aqua:owenlamont/ryl", + "biome", + "editorconfig-checker", + "go:github.com/grafana/oats", + "google-java-format", + "hugo", + "java", + "lychee", + "node", + "npm:renovate", + "protoc", + "ruff", + "rumdl", + "shellcheck", + "shfmt", + "taplo", + "typos" + ] + }, + "mvnw": { + "maven-wrapper": [ + "maven-wrapper" + ] + }, + "mvnw.cmd": { + "maven-wrapper": [ + "maven-wrapper" + ] + } } } diff --git a/mise.toml b/mise.toml index c3b10c4ab..f46c0143c 100644 --- a/mise.toml +++ b/mise.toml @@ -7,20 +7,20 @@ protoc = "34.1" # Linters actionlint = "1.7.12" +"aqua:grafana/flint" = "0.22.2" +"aqua:jonwiggins/xmloxide" = "v0.4.2" "aqua:owenlamont/ryl" = "0.8.0" biome = "2.4.12" editorconfig-checker = "v3.6.1" -"github:google/google-java-format" = "1.35.0" -"github:grafana/flint" = "0.21.0" -"github:jonwiggins/xmloxide" = "v0.4.2" -"github:koalaman/shellcheck" = "v0.11.0" +google-java-format = "1.35.0" lychee = "0.24.2" "npm:renovate" = "43.144.0" -"pipx:codespell" = "2.4.2" ruff = "0.15.12" rumdl = "0.1.84" +shellcheck = "v0.11.0" shfmt = "3.13.1" taplo = "0.10.0" +typos = "1.46.1" [env] FLINT_CONFIG_DIR = ".github/config"