Remove the otel-agent-resources Maven modul

Author: fstab

pom.xml

@@ -72,7 +72,6 @@
         <module>prometheus-metrics-exporter-servlet-javax</module>
         <module>prometheus-metrics-exporter-httpserver</module>
         <module>prometheus-metrics-exporter-opentelemetry</module>
-        <module>prometheus-metrics-exporter-opentelemetry-otel-agent-resources</module>
         <module>prometheus-metrics-exporter-pushgateway</module>
         <module>prometheus-metrics-instrumentation-caffeine</module>
         <module>prometheus-metrics-instrumentation-jvm</module>

prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,6 +20,8 @@
 
     <properties>
         <automatic.module.name>io.prometheus.metrics.exporter.opentelemetry</automatic.module.name>
+        <!-- don't update with dependabot, the Otel agent can handle older versions -->
+        <otel-dynamic-load.version>1.29.0</otel-dynamic-load.version>
     </properties>
 
     <dependencyManagement>
@@ -39,11 +42,6 @@
             <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>
@@ -103,12 +101,46 @@
 
     <build>
         <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
             <resource>
                 <directory>src/main/resources-filtered</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <artifactItems>
+                        <artifactItem>
+                            <groupId>io.opentelemetry</groupId>
+                            <artifactId>opentelemetry-api</artifactId>
+                            <version>${otel-dynamic-load.version}</version>
+                            <outputDirectory>${project.basedir}/src/main/resources/lib/
+                            </outputDirectory>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>io.opentelemetry</groupId>
+                            <artifactId>opentelemetry-context</artifactId>
+                            <version>${otel-dynamic-load.version}</version>
+                            <outputDirectory>${project.basedir}/src/main/resources/lib/
+                            </outputDirectory>
+                        </artifactItem>
+                    </artifactItems>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -128,6 +160,16 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/lib/*.jar</exclude>
+                        <exclude>**/ResourceAttributesFromOtelAgent*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -200,7 +242,7 @@
                             </relocations>
                             <transformers>
                                 <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                    implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                             </transformers>
                             <filters>
                                 <filter>

prometheus-metrics-exporter-opentelemetry/pom.xml

@@ -11,7 +11,6 @@
 import io.prometheus.metrics.config.ExporterOpenTelemetryProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
-import io.prometheus.otelagent.ResourceAttributesFromOtelAgent;
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;

prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/OtelAutoConfig.java

@@ -1,4 +1,4 @@
-package io.prometheus.otelagent;
+package io.prometheus.metrics.exporter.opentelemetry;
 
 import static java.nio.file.Files.createTempDirectory;