Skip to content

Commit 16a8fd8

Browse files
committed
Merge remote-tracking branch 'origin/main' into ftorres/utf-8
# Conflicts: # prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusProperties.java # prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusScrapeHandler.java
2 parents 27362ee + 9581e40 commit 16a8fd8

File tree

40 files changed

+322
-118
lines changed

40 files changed

+322
-118
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ root = true
44
max_line_length = 100
55
indent_size = 2
66

7-
[{version-rules.xml,maven-wrapper.properties,checkstyle.xml,docker-compose.yaml,docker-compose.yml,Dockerfile,example_target_info.json,mise.toml,mvnm,mvnw.cmd,generate-protobuf.sh,super-linter.env,.gitleaksignore}]
7+
[{version-rules.xml,maven-wrapper.properties,checkstyle.xml,docker-compose.yaml,docker-compose.yml,Dockerfile,example_target_info.json,mise.toml,mvnm,mvnw.cmd,generate-protobuf.sh,super-linter.env,.gitleaksignore,*.json5}]
88
max_line_length = 200
99

1010
[{grafana-dashboard-*.json,.editorconfig}]

.github/renovate.json5

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,28 @@
44
platformCommit: "enabled",
55
automerge: true,
66
ignorePaths: [
7-
"**/simpleclient-archive/**", // old projects
7+
"**/simpleclient-archive/**",
8+
// old projects
89
// agent resources packages an OTel API that is the minimum required API version
910
"**/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml",
1011
],
1112
labels: ["dependencies"],
13+
packageRules: [
14+
{
15+
matchPackageNames: ["jdx/mise"],
16+
groupName: "mise",
17+
schedule: ["before 4am on monday"],
18+
},
19+
],
20+
customManagers: [
21+
{
22+
customType: "regex",
23+
description: "update mise",
24+
managerFilePatterns: ["/(^|/)(workflow-templates|\\.(?:github|gitea|forgejo)/(?:workflows|actions))/.+\\.ya?ml$/", "/(^|/)action\\.ya?ml$/"],
25+
datasourceTemplate: "github-release-attachments",
26+
packageNameTemplate: "jdx/mise",
27+
depNameTemplate: "mise",
28+
matchStrings: ["jdx/mise-action.*\\n\\s*with:\\s*\\n\\s*version: [\"']?(?<currentValue>v[.\\d]+)[\"']?\\s*\\n\\s*sha256: [\"']?(?<currentDigest>\\w+)[\"']?"],
29+
},
30+
],
1231
}

.github/workflows/acceptance-tests.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ jobs:
1313
with:
1414
persist-credentials: false
1515
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
16-
- uses: jdx/mise-action@5cb1df66ed5e1fb3c670ea0b62fd17a76979826a # v2.3.1
16+
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
17+
with:
18+
version: v2025.7.29
19+
sha256: 72e9e76d0e52998b0dc084c6550aef472091975978586980d703a87240a87fde
1720
- name: Run acceptance tests
1821
run: mise run acceptance-test

.github/workflows/build.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@ jobs:
1212
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1313
with:
1414
persist-credentials: false
15-
- uses: jdx/mise-action@5cb1df66ed5e1fb3c670ea0b62fd17a76979826a # v2.3.1
15+
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
16+
with:
17+
version: v2025.7.29
18+
sha256: 72e9e76d0e52998b0dc084c6550aef472091975978586980d703a87240a87fde
1619
- name: Cache local Maven repository
17-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
20+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
1821
with:
1922
path: ~/.m2/repository
2023
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/github-pages.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ jobs:
3737
persist-credentials: false
3838
fetch-tags: "true"
3939
fetch-depth: 0
40-
- uses: jdx/mise-action@5cb1df66ed5e1fb3c670ea0b62fd17a76979826a # v2.3.1
40+
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
4141
with:
42+
version: v2025.7.29
43+
sha256: 72e9e76d0e52998b0dc084c6550aef472091975978586980d703a87240a87fde
4244
cache: "false"
4345
- name: Setup Pages
4446
id: pages

.github/workflows/lint-rest.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ jobs:
1313
with:
1414
persist-credentials: false
1515
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16-
- uses: jdx/mise-action@5cb1df66ed5e1fb3c670ea0b62fd17a76979826a # v2.3.1
16+
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
17+
with:
18+
version: v2025.7.29
19+
sha256: 72e9e76d0e52998b0dc084c6550aef472091975978586980d703a87240a87fde
1720
- name: Lint
1821
run: mise run lint-rest

.github/workflows/native-tests.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ jobs:
1313
with:
1414
persist-credentials: false
1515
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
16-
- uses: jdx/mise-action@5cb1df66ed5e1fb3c670ea0b62fd17a76979826a # v2.3.1
16+
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
17+
with:
18+
version: v2025.7.29
19+
sha256: 72e9e76d0e52998b0dc084c6550aef472091975978586980d703a87240a87fde
1720
env:
1821
MISE_ENV: native
1922
- 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@12150456a73e248bdc94d0794898f94e23127c88 # v7.4.0
27+
uses: super-linter/super-linter@5119dcd8011e92182ce8219d9e9efc82f16fddb6 # v8.0.0
2828
env:
2929
# To report GitHub Actions status checks
3030
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@ jobs:
1616
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1717
with:
1818
persist-credentials: false
19-
- uses: jdx/mise-action@5cb1df66ed5e1fb3c670ea0b62fd17a76979826a # v2.3.1
19+
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
20+
with:
21+
version: v2025.7.29
22+
sha256: 72e9e76d0e52998b0dc084c6550aef472091975978586980d703a87240a87fde
2023
- name: Cache local Maven repository
21-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
24+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
2225
with:
2326
path: ~/.m2/repository
2427
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# under the License.
1717
wrapperVersion=3.3.2
1818
distributionType=only-script
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

0 commit comments

Comments
 (0)