chore: merge upstream/main, remove spotless in favor of google-java-format via flint

Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

Author: zeitlinger

.editorconfig

@@ -11,7 +11,7 @@ max_line_length = 200
 max_line_length = 300
 
 [pom.xml]
-max_line_length = 120
+max_line_length = 210
 
 [*.py]
 # checked by black

.github/config/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.5.0"
+  ".": "1.5.1"
 }

.github/config/lychee.toml

@@ -10,7 +10,7 @@ max_concurrency = 4
 include_fragments = true
 
 base_url = "https://prometheus.github.io"
-exclude_path = ["docs/themes"]
+exclude_path = ["docs/themes", "CHANGELOG.md"]
 
 exclude = [
   # excluding links to pull requests and issues is done for performance

.github/config/release-please-config.json

@@ -1,15 +1,10 @@
 {
   "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
-  "separate-pull-requests": false,
+  "group-pull-request-title-pattern": "chore${scope}: release${component} ${version}",
   "pull-request-footer": "> [!IMPORTANT]\n> Close and reopen this PR to trigger CI checks.",
   "packages": {
     ".": {
-      "release-type": "java",
-      "versioning": "always-bump-patch",
-      "extra-files": [
-        "prometheus-metrics-parent/pom.xml",
-        "integration-tests/it-spring-boot-smoke-test/pom.xml"
-      ]
+      "release-type": "maven"
     }
   }
 }

.github/config/super-linter.env

@@ -1,43 +1,24 @@
-FILTER_REGEX_EXCLUDE=mvnw|src/main/generated/.*|docs/themes/.*|keystore.pkcs12|.*.java|prometheus-metrics-exporter-opentelemetry-shaded/pom.xml|CODE_OF_CONDUCT.md|CLAUDE.md
+FILTER_REGEX_EXCLUDE=mvnw|src/main/generated/.*|docs/themes/.*|keystore.pkcs12|.*.java|prometheus-metrics-exporter-opentelemetry-shaded/pom.xml|CODE_OF_CONDUCT.md|CLAUDE.md|CHANGELOG.md
 IGNORE_GITIGNORED_FILES=true
 JAVA_FILE_NAME=google_checks.xml
 LOG_LEVEL=ERROR
-# conflicts with prettier
-VALIDATE_BIOME_FORMAT=false
-# conflicts with prettier
-VALIDATE_BIOME_LINT=false
-# disable kubernetes linter - complains about resource limits, etc
-VALIDATE_CHECKOV=false
-VALIDATE_CSS=false
-VALIDATE_CSS_PRETTIER=false
-VALIDATE_DOCKERFILE_HADOLINT=false
-VALIDATE_GIT_COMMITLINT=false
-# done by maven
-VALIDATE_GOOGLE_JAVA_FORMAT=false
-# times out
-VALIDATE_GO_MODULES=false
-VALIDATE_HTML=false
-# done by checkstyle
-VALIDATE_JAVA=false
-# we have many duplicate code in our codebase for demo purposes
-VALIDATE_JSCPD=false
-VALIDATE_PYTHON_PYLINT=false
-# conflicts with black
-VALIDATE_PYTHON_RUFF_FORMAT=false
-# excluding simpleclient-archive doesn't seem to work
-VALIDATE_TRIVY=false
 
-FIX_ENV=true
-FIX_GITHUB_ACTIONS_ZIZMOR=true
-FIX_GO=true
-FIX_JAVASCRIPT_PRETTIER=true
-FIX_JSON=true
-FIX_JSONC=true
-FIX_JSONC_PRETTIER=true
+VALIDATE_BASH=true
+VALIDATE_EDITORCONFIG=true
+VALIDATE_GIT_MERGE_CONFLICT_MARKERS=true
+VALIDATE_GITHUB_ACTIONS=true
+VALIDATE_JSON_PRETTIER=true
+VALIDATE_MARKDOWN=true
+VALIDATE_MARKDOWN_PRETTIER=true
+VALIDATE_RENOVATE=true
+VALIDATE_SHELL_SHFMT=true
+VALIDATE_SPELL_CODESPELL=true
+VALIDATE_XML=true
+VALIDATE_YAML_PRETTIER=true
+
 FIX_JSON_PRETTIER=true
 FIX_MARKDOWN=true
 FIX_MARKDOWN_PRETTIER=true
-FIX_PYTHON_BLACK=true
 FIX_SHELL_SHFMT=true
 FIX_SPELL_CODESPELL=true
 FIX_YAML_PRETTIER=true

.github/release.yml

@@ -23,7 +23,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Note: Java 8 runtime testing is skipped due to Spotless incompatibility
         java-version: [11, 17, 21, 25]
     steps:
       - name: Check out
@@ -46,15 +45,13 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Build core library artifacts
-        run: mise exec -- ./mvnw install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn -pl '!integration-tests'
+        run: mise exec -- ./mvnw install -DskipTests -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn -pl '!integration-tests'
 
       - name: Install parent POMs
         run: |
           cd integration-tests
-          mise exec -- ../mvnw clean install -N -Dspotless.skip=true
-          cd it-exporter
-          mise exec -- ../../mvnw install -N -Dspotless.skip=true
-
+          mise exec -- ../mvnw clean install -N           cd it-exporter
+          mise exec -- ../../mvnw install -N 
       - name: Rebuild sample apps targeting Java ${{ matrix.java-version }}
         run: |
           cd integration-tests
@@ -64,7 +61,7 @@ jobs:
           else
             MODULES="it-common,it-exporter/it-exporter-httpserver-sample,it-exporter/it-exporter-servlet-tomcat-sample,it-exporter/it-exporter-servlet-jetty-sample,it-exporter/it-exporter-no-protobuf,it-pushgateway"
           fi
-          mise exec -- ../mvnw clean install -DskipTests -Dspotless.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn \
+          mise exec -- ../mvnw clean install -DskipTests -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn \
             -Djava.version=${{ matrix.java-version }} \
             -Dmaven.compiler.release=${{ matrix.java-version }} \
             -pl $MODULES
@@ -80,5 +77,5 @@ jobs:
           else
             TEST_MODULES="it-exporter/it-exporter-test,it-exporter/it-no-protobuf-test,it-pushgateway"
           fi
-          mise exec -- ../mvnw verify -T 2C -Dspotless.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn \
+          mise exec -- ../mvnw verify -T 2C -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn \
             -pl $TEST_MODULES

.github/workflows/java-version-matrix-tests.yml

@@ -36,4 +36,4 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Build and test on Java ${{ matrix.java }}
-        run: ./mvnw clean install -Dtest.java.version=${{ matrix.java }} -Dspotless.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn -Dcoverage.skip=true
+        run: ./mvnw clean install -Dtest.java.version=${{ matrix.java }} -Dcheckstyle.skip=true -Dwarnings=-nowarn -Dcoverage.skip=true

.github/workflows/multi-version-test.yml

@@ -7,7 +7,9 @@ on:
       - main
 
 permissions:
+  actions: write
   contents: write
+  issues: write
   pull-requests: write
 
 jobs:
@@ -21,3 +23,11 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           config-file: .github/config/release-please-config.json
           manifest-file: .github/config/.release-please-manifest.json
+
+      - name: Trigger deploy to Maven Central
+        if: ${{ steps.release-please.outputs.releases_created == 'true' }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: >
+          gh workflow run release.yml
+          -f tag=${{ steps.release-please.outputs.tag_name }}

.github/workflows/release-please.yml

@@ -2,9 +2,11 @@
 name: Deploy to Maven Central
 
 on:
-  push:
-    tags:
-      - "v*.*.*"
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Release tag to deploy (e.g. v1.5.1)"
+        required: true
 
 jobs:
   deploy:
@@ -22,6 +24,7 @@ jobs:
       - name: Checkout Plugin Repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
+          ref: ${{ inputs.tag }}
           persist-credentials: false
 
       - uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3.6.3