Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b13854d

Browse files
lenoch7lenoch7
authored
Fixes #1431 - shaded exposition-formats/exported-opentelemetry (#1441)
Fixes #1431 issue, where shaded exposition-formats/exported-opentelemetry artifacts depends on "no shaded" protobuf/otel dependency (caused by #1293). See details in #1431 issue. Signed-off-by: Radek Kraus <[email protected]>
1 parent d4bb3a7 commit b13854d

File tree

2 files changed

+216
-2
lines changed
  • prometheus-metrics-exporter-opentelemetry-shaded
  • prometheus-metrics-exposition-formats-shaded

2 files changed

+216
-2
lines changed

‎prometheus-metrics-exporter-opentelemetry-shaded/pom.xml‎

Lines changed: 142 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,133 @@
2121
<automatic.module.name>io.prometheus.metrics.exporter.opentelemetry</automatic.module.name>
2222
</properties>
2323

24+
<dependencyManagement>
25+
<dependencies>
26+
<dependency>
27+
<groupId>io.opentelemetry.instrumentation</groupId>
28+
<artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
29+
<version>${otel.instrumentation.version}</version>
30+
<type>pom</type>
31+
<scope>import</scope>
32+
</dependency>
33+
</dependencies>
34+
</dependencyManagement>
35+
2436
<dependencies>
2537
<dependency>
2638
<groupId>io.prometheus</groupId>
27-
<artifactId>prometheus-metrics-exporter-opentelemetry-no-otel</artifactId>
39+
<artifactId>prometheus-metrics-core</artifactId>
2840
<version>${project.version}</version>
2941
</dependency>
42+
<dependency>
43+
<groupId>io.prometheus</groupId>
44+
<artifactId>prometheus-metrics-exporter-opentelemetry-otel-agent-resources</artifactId>
45+
<version>${project.version}</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>io.opentelemetry</groupId>
49+
<artifactId>opentelemetry-api</artifactId>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.opentelemetry</groupId>
53+
<artifactId>opentelemetry-sdk</artifactId>
54+
</dependency>
55+
<dependency>
56+
<groupId>io.opentelemetry</groupId>
57+
<artifactId>opentelemetry-exporter-otlp</artifactId>
58+
</dependency>
59+
<dependency>
60+
<groupId>io.opentelemetry</groupId>
61+
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
62+
</dependency>
63+
<dependency>
64+
<groupId>io.opentelemetry</groupId>
65+
<artifactId>opentelemetry-sdk-extension-incubator</artifactId>
66+
</dependency>
67+
<dependency>
68+
<groupId>io.opentelemetry.instrumentation</groupId>
69+
<artifactId>opentelemetry-resources</artifactId>
70+
</dependency>
71+
72+
<!-- test dependencies -->
73+
<dependency>
74+
<groupId>org.wiremock</groupId>
75+
<artifactId>wiremock</artifactId>
76+
<version>3.13.1</version>
77+
<scope>test</scope>
78+
<exclusions>
79+
<exclusion>
80+
<groupId>org.hamcrest</groupId>
81+
<artifactId>hamcrest-core</artifactId>
82+
</exclusion>
83+
</exclusions>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.awaitility</groupId>
87+
<artifactId>awaitility</artifactId>
88+
<version>4.3.0</version>
89+
<scope>test</scope>
90+
</dependency>
91+
<dependency>
92+
<groupId>io.opentelemetry</groupId>
93+
<artifactId>opentelemetry-proto</artifactId>
94+
<version>1.7.1-alpha</version>
95+
<scope>test</scope>
96+
</dependency>
97+
<dependency>
98+
<groupId>io.opentelemetry</groupId>
99+
<artifactId>opentelemetry-sdk-testing</artifactId>
100+
<scope>test</scope>
101+
</dependency>
30102
</dependencies>
31103

32104
<build>
105+
<resources>
106+
<resource>
107+
<directory>target/metrics-exporter-opentelemetry/src/main/resources-filtered</directory>
108+
<filtering>true</filtering>
109+
</resource>
110+
</resources>
111+
33112
<plugins>
113+
<plugin>
114+
<groupId>org.apache.maven.plugins</groupId>
115+
<artifactId>maven-resources-plugin</artifactId>
116+
<executions>
117+
<execution>
118+
<id>copy-metrics-exporter-opentelemetry-main</id>
119+
<phase>validate</phase>
120+
<goals>
121+
<goal>copy-resources</goal>
122+
</goals>
123+
<configuration>
124+
<outputDirectory>target/metrics-exporter-opentelemetry/src/main</outputDirectory>
125+
<resources>
126+
<resource>
127+
<directory>../prometheus-metrics-exporter-opentelemetry/src/main</directory>
128+
</resource>
129+
<resources>
130+
</resources>
131+
</resources>
132+
</configuration>
133+
</execution>
134+
<execution>
135+
<id>copy-metrics-exporter-opentelemetry-test</id>
136+
<phase>validate</phase>
137+
<goals>
138+
<goal>copy-resources</goal>
139+
</goals>
140+
<configuration>
141+
<outputDirectory>target/metrics-exporter-opentelemetry/src/test</outputDirectory>
142+
<resources>
143+
<resource>
144+
<directory>../prometheus-metrics-exporter-opentelemetry/src/test</directory>
145+
</resource>
146+
</resources>
147+
</configuration>
148+
</execution>
149+
</executions>
150+
</plugin>
34151
<plugin>
35152
<groupId>org.codehaus.mojo</groupId>
36153
<artifactId>build-helper-maven-plugin</artifactId>
@@ -48,6 +165,30 @@
48165
<failIfNoMatch>true</failIfNoMatch>
49166
</configuration>
50167
</execution>
168+
<execution>
169+
<id>metrics-exporter-opentelemetry-main</id>
170+
<phase>generate-sources</phase>
171+
<goals>
172+
<goal>add-source</goal>
173+
</goals>
174+
<configuration>
175+
<sources>
176+
<source>target/metrics-exporter-opentelemetry/src/main/java</source>
177+
</sources>
178+
</configuration>
179+
</execution>
180+
<execution>
181+
<id>add-metrics-exporter-opentelemetry-test</id>
182+
<phase>generate-sources</phase>
183+
<goals>
184+
<goal>add-test-source</goal>
185+
</goals>
186+
<configuration>
187+
<sources>
188+
<source>target/metrics-exporter-opentelemetry/src/test/java</source>
189+
</sources>
190+
</configuration>
191+
</execution>
51192
</executions>
52193
</plugin>
53194
<plugin>

‎prometheus-metrics-exposition-formats-shaded/pom.xml‎

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,61 @@
2525
<dependencies>
2626
<dependency>
2727
<groupId>io.prometheus</groupId>
28-
<artifactId>prometheus-metrics-exposition-formats-no-protobuf</artifactId>
28+
<artifactId>prometheus-metrics-exposition-textformats</artifactId>
2929
<version>${project.version}</version>
3030
</dependency>
31+
<dependency>
32+
<groupId>com.google.protobuf</groupId>
33+
<artifactId>protobuf-java</artifactId>
34+
<version>${protobuf-java.version}</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>io.prometheus</groupId>
38+
<artifactId>prometheus-metrics-exposition-textformats</artifactId>
39+
<version>${project.version}</version>
40+
<scope>test</scope>
41+
<type>test-jar</type>
42+
</dependency>
3143
</dependencies>
3244

3345
<build>
3446
<plugins>
47+
<plugin>
48+
<groupId>org.apache.maven.plugins</groupId>
49+
<artifactId>maven-resources-plugin</artifactId>
50+
<executions>
51+
<execution>
52+
<id>copy-metrics-exposition-formats-main</id>
53+
<phase>validate</phase>
54+
<goals>
55+
<goal>copy-resources</goal>
56+
</goals>
57+
<configuration>
58+
<outputDirectory>target/metrics-exposition-formats/src/main</outputDirectory>
59+
<resources>
60+
<resource>
61+
<directory>../prometheus-metrics-exposition-formats/src/main</directory>
62+
</resource>
63+
</resources>
64+
</configuration>
65+
</execution>
66+
<execution>
67+
<id>copy-metrics-exposition-formats-test</id>
68+
<phase>validate</phase>
69+
<goals>
70+
<goal>copy-resources</goal>
71+
</goals>
72+
<configuration>
73+
<outputDirectory>target/metrics-exposition-formats/src/test</outputDirectory>
74+
<resources>
75+
<resource>
76+
<directory>../prometheus-metrics-exposition-formats/src/test</directory>
77+
</resource>
78+
</resources>
79+
</configuration>
80+
</execution>
81+
</executions>
82+
</plugin>
3583
<plugin>
3684
<groupId>org.codehaus.mojo</groupId>
3785
<artifactId>build-helper-maven-plugin</artifactId>
@@ -49,6 +97,31 @@
4997
<failIfNoMatch>true</failIfNoMatch>
5098
</configuration>
5199
</execution>
100+
<execution>
101+
<id>add-metrics-exposition-formats-main</id>
102+
<phase>generate-sources</phase>
103+
<goals>
104+
<goal>add-source</goal>
105+
</goals>
106+
<configuration>
107+
<sources>
108+
<source>target/metrics-exposition-formats/src/main/java</source>
109+
<source>target/metrics-exposition-formats/src/main/generated</source>
110+
</sources>
111+
</configuration>
112+
</execution>
113+
<execution>
114+
<id>add-metrics-exposition-formats-test</id>
115+
<phase>generate-sources</phase>
116+
<goals>
117+
<goal>add-test-source</goal>
118+
</goals>
119+
<configuration>
120+
<sources>
121+
<source>target/metrics-exposition-formats/src/test/java</source>
122+
</sources>
123+
</configuration>
124+
</execution>
52125
</executions>
53126
</plugin>
54127
<plugin>

0 commit comments

Comments
 (0)