Skip to content
Draft
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 .codespellrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[codespell]
# Ignore words that are valid technical terms:
# - vertx: Vert.x reactive framework
# - errorprone: Error Prone static analysis tool
ignore-words-list = vertx,errorprone
# nd: legitimate variable name in quantile algorithms
# atmost: AssertJ atMost() matcher
# re-use: hyphenated form used in comments
# errorprone: Google ErrorProne tool name
ignore-words-list = nd,atmost,re-use,errorprone
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ indent_size = 2
[{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,.gitleaksignore,prometheus.properties}]
max_line_length = 200

[{grafana-dashboard-*.json,.editorconfig,super-linter.env,lychee.toml,renovate.json5}]
[{grafana-dashboard-*.json,.editorconfig,super-linter.env,lychee.toml,renovate.json5,CODE_OF_CONDUCT.md}]
max_line_length = 300

[pom.xml]
Expand All @@ -18,5 +18,5 @@ max_line_length = 210
indent_size = 4
max_line_length = 120

[{.mise/tasks/build-release.sh,.github/workflows/multi-version-test.yml}]
max_line_length = 200
[{.mise/tasks/build-release.sh,.github/workflows/*.yml}]
max_line_length = 300
3 changes: 3 additions & 0 deletions .github/config/.editorconfig-checker.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"Exclude": [".*\\.java$"]
}
10 changes: 10 additions & 0 deletions .github/config/flint.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[settings]
exclude = [
"**/src/main/generated/**",
"docs/themes/**",
"mvnw",
"simpleclient-archive/**",
]

[checks.renovate-deps]
exclude_managers = ["github-actions", "github-runners"]
126 changes: 95 additions & 31 deletions .github/renovate-tracked-deps.json
Original file line number Diff line number Diff line change
@@ -1,42 +1,68 @@
{
".github/renovate.json5": {
"renovate-config-presets": ["grafana/flint"]
"renovate-config-presets": [
"grafana/flint"
]
},
".github/workflows/acceptance-tests.yml": {
"regex": ["mise"]
"regex": [
"mise"
]
},
".github/workflows/build.yml": {
"regex": ["mise"]
"regex": [
"mise"
]
},
".github/workflows/generate-protobuf.yml": {
"regex": ["mise"]
"regex": [
"mise"
]
},
".github/workflows/github-pages.yaml": {
"regex": ["mise"]
"regex": [
"mise"
]
},
".github/workflows/java-version-matrix-tests.yml": {
"regex": ["mise"]
"regex": [
"mise"
]
},
".github/workflows/lint.yml": {
"regex": ["mise"]
"regex": [
"mise"
]
},
".github/workflows/native-tests.yml": {
"regex": ["mise"]
"regex": [
"mise"
]
},
".github/workflows/nightly-benchmarks.yml": {
"regex": ["mise"]
"regex": [
"mise"
]
},
".github/workflows/release.yml": {
"regex": ["mise"]
"regex": [
"mise"
]
},
".github/workflows/test-release-build.yml": {
"regex": ["mise"]
"regex": [
"mise"
]
},
".mise/envs/native/mise.toml": {
"mise": ["java"]
"mise": [
"java"
]
},
".mvn/wrapper/maven-wrapper.properties": {
"maven-wrapper": ["maven"]
"maven-wrapper": [
"maven"
]
},
"benchmarks/pom.xml": {
"maven": [
Expand Down Expand Up @@ -94,13 +120,21 @@
]
},
"integration-tests/it-exporter/it-exporter-test/pom.xml": {
"maven": ["io.prometheus:it-common", "io.prometheus:it-exporter"]
"maven": [
"io.prometheus:it-common",
"io.prometheus:it-exporter"
]
},
"integration-tests/it-exporter/it-no-protobuf-test/pom.xml": {
"maven": ["io.prometheus:it-common", "io.prometheus:it-exporter"]
"maven": [
"io.prometheus:it-common",
"io.prometheus:it-exporter"
]
},
"integration-tests/it-exporter/pom.xml": {
"maven": ["io.prometheus:integration-tests"]
"maven": [
"io.prometheus:integration-tests"
]
},
"integration-tests/it-pushgateway/pom.xml": {
"maven": [
Expand All @@ -114,7 +148,6 @@
},
"integration-tests/it-spring-boot-smoke-test/pom.xml": {
"maven": [
"com.diffplug.spotless:spotless-maven-plugin",
"io.prometheus:it-common",
"io.prometheus:prometheus-metrics-bom",
"org.junit:junit-bom",
Expand All @@ -130,22 +163,35 @@
},
"mise.toml": {
"mise": [
"actionlint",
"cargo:https://github.com/grafana/flint",
"cargo:xmloxide",
"editorconfig-checker",
"github:google/google-java-format",
"go:github.com/gohugoio/hugo",
"go:github.com/grafana/oats",
"java",
"lychee",
"node",
"npm:markdownlint-cli2",
"npm:prettier",
"npm:renovate",
"pipx:codespell",
"pipx:ruff",
"protoc",
"ubi:google/google-java-format"
],
"regex": ["ghcr.io/super-linter/super-linter", "grafana/flint"]
"shellcheck",
"shfmt"
]
},
"mvnw": {
"maven-wrapper": ["maven-wrapper"]
"maven-wrapper": [
"maven-wrapper"
]
},
"mvnw.cmd": {
"maven-wrapper": ["maven-wrapper"]
"maven-wrapper": [
"maven-wrapper"
]
},
"pom.xml": {
"maven": [
Expand Down Expand Up @@ -219,7 +265,9 @@
]
},
"prometheus-metrics-config/pom.xml": {
"maven": ["io.prometheus:client_java"]
"maven": [
"io.prometheus:client_java"
]
},
"prometheus-metrics-core/pom.xml": {
"maven": [
Expand All @@ -241,7 +289,10 @@
]
},
"prometheus-metrics-exporter-httpserver/pom.xml": {
"maven": ["io.prometheus:client_java", "io.prometheus:prometheus-metrics-exporter-common"]
"maven": [
"io.prometheus:client_java",
"io.prometheus:prometheus-metrics-exporter-common"
]
},
"prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml": {
"maven": [
Expand Down Expand Up @@ -350,14 +401,18 @@
]
},
"prometheus-metrics-model/pom.xml": {
"maven": ["io.prometheus:client_java", "io.prometheus:prometheus-metrics-config"]
"maven": [
"io.prometheus:client_java",
"io.prometheus:prometheus-metrics-config"
]
},
"prometheus-metrics-otel-support/pom.xml": {
"maven": ["io.prometheus:client_java"]
"maven": [
"io.prometheus:client_java"
]
},
"prometheus-metrics-parent/pom.xml": {
"maven": [
"com.diffplug.spotless:spotless-maven-plugin",
"org.apache.maven.plugins:maven-gpg-plugin",
"org.apache.maven.plugins:maven-source-plugin",
"org.sonatype.central:central-publishing-maven-plugin"
Expand All @@ -374,10 +429,14 @@
]
},
"prometheus-metrics-tracer/pom.xml": {
"maven": ["io.prometheus:client_java"]
"maven": [
"io.prometheus:client_java"
]
},
"prometheus-metrics-tracer/prometheus-metrics-tracer-common/pom.xml": {
"maven": ["io.prometheus:prometheus-metrics-tracer"]
"maven": [
"io.prometheus:prometheus-metrics-tracer"
]
},
"prometheus-metrics-tracer/prometheus-metrics-tracer-initializer/pom.xml": {
"maven": [
Expand All @@ -400,7 +459,9 @@
]
},
"simpleclient-archive/integration_tests/it_common/pom.xml": {
"maven": ["io.prometheus:integration_tests"]
"maven": [
"io.prometheus:integration_tests"
]
},
"simpleclient-archive/integration_tests/it_exemplars_otel_agent/pom.xml": {
"maven": [
Expand Down Expand Up @@ -475,7 +536,10 @@
]
},
"simpleclient-archive/simpleclient_graphite_bridge/pom.xml": {
"maven": ["io.prometheus:client_java", "io.prometheus:simpleclient"]
"maven": [
"io.prometheus:client_java",
"io.prometheus:simpleclient"
]
},
"simpleclient-archive/simpleclient_hibernate/pom.xml": {
"maven": [
Expand Down
22 changes: 10 additions & 12 deletions .github/workflows/java-version-matrix-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ name: Integration Tests - Java Version Compatibility Matrix
on:
pull_request:
paths:
- 'integration-tests/**'
- 'prometheus-metrics-core/**'
- 'prometheus-metrics-exporter-*/**'
- 'prometheus-metrics-exposition-*/**'
- '.github/workflows/java-version-matrix-tests.yml'
- "integration-tests/**"
- "prometheus-metrics-core/**"
- "prometheus-metrics-exporter-*/**"
- "prometheus-metrics-exposition-*/**"
- ".github/workflows/java-version-matrix-tests.yml"
push:
branches:
- main
Expand All @@ -23,7 +23,6 @@ jobs:
strategy:
fail-fast: false
matrix:
# Note: Java 8 runtime testing is skipped due to Spotless incompatibility
java-version: [11, 17, 21, 25]
steps:
- name: Check out
Expand All @@ -46,15 +45,14 @@ jobs:
${{ runner.os }}-maven-

- name: Build core library artifacts
run: mise exec -- ./mvnw install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn -pl '!integration-tests'
run: mise exec -- ./mvnw install -DskipTests -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn -pl '!integration-tests'

- name: Install parent POMs
run: |
cd integration-tests
mise exec -- ../mvnw clean install -N -Dspotless.skip=true
mise exec -- ../mvnw clean install -N
cd it-exporter
mise exec -- ../../mvnw install -N -Dspotless.skip=true

mise exec -- ../../mvnw install -N
- name: Rebuild sample apps targeting Java ${{ matrix.java-version }}
run: |
cd integration-tests
Expand All @@ -64,7 +62,7 @@ jobs:
else
MODULES="it-common,it-exporter/it-exporter-httpserver-sample,it-exporter/it-exporter-servlet-tomcat-sample,it-exporter/it-exporter-servlet-jetty-sample,it-exporter/it-exporter-no-protobuf,it-pushgateway"
fi
mise exec -- ../mvnw clean install -DskipTests -Dspotless.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn \
mise exec -- ../mvnw clean install -DskipTests -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn \
-Djava.version=${{ matrix.java-version }} \
-Dmaven.compiler.release=${{ matrix.java-version }} \
-pl $MODULES
Expand All @@ -80,5 +78,5 @@ jobs:
else
TEST_MODULES="it-exporter/it-exporter-test,it-exporter/it-no-protobuf-test,it-pushgateway"
fi
mise exec -- ../mvnw verify -T 2C -Dspotless.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn \
mise exec -- ../mvnw verify -T 2C -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn \
-pl $TEST_MODULES
2 changes: 1 addition & 1 deletion .github/workflows/multi-version-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ jobs:
${{ runner.os }}-maven-

- name: Build and test on Java ${{ matrix.java }}
run: ./mvnw clean install -Dtest.java.version=${{ matrix.java }} -Dspotless.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn -Dcoverage.skip=true
run: ./mvnw clean install -Dtest.java.version=${{ matrix.java }} -Dcheckstyle.skip=true -Dwarnings=-nowarn -Dcoverage.skip=true
6 changes: 6 additions & 0 deletions .markdownlint.jsonc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
// Line length — pre-existing across docs, README, benchmarks
"MD013": false,
// Inline HTML — needed for badge images in README
"MD033": false
}
Loading
Loading