Skip to content

Commit 7572d0d

Browse files
jaydelucajaydeluca
authored
Merge branch 'main' into renovate/eclipse-temurin-25.x
Signed-off-by: Jay DeLuca <[email protected]>
2 parents 110d40c + 14883e4 commit 7572d0d

File tree

20 files changed

+52
-41
lines changed

20 files changed

+52
-41
lines changed

‎.github/super-linter.env‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
FILTER_REGEX_EXCLUDE=mvnw|src/main/generated/.*|docs/themes/.*|keystore.pkcs12|.*.java|prometheus-metrics-exporter-opentelemetry-shaded/pom.xml|CODE_OF_CONDUCT.md
22
IGNORE_GITIGNORED_FILES=true
33
JAVA_FILE_NAME=google_checks.xml
4+
# conflicts with prettier
5+
VALIDATE_BIOME_FORMAT=false
6+
# conflicts with prettier
7+
VALIDATE_BIOME_LINT=false
48
# disable kubernetes linter - complains about resource limits, etc
59
VALIDATE_CHECKOV=false
610
VALIDATE_CSS=false
@@ -17,6 +21,8 @@ VALIDATE_JAVA=false
1721
# we have many duplicate code in our codebase for demo purposes
1822
VALIDATE_JSCPD=false
1923
VALIDATE_PYTHON_PYLINT=false
24+
# conflicts with black
25+
VALIDATE_PYTHON_RUFF_FORMAT=false
2026
# excluding simpleclient-archive doesn't seem to work
2127
VALIDATE_TRIVY=false
2228

‎.github/workflows/acceptance-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
with:
1414
persist-credentials: false
1515
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
16-
- uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0
16+
- uses: jdx/mise-action@e3d7b8d67a7958d1207f6ed871e83b1ea780e7b0 # v3.3.1
1717
with:
18-
version: v2025.9.15
19-
sha256: ea3be29bf97e4a11f57706fcd779dcc719598c22125d47e99182092c83814baa
18+
version: v2025.10.11
19+
sha256: 589cac941160e404d13be6f5699a25ffdb25b732084430338bc384df9f0a4438
2020
- name: Run acceptance tests
2121
run: mise run acceptance-test

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
1313
with:
1414
persist-credentials: false
15-
- uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0
15+
- uses: jdx/mise-action@e3d7b8d67a7958d1207f6ed871e83b1ea780e7b0 # v3.3.1
1616
with:
17-
version: v2025.9.15
18-
sha256: ea3be29bf97e4a11f57706fcd779dcc719598c22125d47e99182092c83814baa
17+
version: v2025.10.11
18+
sha256: 589cac941160e404d13be6f5699a25ffdb25b732084430338bc384df9f0a4438
1919
- name: Cache local Maven repository
2020
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
2121
with:

‎.github/workflows/github-pages.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ jobs:
3737
persist-credentials: false
3838
fetch-tags: "true"
3939
fetch-depth: 0
40-
- uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0
40+
- uses: jdx/mise-action@e3d7b8d67a7958d1207f6ed871e83b1ea780e7b0 # v3.3.1
4141
with:
42-
version: v2025.9.15
43-
sha256: ea3be29bf97e4a11f57706fcd779dcc719598c22125d47e99182092c83814baa
42+
version: v2025.10.11
43+
sha256: 589cac941160e404d13be6f5699a25ffdb25b732084430338bc384df9f0a4438
4444
cache: "false"
4545
- name: Setup Pages
4646
id: pages

‎.github/workflows/lint-rest.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
with:
1414
persist-credentials: false
1515
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
16-
- uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0
16+
- uses: jdx/mise-action@e3d7b8d67a7958d1207f6ed871e83b1ea780e7b0 # v3.3.1
1717
with:
18-
version: v2025.9.15
19-
sha256: ea3be29bf97e4a11f57706fcd779dcc719598c22125d47e99182092c83814baa
18+
version: v2025.10.11
19+
sha256: 589cac941160e404d13be6f5699a25ffdb25b732084430338bc384df9f0a4438
2020
- name: Lint
2121
run: mise run lint-rest

‎.github/workflows/native-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
with:
1414
persist-credentials: false
1515
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
16-
- uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0
16+
- uses: jdx/mise-action@e3d7b8d67a7958d1207f6ed871e83b1ea780e7b0 # v3.3.1
1717
with:
18-
version: v2025.9.15
19-
sha256: ea3be29bf97e4a11f57706fcd779dcc719598c22125d47e99182092c83814baa
18+
version: v2025.10.11
19+
sha256: 589cac941160e404d13be6f5699a25ffdb25b732084430338bc384df9f0a4438
2020
env:
2121
MISE_ENV: native
2222
- name: Run native tests

‎.github/workflows/super-linter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run: grep -v '^#' .github/super-linter.env | grep -v 'FIX_' >> "$GITHUB_ENV"
2525

2626
- name: Super-linter
27-
uses: super-linter/super-linter@ffde3b2b33b745cb612d787f669ef9442b1339a6 # v8.1.0
27+
uses: super-linter/super-linter@2bdd90ed3262e023ac84bf8fe35dc480721fc1f2 # v8.2.1
2828
env:
2929
# To report GitHub Actions status checks
3030
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/test-release-build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
1717
with:
1818
persist-credentials: false
19-
- uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0
19+
- uses: jdx/mise-action@e3d7b8d67a7958d1207f6ed871e83b1ea780e7b0 # v3.3.1
2020
with:
21-
version: v2025.9.15
22-
sha256: ea3be29bf97e4a11f57706fcd779dcc719598c22125d47e99182092c83814baa
21+
version: v2025.10.11
22+
sha256: 589cac941160e404d13be6f5699a25ffdb25b732084430338bc384df9f0a4438
2323
- name: Cache local Maven repository
2424
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
2525
with:

‎docs/content/exporters/unicode.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ title: Unicode
33
weight: 2
44
---
55

6+
{{< hint type=warning >}}
7+
Unicode support is experimental, because [OpenMetrics specification](https://openmetrics.io/) is not
8+
updated yet to support Unicode characters in metric and label names.
9+
{{< /hint >}}
10+
611
The Prometheus Java client library allows all Unicode characters, that can be encoded as UTF-8.
712

813
At scrape time, some characters are replaced based on the `encoding` header according

‎examples/example-exemplars-tail-sampling/docker-compose.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ services:
3636
- -jar
3737
- /example-greeting-service.jar
3838
collector:
39-
image: otel/opentelemetry-collector-contrib:0.136.0@sha256:45392d534c1edcc809c2d112394029246bc679d2ae5ea7081414a1fc74f2c621
39+
image: otel/opentelemetry-collector-contrib:0.138.0@sha256:4a951ff0a9772f4fa8e9c7a326434370301b98b2b813933468dcb54aa6a6b5e5
4040
network_mode: host
4141
volumes:
4242
- ./config/otelcol-config.yaml:/config.yaml
4343
command:
4444
- --config=file:/config.yaml
4545
prometheus:
46-
image: prom/prometheus:v3.6.0@sha256:76947e7ef22f8a698fc638f706685909be425dbe09bd7a2cd7aca849f79b5f64
46+
image: prom/prometheus:v3.7.2@sha256:23031bfe0e74a13004252caaa74eccd0d62b6c6e7a04711d5b8bf5b7e113adc7
4747
network_mode: host
4848
volumes:
4949
- ./config/prometheus.yaml:/prometheus.yaml
@@ -52,14 +52,14 @@ services:
5252
- --enable-feature=native-histograms
5353
- --config.file=/prometheus.yaml
5454
tempo:
55-
image: grafana/tempo:2.8.2@sha256:0ef775495967cd5d7a6b2e146b6ea695d624803c8db8349fb8ce4164f719f9b7
55+
image: grafana/tempo:2.9.0@sha256:65a5789759435f1ef696f1953258b9bbdb18eb571d5ce711ff812d2e128288a4
5656
network_mode: host
5757
volumes:
5858
- ./config/tempo-config.yaml:/config.yaml
5959
command:
6060
- --config.file=/config.yaml
6161
grafana:
62-
image: grafana/grafana:12.2.0@sha256:74144189b38447facf737dfd0f3906e42e0776212bf575dc3334c3609183adf7
62+
image: grafana/grafana:12.2.1@sha256:35c41e0fd0295f5d0ee5db7e780cf33506abfaf47686196f825364889dee878b
6363
network_mode: host
6464
ports:
6565
- "3000:3000"

0 commit comments

Comments
 (0)