Skip to content

Commit c9bb30b

Browse files
zeitlingerzeitlinger
authored
include shaded protobuf directly (#1063)
* include shaded protobuf directly Signed-off-by: Gregor Zeitlinger <[email protected]> * include shaded protobuf directly Signed-off-by: Gregor Zeitlinger <[email protected]> � Conflicts: � prometheus-metrics-shaded-dependencies/pom.xml * remove shaded deps Signed-off-by: Gregor Zeitlinger <[email protected]> * format Signed-off-by: Gregor Zeitlinger <[email protected]> * fix shading Signed-off-by: Gregor Zeitlinger <[email protected]> * fix shading Signed-off-by: Gregor Zeitlinger <[email protected]> * fix shading Signed-off-by: Gregor Zeitlinger <[email protected]> * re-enable shading Signed-off-by: Gregor Zeitlinger <[email protected]> * re-enable shading Signed-off-by: Gregor Zeitlinger <[email protected]> * only build proto on CI Signed-off-by: Gregor Zeitlinger <[email protected]> * only build proto on CI Signed-off-by: Gregor Zeitlinger <[email protected]> * update protobuf Signed-off-by: Gregor Zeitlinger <[email protected]> * update protobuf Signed-off-by: Gregor Zeitlinger <[email protected]> * update protobuf Signed-off-by: Gregor Zeitlinger <[email protected]> * update protobuf Signed-off-by: Gregor Zeitlinger <[email protected]> --------- Signed-off-by: Gregor Zeitlinger <[email protected]>
1 parent cdcf2d2 commit c9bb30b

File tree

22 files changed

+2114
-2773
lines changed

22 files changed

+2114
-2773
lines changed

‎.github/workflows/build.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,15 @@ jobs:
1717
java-version: 17
1818
distribution: temurin
1919
cache: 'maven'
20-
- name: Shaded dependencies
21-
run: |
22-
cd prometheus-metrics-shaded-dependencies
23-
../mvnw clean install
20+
- name: Install Protoc
21+
run: |
22+
VERSION=28.2
23+
curl -sL -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v$VERSION/protoc-$VERSION-linux-x86_64.zip
24+
sudo unzip protoc.zip -d /usr/local
2425
- name: Run the Maven verify phase
26+
env:
27+
PROTO_GENERATION: true
28+
REQUIRE_PROTO_UP_TO_DATE: true
2529
run: |
2630
./mvnw clean install
2731
./mvnw javadoc:javadoc

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

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,14 @@ jobs:
3434
HUGO_VERSION: 0.115.4
3535
JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
3636
steps:
37-
- name: Install OpenJDK 17
38-
run: sudo apt-get -q install -y openjdk-17-jdk
39-
- name: Make 17 the default java version
40-
run: sudo update-alternatives --set java /usr/lib/jvm/java-17-openjdk-amd64/bin/java
41-
- name: Make 17 the default javadoc version
42-
run: sudo update-alternatives --set javadoc /usr/lib/jvm/java-17-openjdk-amd64/bin/javadoc
43-
- name: Print java and javadoc versions
44-
run: |
45-
echo 'java --version' && \
46-
java --version && \
47-
echo 'javadoc --version' && \
48-
javadoc --version && \
49-
echo 'echo $JAVA_HOME' && \
50-
echo $JAVA_HOME
37+
- name: Set up JDK
38+
uses: actions/setup-java@v4
39+
with:
40+
java-version: 17
41+
distribution: temurin
42+
cache: 'maven'
43+
- name: Install Protoc
44+
uses: zchee/setup-protoc@v1
5145
- name: Install Hugo CLI
5246
run: |
5347
wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \

‎MAINTAINER_NOTES.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,7 @@ Create a commit to remove dependencies from the build (undoing the first step):
6565

6666
* Comment out the `prometheus-metrics-shaded-dependencies` module to the root `pom.xml`.
6767
* Change the versions of the shaded dependencies to the latest released version on Maven Central in `prometheus-metrics-exporter-opentelemetry`, `prometheus-metrics-exposition-formats`, and `prometheus-metrics-bom`.
68+
69+
## Notes
70+
71+
- `PROTO_GENERATION=true mvn clean install` to generate protobuf classes.

‎integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import io.prometheus.client.it.common.LogConsumer;
88
import io.prometheus.client.it.common.Volume;
9-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_3_25_3.Metrics;
9+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_28_2.Metrics;
1010
import java.io.ByteArrayInputStream;
1111
import java.io.IOException;
1212
import java.io.InputStream;

‎pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
<module>prometheus-metrics-instrumentation-dropwizard5</module>
6868
<module>prometheus-metrics-instrumentation-guava</module>
6969
<module>prometheus-metrics-simpleclient-bridge</module>
70-
<!-- <module>prometheus-metrics-shaded-dependencies</module> -->
7170
<module>examples</module>
7271
<module>benchmarks</module>
7372
<module>integration-tests</module>

‎prometheus-metrics-bom/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -112,18 +112,6 @@
112112
<artifactId>prometheus-metrics-tracer-otel-agent</artifactId>
113113
<version>${project.version}</version>
114114
</dependency>
115-
<dependency>
116-
<groupId>io.prometheus</groupId>
117-
<artifactId>prometheus-metrics-shaded-dependencies</artifactId>
118-
<version>${prometheus.metrics.shaded.dependencies.version}</version>
119-
<!-- <version>${project.version}</version> -->
120-
</dependency>
121-
<dependency>
122-
<groupId>io.prometheus</groupId>
123-
<artifactId>prometheus-metrics-shaded-protobuf</artifactId>
124-
<version>${prometheus.metrics.shaded.dependencies.version}</version>
125-
<!-- <version>${project.version}</version> -->
126-
</dependency>
127115
</dependencies>
128116
</dependencyManagement>
129117
</project>

‎prometheus-metrics-core/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<parent>

‎prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
99
import io.prometheus.metrics.expositionformats.PrometheusProtobufWriter;
10-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_3_25_3.Metrics;
10+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_28_2.Metrics;
1111
import io.prometheus.metrics.model.snapshots.CounterSnapshot;
1212
import io.prometheus.metrics.model.snapshots.Exemplar;
1313
import io.prometheus.metrics.model.snapshots.Label;
1414
import io.prometheus.metrics.model.snapshots.Labels;
1515
import io.prometheus.metrics.model.snapshots.Unit;
16-
import io.prometheus.metrics.shaded.com_google_protobuf_3_25_3.TextFormat;
16+
import io.prometheus.metrics.shaded.com_google_protobuf_4_28_2.TextFormat;
1717
import io.prometheus.metrics.tracer.common.SpanContext;
1818
import io.prometheus.metrics.tracer.initializer.SpanContextSupplier;
1919
import java.util.Arrays;

‎prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
1010
import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
1111
import io.prometheus.metrics.expositionformats.PrometheusProtobufWriter;
12-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_3_25_3.Metrics;
12+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_28_2.Metrics;
1313
import io.prometheus.metrics.model.snapshots.ClassicHistogramBucket;
1414
import io.prometheus.metrics.model.snapshots.Exemplar;
1515
import io.prometheus.metrics.model.snapshots.Exemplars;
1616
import io.prometheus.metrics.model.snapshots.HistogramSnapshot;
1717
import io.prometheus.metrics.model.snapshots.Labels;
1818
import io.prometheus.metrics.model.snapshots.MetricSnapshots;
19-
import io.prometheus.metrics.shaded.com_google_protobuf_3_25_3.TextFormat;
19+
import io.prometheus.metrics.shaded.com_google_protobuf_4_28_2.TextFormat;
2020
import io.prometheus.metrics.tracer.common.SpanContext;
2121
import io.prometheus.metrics.tracer.initializer.SpanContextSupplier;
2222
import java.io.ByteArrayOutputStream;

‎prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/InfoTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
77
import io.prometheus.metrics.expositionformats.PrometheusProtobufWriter;
8-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_3_25_3.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_28_2.Metrics;
99
import io.prometheus.metrics.model.snapshots.Labels;
1010
import io.prometheus.metrics.model.snapshots.MetricSnapshots;
11-
import io.prometheus.metrics.shaded.com_google_protobuf_3_25_3.TextFormat;
11+
import io.prometheus.metrics.shaded.com_google_protobuf_4_28_2.TextFormat;
1212
import java.io.ByteArrayOutputStream;
1313
import java.io.IOException;
1414
import java.nio.charset.StandardCharsets;

0 commit comments

Comments
 (0)