Skip to content

Commit 5b5bd33

Browse files
committed
test: validate Micrometer opt-in compatibility
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
1 parent 184ddac commit 5b5bd33

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

.github/workflows/micrometer-compatibility.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Micrometer Compatibility
2+
name: Micrometer Opt-In Compatibility
33

44
on:
55
pull_request:
@@ -8,11 +8,11 @@ on:
88
micrometer-repository:
99
description: Micrometer repository to test, in owner/name form
1010
required: false
11-
default: micrometer-metrics/micrometer
11+
default: zeitlinger/micrometer
1212
micrometer-ref:
1313
description: Micrometer branch, tag, or commit to test
1414
required: false
15-
default: main
15+
default: feat/prometheus-client-opt-in
1616

1717
permissions: {}
1818

@@ -34,6 +34,6 @@ jobs:
3434
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
3535
- name: Run Micrometer compatibility tests
3636
env:
37-
MICROMETER_REPOSITORY: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.micrometer-repository || 'micrometer-metrics/micrometer' }}
38-
MICROMETER_REF: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.micrometer-ref || 'main' }}
37+
MICROMETER_REPOSITORY: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.micrometer-repository || 'zeitlinger/micrometer' }}
38+
MICROMETER_REF: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.micrometer-ref || 'feat/prometheus-client-opt-in' }}
3939
run: mise run micrometer:test

.mise/lib/micrometer_compat.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
os.environ.get("MICROMETER_DIR", "/tmp/micrometer-compat")
1414
)
1515
DEFAULT_MICROMETER_REPOSITORY = os.environ.get(
16-
"MICROMETER_REPOSITORY", "micrometer-metrics/micrometer"
16+
"MICROMETER_REPOSITORY", "zeitlinger/micrometer"
1717
)
1818
DEFAULT_MICROMETER_REMOTE = os.environ.get("MICROMETER_REMOTE", "origin")
19-
DEFAULT_MICROMETER_REF = os.environ.get("MICROMETER_REF", "main")
19+
DEFAULT_MICROMETER_REF = os.environ.get(
20+
"MICROMETER_REF", "feat/prometheus-client-opt-in"
21+
)
2022
DEFAULT_INIT_SCRIPT = Path(
2123
os.environ.get("MICROMETER_INIT_SCRIPT", "/tmp/micrometer-prom-local.init.gradle")
2224
)

0 commit comments

Comments
 (0)