From 9ab4203b499140b6ae59cec598c3746615919473 Mon Sep 17 00:00:00 2001
From: Radek Kraus <6397085+lenoch7@users.noreply.github.com>
Date: Mon, 30 Jun 2025 18:42:53 +0200
Subject: [PATCH] Fixes #1431 - shaded
exposition-formats/exported-opentelemetry
Fixes #1431 issue, where shaded exposition-formats/exported-opentelemetry
artifacts depends on "no shaded" protobuf/otel dependency (caused by #1293).
Signed-off-by: Radek Kraus <6397085+lenoch7@users.noreply.github.com>
---
.../pom.xml | 143 +++++++++++++++++-
.../pom.xml | 75 ++++++++-
2 files changed, 216 insertions(+), 2 deletions(-)
diff --git a/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml b/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml
index ff59819a0..2b5c67da4 100644
--- a/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml
+++ b/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml
@@ -21,16 +21,133 @@
io.prometheus.metrics.exporter.opentelemetry
+
+
+
+ io.opentelemetry.instrumentation
+ opentelemetry-instrumentation-bom-alpha
+ ${otel.instrumentation.version}
+ pom
+ import
+
+
+
+
io.prometheus
- prometheus-metrics-exporter-opentelemetry-no-otel
+ prometheus-metrics-core
${project.version}
+
+ io.prometheus
+ prometheus-metrics-exporter-opentelemetry-otel-agent-resources
+ ${project.version}
+
+
+ io.opentelemetry
+ opentelemetry-api
+
+
+ io.opentelemetry
+ opentelemetry-sdk
+
+
+ io.opentelemetry
+ opentelemetry-exporter-otlp
+
+
+ io.opentelemetry
+ opentelemetry-sdk-extension-autoconfigure
+
+
+ io.opentelemetry
+ opentelemetry-sdk-extension-incubator
+
+
+ io.opentelemetry.instrumentation
+ opentelemetry-resources
+
+
+
+
+ org.wiremock
+ wiremock
+ 3.13.1
+ test
+
+
+ org.hamcrest
+ hamcrest-core
+
+
+
+
+ org.awaitility
+ awaitility
+ 4.3.0
+ test
+
+
+ io.opentelemetry
+ opentelemetry-proto
+ 1.7.1-alpha
+ test
+
+
+ io.opentelemetry
+ opentelemetry-sdk-testing
+ test
+
+
+
+ target/metrics-exporter-opentelemetry/src/main/resources-filtered
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+
+
+ copy-metrics-exporter-opentelemetry-main
+ validate
+
+ copy-resources
+
+
+ target/metrics-exporter-opentelemetry/src/main
+
+
+ ../prometheus-metrics-exporter-opentelemetry/src/main
+
+
+
+
+
+
+
+ copy-metrics-exporter-opentelemetry-test
+ validate
+
+ copy-resources
+
+
+ target/metrics-exporter-opentelemetry/src/test
+
+
+ ../prometheus-metrics-exporter-opentelemetry/src/test
+
+
+
+
+
+
org.codehaus.mojo
build-helper-maven-plugin
@@ -48,6 +165,30 @@
true
+
+ metrics-exporter-opentelemetry-main
+ generate-sources
+
+ add-source
+
+
+
+ target/metrics-exporter-opentelemetry/src/main/java
+
+
+
+
+ add-metrics-exporter-opentelemetry-test
+ generate-sources
+
+ add-test-source
+
+
+
+ target/metrics-exporter-opentelemetry/src/test/java
+
+
+
diff --git a/prometheus-metrics-exposition-formats-shaded/pom.xml b/prometheus-metrics-exposition-formats-shaded/pom.xml
index f57c3b197..1d64a2ad8 100644
--- a/prometheus-metrics-exposition-formats-shaded/pom.xml
+++ b/prometheus-metrics-exposition-formats-shaded/pom.xml
@@ -25,13 +25,61 @@
io.prometheus
- prometheus-metrics-exposition-formats-no-protobuf
+ prometheus-metrics-exposition-textformats
${project.version}
+
+ com.google.protobuf
+ protobuf-java
+ ${protobuf-java.version}
+
+
+ io.prometheus
+ prometheus-metrics-exposition-textformats
+ ${project.version}
+ test
+ test-jar
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+
+
+ copy-metrics-exposition-formats-main
+ validate
+
+ copy-resources
+
+
+ target/metrics-exposition-formats/src/main
+
+
+ ../prometheus-metrics-exposition-formats/src/main
+
+
+
+
+
+ copy-metrics-exposition-formats-test
+ validate
+
+ copy-resources
+
+
+ target/metrics-exposition-formats/src/test
+
+
+ ../prometheus-metrics-exposition-formats/src/test
+
+
+
+
+
+
org.codehaus.mojo
build-helper-maven-plugin
@@ -49,6 +97,31 @@
true
+
+ add-metrics-exposition-formats-main
+ generate-sources
+
+ add-source
+
+
+
+ target/metrics-exposition-formats/src/main/java
+ target/metrics-exposition-formats/src/main/generated
+
+
+
+
+ add-metrics-exposition-formats-test
+ generate-sources
+
+ add-test-source
+
+
+
+ target/metrics-exposition-formats/src/test/java
+
+
+