Skip to content

Commit 942d5d4

Browse files
committed
Fixes issue prometheus#871: Automatic-Module-Names are added
Signed-off-by: Maxim Solodovnik <solomax@apache.org>
1 parent 586c2f9 commit 942d5d4

File tree

15 files changed

+63
-4
lines changed
  • prometheus-metrics-config
  • prometheus-metrics-core
  • prometheus-metrics-exporter-common
  • prometheus-metrics-exporter-httpserver
  • prometheus-metrics-exporter-opentelemetry
  • prometheus-metrics-exporter-servlet-jakarta
  • prometheus-metrics-exposition-formats
  • prometheus-metrics-instrumentation-jvm
  • prometheus-metrics-model
  • prometheus-metrics-simpleclient-bridge
  • prometheus-metrics-tracer
    • prometheus-metrics-tracer-common
    • prometheus-metrics-tracer-initializer
    • prometheus-metrics-tracer-otel
    • prometheus-metrics-tracer-otel-agent

15 files changed

+63
-4
lines changed

pom.xml

+10-4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
The Prometheus Java Metrics Library
1414
</description>
1515

16+
<properties>
17+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18+
<automatic.module.name>--module-name-need-to-be-overriden--</automatic.module.name>
19+
</properties>
20+
1621
<licenses>
1722
<license>
1823
<name>The Apache Software License, Version 2.0</name>
@@ -64,10 +69,6 @@
6469
<module>integration-tests</module>
6570
</modules>
6671

67-
<properties>
68-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
69-
</properties>
70-
7172
<distributionManagement>
7273
<snapshotRepository>
7374
<id>ossrh</id>
@@ -192,6 +193,11 @@
192193
<artifactId>maven-bundle-plugin</artifactId>
193194
<version>2.4.0</version>
194195
<extensions>true</extensions>
196+
<configuration>
197+
<instructions>
198+
<Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
199+
</instructions>
200+
</configuration>
195201
</plugin>
196202
<plugin>
197203
<groupId>org.apache.maven.plugins</groupId>

prometheus-metrics-config/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
Configuration for Prometheus metrics and exposition formats.
1717
</description>
1818

19+
<properties>
20+
<automatic.module.name>io.prometheus.metrics.config</automatic.module.name>
21+
</properties>
22+
1923
<licenses>
2024
<license>
2125
<name>The Apache Software License, Version 2.0</name>

prometheus-metrics-core/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
</developer>
3333
</developers>
3434

35+
<properties>
36+
<automatic.module.name>io.prometheus.metrics.core</automatic.module.name>
37+
</properties>
38+
3539
<dependencies>
3640
<dependency>
3741
<groupId>io.prometheus</groupId>

prometheus-metrics-exporter-common/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
Common functionality for implementing a Prometheus scrape endpoint.
1717
</description>
1818

19+
<properties>
20+
<automatic.module.name>io.prometheus.metrics.exporter.common</automatic.module.name>
21+
</properties>
22+
1923
<licenses>
2024
<license>
2125
<name>The Apache Software License, Version 2.0</name>

prometheus-metrics-exporter-httpserver/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
</developer>
3333
</developers>
3434

35+
<properties>
36+
<automatic.module.name>io.prometheus.metrics.exporter.httpserver</automatic.module.name>
37+
</properties>
38+
3539
<dependencies>
3640
<dependency>
3741
<groupId>io.prometheus</groupId>

prometheus-metrics-exporter-opentelemetry/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<properties>
2020
<otel.version>1.28.0</otel.version>
2121
<otel.semconv.version>${otel.version}-alpha</otel.semconv.version>
22+
<automatic.module.name>io.prometheus.metrics.exporter.opentelemetry</automatic.module.name>
2223
</properties>
2324

2425
<licenses>

prometheus-metrics-exporter-servlet-jakarta/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
Jakarta Servlet for exposing a Prometheus scrape endpoint.
1717
</description>
1818

19+
<properties>
20+
<automatic.module.name>io.prometheus.metrics.exporter.servlet.jakarta</automatic.module.name>
21+
</properties>
22+
1923
<licenses>
2024
<license>
2125
<name>The Apache Software License, Version 2.0</name>

prometheus-metrics-exposition-formats/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
</developer>
3333
</developers>
3434

35+
<properties>
36+
<automatic.module.name>io.prometheus.metrics.expositionformats</automatic.module.name>
37+
</properties>
38+
3539
<dependencies>
3640
<dependency>
3741
<groupId>io.prometheus</groupId>

prometheus-metrics-instrumentation-jvm/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
Instrumentation library for JVM metrics
1717
</description>
1818

19+
<properties>
20+
<automatic.module.name>io.prometheus.metrics.instrumentation.jvm</automatic.module.name>
21+
</properties>
22+
1923
<licenses>
2024
<license>
2125
<name>The Apache Software License, Version 2.0</name>

prometheus-metrics-model/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
</developer>
3333
</developers>
3434

35+
<properties>
36+
<automatic.module.name>io.prometheus.metrics.model</automatic.module.name>
37+
</properties>
38+
3539
<dependencies>
3640
<!-- test dependencies -->
3741
<dependency>

prometheus-metrics-simpleclient-bridge/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
Bridge the old simpleclient CollectorRegistry to the new PrometheusRegistry
1717
</description>
1818

19+
<properties>
20+
<automatic.module.name>io.prometheus.metrics.simpleclient.bridge</automatic.module.name>
21+
</properties>
22+
1923
<licenses>
2024
<license>
2125
<name>The Apache Software License, Version 2.0</name>

prometheus-metrics-tracer/prometheus-metrics-tracer-common/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,8 @@
3131
<email>fabian@fstab.de</email>
3232
</developer>
3333
</developers>
34+
35+
<properties>
36+
<automatic.module.name>io.prometheus.metrics.tracer.common</automatic.module.name>
37+
</properties>
3438
</project>

prometheus-metrics-tracer/prometheus-metrics-tracer-initializer/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
Initialize Prometheus integrations with distributed tracing libraries.
1717
</description>
1818

19+
<properties>
20+
<automatic.module.name>io.prometheus.metrics.tracer.initializer</automatic.module.name>
21+
</properties>
22+
1923
<licenses>
2024
<license>
2125
<name>The Apache Software License, Version 2.0</name>

prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
Prometheus integration with the OpenTelemetry Java agent for distributed tracing.
1717
</description>
1818

19+
<properties>
20+
<automatic.module.name>io.prometheus.metrics.tracer.otel_agent</automatic.module.name>
21+
</properties>
22+
1923
<licenses>
2024
<license>
2125
<name>The Apache Software License, Version 2.0</name>

prometheus-metrics-tracer/prometheus-metrics-tracer-otel/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
</developer>
3333
</developers>
3434

35+
<properties>
36+
<automatic.module.name>io.prometheus.metrics.tracer.otel</automatic.module.name>
37+
</properties>
38+
3539
<dependencies>
3640
<dependency>
3741
<groupId>io.prometheus</groupId>

0 commit comments

Comments
 (0)