Merge branch 'main' into ftorres/utf-8

zeitlinger · web-flow · commit 71abbe9634e7 · 2025-08-13T16:30:46.000+02:00
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -12,10 +12,10 @@ jobs:
       - name: Check out
         with:
           persist-credentials: false
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
       - uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
         with:
-          version: v2025.7.29
-          sha256: 72e9e76d0e52998b0dc084c6550aef472091975978586980d703a87240a87fde
+          version: v2025.8.7
+          sha256: 665ab5b4401a052ecd248aa0788da337b2dc1b5cd15bf982882397b1ca5e0a5a
       - name: Run acceptance tests
         run: mise run acceptance-test
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,13 +9,13 @@ jobs:
   build:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           persist-credentials: false
       - uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
         with:
-          version: v2025.7.29
-          sha256: 72e9e76d0e52998b0dc084c6550aef472091975978586980d703a87240a87fde
+          version: v2025.8.7
+          sha256: 665ab5b4401a052ecd248aa0788da337b2dc1b5cd15bf982882397b1ca5e0a5a
       - name: Cache local Maven repository
         uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
         with:
diff --git a/.github/workflows/github-pages.yaml b/.github/workflows/github-pages.yaml
@@ -32,15 +32,15 @@ jobs:
     if: github.repository == 'prometheus/client_java'
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           persist-credentials: false
           fetch-tags: "true"
           fetch-depth: 0
       - uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
         with:
-          version: v2025.7.29
-          sha256: 72e9e76d0e52998b0dc084c6550aef472091975978586980d703a87240a87fde
+          version: v2025.8.7
+          sha256: 665ab5b4401a052ecd248aa0788da337b2dc1b5cd15bf982882397b1ca5e0a5a
           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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
         with:
-          version: v2025.7.29
-          sha256: 72e9e76d0e52998b0dc084c6550aef472091975978586980d703a87240a87fde
+          version: v2025.8.7
+          sha256: 665ab5b4401a052ecd248aa0788da337b2dc1b5cd15bf982882397b1ca5e0a5a
       - name: Lint
         run: mise run lint-rest
diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml
@@ -12,11 +12,11 @@ jobs:
       - name: Check out
         with:
           persist-credentials: false
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
       - uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
         with:
-          version: v2025.7.29
-          sha256: 72e9e76d0e52998b0dc084c6550aef472091975978586980d703a87240a87fde
+          version: v2025.8.7
+          sha256: 665ab5b4401a052ecd248aa0788da337b2dc1b5cd15bf982882397b1ca5e0a5a
         env:
           MISE_ENV: native
       - name: Run native tests
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
           echo "${#GPG_SIGNING_KEY}"
           echo "${GPG_SIGNING_KEY}" | gpg --batch --import-options import-show --import
       - name: Checkout Plugin Repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           persist-credentials: false
 
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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           fetch-depth: 0
diff --git a/.github/workflows/test-release-build.yml b/.github/workflows/test-release-build.yml
@@ -13,13 +13,13 @@ jobs:
   build:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           persist-credentials: false
       - uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
         with:
-          version: v2025.7.29
-          sha256: 72e9e76d0e52998b0dc084c6550aef472091975978586980d703a87240a87fde
+          version: v2025.8.7
+          sha256: 665ab5b4401a052ecd248aa0788da337b2dc1b5cd15bf982882397b1ca5e0a5a
       - name: Cache local Maven repository
         uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
         with:
diff --git a/examples/example-exemplars-tail-sampling/docker-compose.yaml b/examples/example-exemplars-tail-sampling/docker-compose.yaml
@@ -36,7 +36,7 @@ services:
       - -jar
       - /example-greeting-service.jar
   collector:
-    image: otel/opentelemetry-collector-contrib:0.131.1@sha256:c06aa6d7833e9a2b81c6c394d67e40ae9864edec8dca8a8e8552df1316c96d9b
+    image: otel/opentelemetry-collector-contrib:0.132.1@sha256:0521289e0717c92111484641d00e256354e77f4f5b2cc96348f237d6b59f6969
     network_mode: host
     volumes:
       - ./config/otelcol-config.yaml:/config.yaml
diff --git a/examples/example-exporter-opentelemetry/docker-compose.yaml b/examples/example-exporter-opentelemetry/docker-compose.yaml
@@ -13,7 +13,7 @@ services:
       #- -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005
       - /example-exporter-opentelemetry.jar
   collector:
-    image: otel/opentelemetry-collector-contrib:0.131.1@sha256:c06aa6d7833e9a2b81c6c394d67e40ae9864edec8dca8a8e8552df1316c96d9b
+    image: otel/opentelemetry-collector-contrib:0.132.1@sha256:0521289e0717c92111484641d00e256354e77f4f5b2cc96348f237d6b59f6969
     network_mode: host
     volumes:
       - ./config/otelcol-config.yaml:/config.yaml
diff --git a/examples/example-exporter-opentelemetry/oats-tests/agent/Dockerfile b/examples/example-exporter-opentelemetry/oats-tests/agent/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21.0.8_9-jre@sha256:1297ef4131440ba9d8c17335fa27969e76550acb72b648eed7618d93bec98f98
+FROM eclipse-temurin:21.0.8_9-jre@sha256:ea350fe1d8bc9b18dea4ad46bb9a0f4d6fbd0dbb3548092e3ff8f1a3fef09efe
 
 COPY target/example-exporter-opentelemetry.jar ./app.jar
 # check that the resource attributes from the agent are used, epsecially the service.instance.id should be the same
diff --git a/examples/example-exporter-opentelemetry/oats-tests/http/Dockerfile b/examples/example-exporter-opentelemetry/oats-tests/http/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21.0.8_9-jre@sha256:1297ef4131440ba9d8c17335fa27969e76550acb72b648eed7618d93bec98f98
+FROM eclipse-temurin:21.0.8_9-jre@sha256:ea350fe1d8bc9b18dea4ad46bb9a0f4d6fbd0dbb3548092e3ff8f1a3fef09efe
 
 COPY target/example-exporter-opentelemetry.jar ./app.jar
 
diff --git a/examples/example-native-histogram/docker-compose.yaml b/examples/example-native-histogram/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   example-application:
-    image: eclipse-temurin:21.0.8_9-jre@sha256:1297ef4131440ba9d8c17335fa27969e76550acb72b648eed7618d93bec98f98
+    image: eclipse-temurin:21.0.8_9-jre@sha256:ea350fe1d8bc9b18dea4ad46bb9a0f4d6fbd0dbb3548092e3ff8f1a3fef09efe
     network_mode: host
     volumes:
       - ./target/example-native-histogram.jar:/example-native-histogram.jar
diff --git a/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml b/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml
@@ -16,7 +16,7 @@
     Jetty Sample for the Exporter Integration Test
   </description>
   <properties>
-    <jetty-server.version>12.0.24</jetty-server.version>
+    <jetty-server.version>12.0.25</jetty-server.version>
     <java.version>17</java.version>
   </properties>
 
