Merge branch 'main' into bugfix/fix-exception-when-custom-root-metrics-path

zeitlinger · web-flow · commit eeef62514b87 · 2026-01-26T09:04:21.000+01:00
diff --git a/.editorconfig b/.editorconfig
@@ -11,9 +11,12 @@ max_line_length = 200
 max_line_length = 300
 
 [pom.xml]
-max_line_length = 110
+max_line_length = 120
 
 [*.py]
 # checked by black
 indent_size = 4
 max_line_length = 120
+
+[{.mise/tasks/build-release.sh,.github/workflows/multi-version-test.yml}]
+max_line_length = 200
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
       - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
         with:
-          version: v2026.1.4
-          sha256: 79c798e39b83f0dd80108eaa88c6ca63689695ae975fd6786e7a353ef9f87002
+          version: v2026.1.7
+          sha256: d98523f15392ab17909a55560244667aa81122766209b816d9a9b9585109bfea
       - name: Run acceptance tests
         run: mise run acceptance-test
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,8 +14,8 @@ jobs:
           persist-credentials: false
       - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
         with:
-          version: v2026.1.4
-          sha256: 79c798e39b83f0dd80108eaa88c6ca63689695ae975fd6786e7a353ef9f87002
+          version: v2026.1.7
+          sha256: d98523f15392ab17909a55560244667aa81122766209b816d9a9b9585109bfea
       - name: Cache local Maven repository
         uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
diff --git a/.github/workflows/github-pages.yaml b/.github/workflows/github-pages.yaml
@@ -39,8 +39,8 @@ jobs:
           fetch-depth: 0
       - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
         with:
-          version: v2026.1.4
-          sha256: 79c798e39b83f0dd80108eaa88c6ca63689695ae975fd6786e7a353ef9f87002
+          version: v2026.1.7
+          sha256: d98523f15392ab17909a55560244667aa81122766209b816d9a9b9585109bfea
           cache: "false"
       - name: Setup Pages
         id: pages
diff --git a/.github/workflows/lint-rest.yml b/.github/workflows/lint-rest.yml
@@ -12,10 +12,10 @@ jobs:
       - name: Check out
         with:
           persist-credentials: false
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
         with:
-          version: v2026.1.4
-          sha256: 79c798e39b83f0dd80108eaa88c6ca63689695ae975fd6786e7a353ef9f87002
+          version: v2026.1.7
+          sha256: d98523f15392ab17909a55560244667aa81122766209b816d9a9b9585109bfea
       - name: Lint
         run: mise run lint:rest
diff --git a/.github/workflows/multi-version-test.yml b/.github/workflows/multi-version-test.yml
@@ -0,0 +1,39 @@
+---
+name: Java-Version Compatibility Tests
+
+on: [pull_request]
+
+permissions: {}
+
+jobs:
+  compatibility-test:
+    name: Test on Java ${{ matrix.java }}
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [17, 21, 25]
+    steps:
+      - name: Check out
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        with:
+          persist-credentials: false
+
+      - name: Set up Java ${{ matrix.java }}
+        id: setup-java
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          distribution: "temurin"
+          java-version: ${{ matrix.java }}
+
+      - name: Cache local Maven repository
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-java${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-java${{ matrix.java }}-
+            ${{ 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
diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml
@@ -15,8 +15,8 @@ jobs:
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
       - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
         with:
-          version: v2026.1.4
-          sha256: 79c798e39b83f0dd80108eaa88c6ca63689695ae975fd6786e7a353ef9f87002
+          version: v2026.1.7
+          sha256: d98523f15392ab17909a55560244667aa81122766209b816d9a9b9585109bfea
           working_directory: .mise/envs/native
       - name: Run native tests
         working-directory: .mise/envs/native
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,8 +26,8 @@ jobs:
 
       - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
         with:
-          version: v2026.1.4
-          sha256: 79c798e39b83f0dd80108eaa88c6ca63689695ae975fd6786e7a353ef9f87002
+          version: v2026.1.7
+          sha256: d98523f15392ab17909a55560244667aa81122766209b816d9a9b9585109bfea
           cache: false
 
       - name: Build release version
@@ -36,7 +36,7 @@ jobs:
           TAG: ${{ github.ref_name }}
 
       - name: Set up Apache Maven Central
-        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
         with:
           distribution: "temurin"
           java-version: "21"
diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           fetch-depth: 0
diff --git a/.github/workflows/test-release-build.yml b/.github/workflows/test-release-build.yml
@@ -18,8 +18,8 @@ jobs:
           persist-credentials: false
       - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
         with:
-          version: v2026.1.4
-          sha256: 79c798e39b83f0dd80108eaa88c6ca63689695ae975fd6786e7a353ef9f87002
+          version: v2026.1.7
+          sha256: d98523f15392ab17909a55560244667aa81122766209b816d9a9b9585109bfea
       - name: Cache local Maven repository
         uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
diff --git a/.mise/tasks/build-release.sh b/.mise/tasks/build-release.sh
@@ -9,4 +9,4 @@ set -euo pipefail
 VERSION=${usage_tag#v}
 
 mise run set-version "$VERSION"
-mvn -B package -P 'release,!default' -Dmaven.test.skip=true
+mvn -B package -P 'release,!default,!examples-and-integration-tests' -Dmaven.test.skip=true -Dgpg.skip=true
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
@@ -85,8 +85,8 @@
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
-          <compilerArgs>
-            <!-- need to add parameters to prevent inheritance -->
+          <compilerArgs combine.self="override">
+            <!-- Override parent to prevent ErrorProne inheritance -->
             <arg>-parameters</arg>
           </compilerArgs>
           <annotationProcessorPaths>
diff --git a/integration-tests/it-spring-boot-smoke-test/pom.xml b/integration-tests/it-spring-boot-smoke-test/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>4.0.1</version>
+    <version>4.0.2</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
 
@@ -89,95 +89,108 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.graalvm.buildtools</groupId>
-        <artifactId>native-maven-plugin</artifactId>
-        <configuration>
-          <!-- editorconfig-checker-disable -->
-          <buildArgs>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.api.DisplayNameGenerator$IndicativeSentences
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor$ClassInfo
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor$LifecycleMethods
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.descriptor.DynamicDescendantFilter$Mode
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector$1
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor$MethodInfo
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.discovery.ClassSelectorResolver$DummyClassTemplateInvocationContext
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.platform.engine.support.store.NamespacedHierarchicalStore$EvaluatedValue
-            </buildArg>
-            <buildArg>--initialize-at-build-time=org.junit.platform.launcher.core.DiscoveryIssueNotifier
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.platform.launcher.core.LauncherDiscoveryResult$EngineResultInfo
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor$LifecycleMethods
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.platform.commons.logging.LoggerFactory$DelegatingLogger
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.execution.ConditionEvaluator
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.execution.InterceptingExecutableInvoker
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.api.extension.ConditionEvaluationResult
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.execution.InvocationInterceptorChain
-            </buildArg>
-          </buildArgs>
-          <!-- editorconfig-checker-enable -->
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>com.diffplug.spotless</groupId>
-        <artifactId>spotless-maven-plugin</artifactId>
-        <version>3.1.0</version>
-        <configuration>
-          <java>
-            <googleJavaFormat/>
-          </java>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>verify</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>java17-plus</id>
+      <activation>
+        <jdk>[17,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.graalvm.buildtools</groupId>
+            <artifactId>native-maven-plugin</artifactId>
+            <configuration>
+              <!-- editorconfig-checker-disable -->
+              <buildArgs>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.api.DisplayNameGenerator$IndicativeSentences
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor$ClassInfo
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor$LifecycleMethods
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.descriptor.DynamicDescendantFilter$Mode
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector$1
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor$MethodInfo
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.discovery.ClassSelectorResolver$DummyClassTemplateInvocationContext
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.platform.engine.support.store.NamespacedHierarchicalStore$EvaluatedValue
+                </buildArg>
+                <buildArg>--initialize-at-build-time=org.junit.platform.launcher.core.DiscoveryIssueNotifier
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.platform.launcher.core.LauncherDiscoveryResult$EngineResultInfo
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor$LifecycleMethods
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.platform.commons.logging.LoggerFactory$DelegatingLogger
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.execution.ConditionEvaluator
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.execution.InterceptingExecutableInvoker
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.api.extension.ConditionEvaluationResult
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.execution.InvocationInterceptorChain
+                </buildArg>
+              </buildArgs>
+              <!-- editorconfig-checker-enable -->
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>com.diffplug.spotless</groupId>
+            <artifactId>spotless-maven-plugin</artifactId>
+            <version>3.2.0</version>
+            <configuration>
+              <java>
+                <googleJavaFormat/>
+              </java>
+            </configuration>
+            <executions>
+              <execution>
+                <phase>verify</phase>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/pom.xml b/pom.xml
diff --git a/prometheus-metrics-exporter-httpserver/src/test/java/io/prometheus/metrics/exporter/httpserver/HTTPServerTest.java b/prometheus-metrics-exporter-httpserver/src/test/java/io/prometheus/metrics/exporter/httpserver/HTTPServerTest.java
diff --git a/prometheus-metrics-instrumentation-dropwizard/pom.xml b/prometheus-metrics-instrumentation-dropwizard/pom.xml
diff --git a/prometheus-metrics-instrumentation-dropwizard5/pom.xml b/prometheus-metrics-instrumentation-dropwizard5/pom.xml
diff --git a/prometheus-metrics-parent/pom.xml b/prometheus-metrics-parent/pom.xml
