File tree Expand file tree Collapse file tree 11 files changed +934
-930
lines changed
it-common/src/test/java/io/prometheus/client/it/common
it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test
it-spring-boot-smoke-test/src/test/java/io/prometheus/metrics/it/springboot
prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics
prometheus-metrics-exposition-formats
generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_32_0
java/io/prometheus/metrics/expositionformats/internal
test/java/io/prometheus/metrics/expositionformats Expand file tree Collapse file tree 11 files changed +934
-930
lines changed Original file line number Diff line number Diff line change 44import static org .assertj .core .api .Assertions .assertThat ;
55import static org .assertj .core .api .Assertions .fail ;
66
7- import io .prometheus .metrics .expositionformats .generated .com_google_protobuf_4_31_1 .Metrics ;
7+ import io .prometheus .metrics .expositionformats .generated .com_google_protobuf_4_32_0 .Metrics ;
88import java .io .ByteArrayInputStream ;
99import java .io .IOException ;
1010import java .io .InputStream ;
Original file line number Diff line number Diff line change 55
66import com .google .common .io .Resources ;
77import io .prometheus .client .it .common .ExporterTest ;
8- import io .prometheus .metrics .expositionformats .generated .com_google_protobuf_4_31_1 .Metrics ;
8+ import io .prometheus .metrics .expositionformats .generated .com_google_protobuf_4_32_0 .Metrics ;
99import java .io .IOException ;
1010import java .net .URISyntaxException ;
1111import java .net .URLEncoder ;
Original file line number Diff line number Diff line change 33import static org .assertj .core .api .Assertions .assertThat ;
44
55import io .prometheus .client .it .common .ExporterTest ;
6- import io .prometheus .metrics .expositionformats .generated .com_google_protobuf_4_31_1 .Metrics ;
6+ import io .prometheus .metrics .expositionformats .generated .com_google_protobuf_4_32_0 .Metrics ;
77import java .io .IOException ;
88import java .net .URL ;
99import java .util .List ;
Original file line number Diff line number Diff line change @@ -16,6 +16,10 @@ env.PROTO_GENERATION = "true"
1616description = " format source code"
1717run = " ./mvnw spotless:apply"
1818
19+ [tasks .clean ]
20+ description = " clean all modules"
21+ run = " ./mvnw clean"
22+
1923[tasks .compile ]
2024description = " bare compile, ignoring formatting and linters"
2125run = " ./mvnw install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn"
@@ -35,7 +39,7 @@ run = "./mvnw verify"
3539
3640[tasks .build ]
3741description = " build all modules wihthout tests"
38- run = " ./mvnw install -DskipTests"
42+ run = " ./mvnw install -DskipTests -Dcoverage.skip=true "
3943
4044[tasks .lint ]
4145run = " scripts/super-linter.sh"
Original file line number Diff line number Diff line change 88import io .prometheus .metrics .config .MetricsProperties ;
99import io .prometheus .metrics .config .PrometheusProperties ;
1010import io .prometheus .metrics .core .exemplars .ExemplarSamplerConfigTestUtil ;
11- import io .prometheus .metrics .expositionformats .generated .com_google_protobuf_4_31_1 .Metrics ;
11+ import io .prometheus .metrics .expositionformats .generated .com_google_protobuf_4_32_0 .Metrics ;
1212import io .prometheus .metrics .expositionformats .internal .PrometheusProtobufWriterImpl ;
1313import io .prometheus .metrics .expositionformats .internal .ProtobufUtil ;
1414import io .prometheus .metrics .model .snapshots .CounterSnapshot ;
Original file line number Diff line number Diff line change 1010import io .prometheus .metrics .core .datapoints .DistributionDataPoint ;
1111import io .prometheus .metrics .core .exemplars .ExemplarSamplerConfigTestUtil ;
1212import io .prometheus .metrics .expositionformats .OpenMetricsTextFormatWriter ;
13- import io .prometheus .metrics .expositionformats .generated .com_google_protobuf_4_31_1 .Metrics ;
13+ import io .prometheus .metrics .expositionformats .generated .com_google_protobuf_4_32_0 .Metrics ;
1414import io .prometheus .metrics .expositionformats .internal .PrometheusProtobufWriterImpl ;
1515import io .prometheus .metrics .expositionformats .internal .ProtobufUtil ;
1616import io .prometheus .metrics .model .snapshots .ClassicHistogramBucket ;
Original file line number Diff line number Diff line change 44import static org .assertj .core .api .Assertions .assertThatExceptionOfType ;
55
66import io .prometheus .metrics .expositionformats .OpenMetricsTextFormatWriter ;
7- import io .prometheus .metrics .expositionformats .generated .com_google_protobuf_4_31_1 .Metrics ;
7+ import io .prometheus .metrics .expositionformats .generated .com_google_protobuf_4_32_0 .Metrics ;
88import io .prometheus .metrics .expositionformats .internal .PrometheusProtobufWriterImpl ;
99import io .prometheus .metrics .expositionformats .internal .ProtobufUtil ;
1010import io .prometheus .metrics .model .snapshots .Labels ;
Original file line number Diff line number Diff line change @@ -38,14 +38,14 @@ GENERATED_WITH=$(grep -oP '\/\/ Protobuf Java Version: \K.*' "$TARGET_DIR/${PACK
3838if [[ $GENERATED_WITH != " $PROTOBUF_VERSION " ]]; then
3939 echo " Generated protobuf sources version $GENERATED_WITH does not match provided version $PROTOBUF_VERSION "
4040 echo " Please use https://mise.jdx.dev/ - this will use the version specified in mise.toml"
41- echo " Generated protobuf sources are not up-to-date. Please run 'mise up && mise run generater ' and commit the changes."
41+ echo " Generated protobuf sources are not up-to-date. Please run 'mise self-update && mise up && mise run generate ' and commit the changes."
4242 exit 1
4343fi
4444
4545STATUS=$( git status --porcelain)
4646if [[ ${REQUIRE_PROTO_UP_TO_DATE:- false} == " true" && -n " $STATUS " ]]; then
4747 echo " Please use https://mise.jdx.dev/ - this will use the version specified in mise.toml"
48- echo " Generated protobuf sources are not up-to-date. Please run 'mise run generate' and commit the changes."
48+ echo " Generated protobuf sources are not up-to-date. Please run 'mise self-update && mise up && mise run generate' and commit the changes."
4949 echo " Local changes:"
5050 echo " $STATUS "
5151 exit 1
You can’t perform that action at this time.
0 commit comments