Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .mise/lib/jmx_exporter_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
"JMX_EXPORTER_REPOSITORY", "prometheus/jmx_exporter"
)
DEFAULT_JMX_EXPORTER_REMOTE = os.environ.get("JMX_EXPORTER_REMOTE", "origin")
# Test jmx_exporter main rather than the latest release: the integration_test_suite
# only compiles against client_java once a release adopts the stable Metrics class
# (see the tracking issue referenced in mise.toml's DEFAULT_JMX_EXPORTER_VERSION).
DEFAULT_JMX_EXPORTER_REF = os.environ.get("JMX_EXPORTER_REF") or "main"
DEFAULT_JMX_EXPORTER_REF = (
os.environ.get("JMX_EXPORTER_REF")
or os.environ.get("DEFAULT_JMX_EXPORTER_VERSION")
or "main"
)
DEFAULT_PROM_VERSION = os.environ.get("PROM_VERSION")

# Quick test configuration: the integration_test_suite runs one matrix cell
Expand Down
6 changes: 1 addition & 5 deletions mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@ zizmor = "1.25.2"
FLINT_CONFIG_DIR = ".github/config"
# renovate: datasource=github-releases depName=grafana/docker-otel-lgtm
LGTM_VERSION = "0.28.0"
# Latest JMX Exporter release. The compatibility job currently tests `main`
# instead (see #2179): release 1.5.0 imports client_java's version-stamped
# protobuf package directly, which breaks when we bump protobuf; main uses the
# stable Metrics class. Kept renovate-tracked so the target is current when we
# switch the ref back to this release.
# Latest JMX Exporter release; used as the default ref for the compatibility job.
# renovate: datasource=github-tags depName=prometheus/jmx_exporter versioning=semver-coerced
DEFAULT_JMX_EXPORTER_VERSION = "v1.6.0"
# renovate: datasource=github-tags depName=micrometer-metrics/micrometer versioning=semver-coerced
Expand Down