Skip to content

Commit 184ddac

Browse files
zeitlingerzeitlinger
committed
Merge branch 'main' into feat/typed-metric-family-descriptor
2 parents e29470e + 3fc7b7b commit 184ddac

44 files changed

Lines changed: 1666 additions & 1166 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
CHANGELOG.md linguist-generated
2+
**/src/main/generated/** linguist-generated
3+
docs/** linguist-documentation

‎.github/config/flint.toml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
[settings]
2-
# These paths are generated, vendored, or handled by other checks.
3-
exclude = ["CHANGELOG.md", "**/src/main/generated/**", "docs/themes/**", "mvnw", "simpleclient-archive/**"]
4-
setup_migration_version = 2
2+
exclude = ["docs/themes/**", "mvnw", "simpleclient-archive/**"]
53

64
[checks.renovate-deps]
75
exclude_managers = ["github-actions", "github-runners", "maven"]

‎.github/renovate-tracked-deps.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"files": {
99
".github/renovate.json5": {
10-
"renovate-config-presets": [
10+
"renovate-config": [
1111
"grafana/flint"
1212
]
1313
},
@@ -41,6 +41,11 @@
4141
"mise"
4242
]
4343
},
44+
".github/workflows/micrometer-compatibility.yml": {
45+
"regex": [
46+
"mise"
47+
]
48+
},
4449
".github/workflows/native-tests.yml": {
4550
"regex": [
4651
"mise"
@@ -133,7 +138,8 @@
133138
"shellcheck",
134139
"shfmt",
135140
"taplo",
136-
"typos"
141+
"typos",
142+
"zizmor"
137143
]
138144
},
139145
"mvnw": {

‎.github/renovate.json5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
$schema: "https://docs.renovatebot.com/renovate-schema.json",
3-
extends: ["config:best-practices", "config:recommended", "github>grafana/flint#v0.22.2"],
3+
extends: ["config:best-practices", "config:recommended", "github>grafana/flint#v0.22.4"],
44
platformCommit: "enabled",
55
automerge: true,
66
ignorePaths: [

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1616
- uses: jdx/mise-action@1648a7812b9aeae629881980618f079932869151 # v4.0.1
1717
with:
18-
version: v2026.5.11
19-
sha256: 9bb41ae4dbe2bcdfdbe36cf3c737a8bdb72035c03af3b7218a70780988f62b9b
18+
version: v2026.5.18
19+
sha256: cfac593469d028d7ae5fe36e37bd7c59118b5238e92d8a876209578464f24a84
2020
- name: Run acceptance tests
2121
run: mise run acceptance-test

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@ jobs:
1414
persist-credentials: false
1515
- uses: jdx/mise-action@1648a7812b9aeae629881980618f079932869151 # v4.0.1
1616
with:
17-
version: v2026.5.11
18-
sha256: 9bb41ae4dbe2bcdfdbe36cf3c737a8bdb72035c03af3b7218a70780988f62b9b
17+
version: v2026.5.18
18+
sha256: cfac593469d028d7ae5fe36e37bd7c59118b5238e92d8a876209578464f24a84
1919
- name: Cache local Maven repository
2020
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
2121
with:
2222
path: ~/.m2/repository
2323
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
24-
restore-keys: |
25-
${{ runner.os }}-maven-
2624
- name: Run the Maven verify phase
2725
run: mise run ci

‎.github/workflows/codeql.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
name: CodeQL Security Analysis
3+
4+
on:
5+
push:
6+
branches: [main]
7+
pull_request:
8+
branches: [main]
9+
schedule:
10+
- cron: "29 13 * * 2" # Weekly Tuesday 13:29 UTC
11+
12+
permissions: {}
13+
14+
jobs:
15+
analyze:
16+
name: Analyze Java
17+
runs-on: ubuntu-24.04
18+
permissions:
19+
actions: read # required for github/codeql-action/init to get workflow details
20+
contents: read
21+
security-events: write # required for github/codeql-action/analyze to upload SARIF
22+
steps:
23+
- name: Checkout repository
24+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
25+
with:
26+
persist-credentials: false
27+
28+
- name: Set up Java
29+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
30+
with:
31+
distribution: temurin
32+
java-version: "25"
33+
34+
- name: Cache Maven repository
35+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
36+
with:
37+
path: ~/.m2/repository
38+
key: ${{ runner.os }}-maven-codeql-${{ hashFiles('**/pom.xml') }}
39+
- name: Initialize CodeQL
40+
uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
41+
with:
42+
languages: java
43+
tools: linked
44+
queries: security-extended
45+
46+
# Do not use autobuild — the multi-module Maven structure requires explicit
47+
# build invocation so that CodeQL can trace the compilation correctly.
48+
# Do not use mise-action here — CodeQL needs to trace the raw Maven build.
49+
- name: Build (CodeQL traces the build)
50+
run: >
51+
./mvnw clean compile
52+
-DskipTests
53+
-Dcoverage.skip=true
54+
-Dcheckstyle.skip=true
55+
-Djavadoc.skip=true
56+
57+
- name: Perform CodeQL Analysis
58+
uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
59+
with:
60+
category: /language:java

‎.github/workflows/generate-protobuf.yml‎

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,16 @@ jobs:
1212
generate:
1313
runs-on: ubuntu-24.04
1414
permissions:
15-
contents: write
15+
contents: read # checkout + read-only `git fetch origin main` for the verify step
1616
steps:
1717
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1818
with:
1919
ref: ${{ github.ref }}
20-
# zizmor: ignore[artipacked] -- needs credentials to push
21-
persist-credentials: true
20+
persist-credentials: false
2221
- uses: jdx/mise-action@1648a7812b9aeae629881980618f079932869151 # v4.0.1
2322
with:
24-
version: v2026.5.11
25-
sha256: 9bb41ae4dbe2bcdfdbe36cf3c737a8bdb72035c03af3b7218a70780988f62b9b
23+
version: v2026.5.18
24+
sha256: cfac593469d028d7ae5fe36e37bd7c59118b5238e92d8a876209578464f24a84
2625
- name: Cache local Maven repository
2726
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
2827
with:
@@ -45,18 +44,48 @@ jobs:
4544
fi
4645
- name: Generate protobuf sources
4746
run: mise run generate
48-
- name: Commit and push generated sources
47+
- name: Validate and export generated sources as a patch
4948
run: |
50-
git diff --quiet && exit 0
5149
UNEXPECTED=$(git diff --name-only | grep -v '\.java$' || true)
5250
if [[ -n "$UNEXPECTED" ]]; then
5351
echo "::error::Unexpected files changed:"
5452
echo "$UNEXPECTED"
5553
exit 1
5654
fi
55+
git diff --binary > /tmp/protobuf-sources.patch
56+
- name: Upload generated patch
57+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
58+
with:
59+
name: protobuf-sources-patch
60+
path: /tmp/protobuf-sources.patch
61+
retention-days: 5
62+
63+
publish:
64+
runs-on: ubuntu-24.04
65+
needs: generate
66+
permissions:
67+
contents: write # push regenerated sources back to the renovate branch
68+
steps:
69+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
70+
with:
71+
ref: ${{ github.ref }}
72+
# zizmor: ignore[artipacked] -- needs credentials to push
73+
persist-credentials: true
74+
- name: Download generated patch
75+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
76+
with:
77+
name: protobuf-sources-patch
78+
path: /tmp/patch
79+
- name: Commit and push generated sources
80+
run: |
81+
PATCH=/tmp/patch/protobuf-sources.patch
82+
if [[ ! -s "$PATCH" ]]; then
83+
echo "No generated changes to commit"
84+
exit 0
85+
fi
86+
git apply "$PATCH"
5787
# Note: GITHUB_TOKEN pushes don't trigger CI re-runs.
5888
# Close and reopen the PR to trigger CI after this commit.
59-
# TODO: switch to PROMBOT_GITHUB_TOKEN once it's added to this repo.
6089
git config user.name "github-actions[bot]"
6190
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
6291
git add '*.java'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
fetch-depth: 0
4040
- uses: jdx/mise-action@1648a7812b9aeae629881980618f079932869151 # v4.0.1
4141
with:
42-
version: v2026.5.11
43-
sha256: 9bb41ae4dbe2bcdfdbe36cf3c737a8bdb72035c03af3b7218a70780988f62b9b
42+
version: v2026.5.18
43+
sha256: cfac593469d028d7ae5fe36e37bd7c59118b5238e92d8a876209578464f24a84
4444
cache: "false"
4545
- name: Setup Pages
4646
id: pages

‎.github/workflows/issue-management-stale-action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# Handle stale PRs
2626
# - After 120 days inactive: Adds "stale" label + warning comment
2727
# - After 30 more days inactive: Closes
28-
- uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
28+
- uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
2929
with:
3030
days-before-issue-stale: -1
3131
days-before-issue-close: -1
@@ -43,7 +43,7 @@ jobs:
4343
# Handle stale issues
4444
# - After 360 days (12 months) inactive: Adds "stale" label + warning comment
4545
# - After 30 more days inactive: Closes
46-
- uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
46+
- uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
4747
with:
4848
days-before-issue-stale: 360
4949
days-before-issue-close: 30

0 commit comments

Comments
 (0)