Skip to content

Commit 0072641

Browse files
authored
Move feature info from metrics API to Micrometer implementation component (#10672)
* Move feature info from metrics API to Micrometer implementation component Signed-off-by: Tim Quinn <[email protected]> * Review comments --------- Signed-off-by: Tim Quinn <[email protected]>
1 parent f20abf9 commit 0072641

File tree

4 files changed

+45
-25
lines changed

4 files changed

+45
-25
lines changed

metrics/api/pom.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@
5353
<groupId>io.helidon.service</groupId>
5454
<artifactId>helidon-service-registry</artifactId>
5555
</dependency>
56-
<dependency>
57-
<groupId>io.helidon.common.features</groupId>
58-
<artifactId>helidon-common-features-api</artifactId>
59-
<optional>true</optional>
60-
</dependency>
6156
<dependency>
6257
<groupId>io.helidon.config</groupId>
6358
<artifactId>helidon-config-metadata</artifactId>
@@ -97,13 +92,7 @@
9792
<groupId>org.apache.maven.plugins</groupId>
9893
<artifactId>maven-compiler-plugin</artifactId>
9994
<configuration>
100-
<forceJavacCompilerUse>true</forceJavacCompilerUse>
10195
<annotationProcessorPaths>
102-
<path>
103-
<groupId>io.helidon.common.features</groupId>
104-
<artifactId>helidon-common-features-codegen</artifactId>
105-
<version>${helidon.version}</version>
106-
</path>
10796
<path>
10897
<groupId>io.helidon.config.metadata</groupId>
10998
<artifactId>helidon-config-metadata-codegen</artifactId>
@@ -127,11 +116,6 @@
127116
</annotationProcessorPaths>
128117
</configuration>
129118
<dependencies>
130-
<dependency>
131-
<groupId>io.helidon.common.features</groupId>
132-
<artifactId>helidon-common-features-codegen</artifactId>
133-
<version>${helidon.version}</version>
134-
</dependency>
135119
<dependency>
136120
<groupId>io.helidon.config.metadata</groupId>
137121
<artifactId>helidon-config-metadata-codegen</artifactId>

metrics/api/src/main/java/module-info.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
import io.helidon.common.features.api.Features;
18-
import io.helidon.common.features.api.HelidonFlavor;
19-
2017
/**
2118
* Helidon metrics API.
2219
*/
23-
@Features.Name("Metrics")
24-
@Features.Description("Metrics")
25-
@Features.Flavor(HelidonFlavor.SE)
26-
@Features.Path({"Metrics"})
2720
module io.helidon.metrics.api {
2821

29-
requires static io.helidon.common.features.api;
30-
3122
requires io.helidon.http;
3223
requires transitive io.helidon.common.config;
3324

metrics/providers/micrometer/pom.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@
5959
<groupId>io.helidon.service</groupId>
6060
<artifactId>helidon-service-registry</artifactId>
6161
</dependency>
62+
<dependency>
63+
<groupId>io.helidon.common.features</groupId>
64+
<artifactId>helidon-common-features-api</artifactId>
65+
<optional>true</optional>
66+
</dependency>
6267
<dependency>
6368
<groupId>org.junit.jupiter</groupId>
6469
<artifactId>junit-jupiter-api</artifactId>
@@ -82,6 +87,36 @@
8287

8388
<build>
8489
<plugins>
90+
<plugin>
91+
<groupId>org.apache.maven.plugins</groupId>
92+
<artifactId>maven-compiler-plugin</artifactId>
93+
<configuration>
94+
<annotationProcessorPaths>
95+
<path>
96+
<groupId>io.helidon.common.features</groupId>
97+
<artifactId>helidon-common-features-codegen</artifactId>
98+
<version>${helidon.version}</version>
99+
</path>
100+
<path>
101+
<groupId>io.helidon.codegen</groupId>
102+
<artifactId>helidon-codegen-apt</artifactId>
103+
<version>${helidon.version}</version>
104+
</path>
105+
</annotationProcessorPaths>
106+
</configuration>
107+
<dependencies>
108+
<dependency>
109+
<groupId>io.helidon.common.features</groupId>
110+
<artifactId>helidon-common-features-codegen</artifactId>
111+
<version>${helidon.version}</version>
112+
</dependency>
113+
<dependency>
114+
<groupId>io.helidon.codegen</groupId>
115+
<artifactId>helidon-codegen-apt</artifactId>
116+
<version>${helidon.version}</version>
117+
</dependency>
118+
</dependencies>
119+
</plugin>
85120
<plugin>
86121
<groupId>org.apache.maven.plugins</groupId>
87122
<artifactId>maven-surefire-plugin</artifactId>

metrics/providers/micrometer/src/main/java/module-info.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,20 @@
1414
* limitations under the License.
1515
*/
1616

17+
import io.helidon.common.features.api.Features;
18+
import io.helidon.common.features.api.HelidonFlavor;
19+
1720
/**
1821
* Micrometer adapter for Helidon metrics API.
1922
*/
23+
@Features.Name("Metrics")
24+
@Features.Description("Micrometer provider for metrics")
25+
@Features.Flavor(HelidonFlavor.SE)
26+
@Features.Path({"Metrics", "Micrometer"})
2027
module io.helidon.metrics.providers.micrometer {
28+
29+
requires static io.helidon.common.features.api;
30+
2131
requires io.helidon.metrics.api;
2232
requires micrometer.core;
2333
requires static micrometer.registry.prometheus;

0 commit comments

Comments
 (0)