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

Skip to content

Fixes #1431 - shaded exposition-formats/exported-opentelemetry #1441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 4, 2025
Merged

Fixes #1431 - shaded exposition-formats/exported-opentelemetry #1441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
143 changes: 142 additions & 1 deletion prometheus-metrics-exporter-opentelemetry-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,133 @@
<automatic.module.name>io.prometheus.metrics.exporter.opentelemetry</automatic.module.name>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
<version>${otel.instrumentation.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>prometheus-metrics-exporter-opentelemetry-no-otel</artifactId>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This dependency also has java classes that are missing now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am sorry, but I didn't catch the point.

The classes from prometheus-metrics-exporter-opentelemetry-no-otel artifact (module directory prometheus-metrics-exporter-opentelemetry) are copied by maven-resources-plugin (see execution copy-metrics-exporter-opentelemetry-main) and then are relocated by maven-shade-plugin.

I see all classes (using correct "shaded" import statements) in io.prometheus:prometheus-metrics-exporter-opentelemetry artifact.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now I get it - that's a really nice solution!

<artifactId>prometheus-metrics-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>prometheus-metrics-exporter-opentelemetry-otel-agent-resources</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-extension-incubator</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-resources</artifactId>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<version>3.13.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-proto</artifactId>
<version>1.7.1-alpha</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-testing</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>target/metrics-exporter-opentelemetry/src/main/resources-filtered</directory>
<filtering>true</filtering>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-metrics-exporter-opentelemetry-main</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>target/metrics-exporter-opentelemetry/src/main</outputDirectory>
<resources>
<resource>
<directory>../prometheus-metrics-exporter-opentelemetry/src/main</directory>
</resource>
<resources>
</resources>
</resources>
</configuration>
</execution>
<execution>
<id>copy-metrics-exporter-opentelemetry-test</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>target/metrics-exporter-opentelemetry/src/test</outputDirectory>
<resources>
<resource>
<directory>../prometheus-metrics-exporter-opentelemetry/src/test</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand All @@ -48,6 +165,30 @@
<failIfNoMatch>true</failIfNoMatch>
</configuration>
</execution>
<execution>
<id>metrics-exporter-opentelemetry-main</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>target/metrics-exporter-opentelemetry/src/main/java</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-metrics-exporter-opentelemetry-test</id>
<phase>generate-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>target/metrics-exporter-opentelemetry/src/test/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down
75 changes: 74 additions & 1 deletion prometheus-metrics-exposition-formats-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,61 @@
<dependencies>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>prometheus-metrics-exposition-formats-no-protobuf</artifactId>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This dependency also has java classes that are missing now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am sorry, but I didn't catch the point.

The classes from prometheus-metrics-exposition-formats-no-protobuf artifact (module directory prometheus-metrics-exposition-formats) are copied by maven-resources-plugin ( see execution copy-metrics-exposition-formats-main) and then are relocated by maven-shade-plugin.

I see all classes (using shaded correct "shaded" import statement) in io.prometheus:prometheus-metrics-exposition-formats artifact.

<artifactId>prometheus-metrics-exposition-textformats</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf-java.version}</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>prometheus-metrics-exposition-textformats</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-metrics-exposition-formats-main</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>target/metrics-exposition-formats/src/main</outputDirectory>
<resources>
<resource>
<directory>../prometheus-metrics-exposition-formats/src/main</directory>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-metrics-exposition-formats-test</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>target/metrics-exposition-formats/src/test</outputDirectory>
<resources>
<resource>
<directory>../prometheus-metrics-exposition-formats/src/test</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand All @@ -49,6 +97,31 @@
<failIfNoMatch>true</failIfNoMatch>
</configuration>
</execution>
<execution>
<id>add-metrics-exposition-formats-main</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>target/metrics-exposition-formats/src/main/java</source>
<source>target/metrics-exposition-formats/src/main/generated</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-metrics-exposition-formats-test</id>
<phase>generate-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>target/metrics-exposition-formats/src/test/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down