Skip to content

Commit cb3e8bd

Browse files
tjquinnotjquinno
authored
4.x Metrics followup (helidon-io#7547)
1 parent f6015d1 commit cb3e8bd

78 files changed

Lines changed: 569 additions & 325 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dbclient/metrics/src/main/java/io/helidon/dbclient/metrics/MeterMetadata.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ static MeterMetadata.Builder builder(Meter meter) {
6161
return new MeterMetadata.Builder(meter);
6262
}
6363

64+
private static final String SCOPE = "application";
6465
private final String name;
6566
private final String description;
6667
private final String unit;
@@ -118,6 +119,7 @@ <B extends Meter.Builder<B, M>, M extends Meter> B apply(B builder) {
118119
if (unit != null) {
119120
builder.baseUnit(unit);
120121
}
122+
builder.scope(SCOPE);
121123
return builder;
122124
}
123125

‎examples/cors/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,13 @@
6868
<dependency>
6969
<groupId>io.helidon.webserver.observe</groupId>
7070
<artifactId>helidon-webserver-observe-metrics</artifactId>
71+
<scope>runtime</scope>
7172
</dependency>
7273
<dependency>
74+
<groupId>io.helidon.metrics</groupId>
75+
<artifactId>helidon-metrics-system-meters</artifactId>
76+
<scope>runtime</scope>
77+
</dependency><dependency>
7378
<groupId>io.helidon.config</groupId>
7479
<artifactId>helidon-config-yaml</artifactId>
7580
</dependency>
@@ -81,10 +86,6 @@
8186
<groupId>io.helidon.health</groupId>
8287
<artifactId>helidon-health-checks</artifactId>
8388
</dependency>
84-
<dependency>
85-
<groupId>io.helidon.metrics</groupId>
86-
<artifactId>helidon-metrics</artifactId>
87-
</dependency>
8889
<dependency>
8990
<groupId>jakarta.json</groupId>
9091
<artifactId>jakarta.json-api</artifactId>

‎examples/dbclient/jdbc/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,15 @@
109109
<artifactId>helidon-examples-dbclient-common</artifactId>
110110
<version>${project.version}</version>
111111
</dependency>
112+
<dependency>
113+
<groupId>io.helidon.webserver.observe</groupId>
114+
<artifactId>helidon-webserver-observe-metrics</artifactId>
115+
<scope>runtime</scope>
116+
</dependency>
112117
<dependency>
113118
<groupId>io.helidon.metrics</groupId>
114-
<artifactId>helidon-metrics</artifactId>
119+
<artifactId>helidon-metrics-system-meters</artifactId>
120+
<scope>runtime</scope>
115121
</dependency>
116122
</dependencies>
117123

‎examples/dbclient/mongodb/pom.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,17 @@
7676
</dependency>
7777
<dependency>
7878
<groupId>io.helidon.metrics</groupId>
79-
<artifactId>helidon-metrics</artifactId>
79+
<artifactId>helidon-metrics-api</artifactId>
80+
</dependency>
81+
<dependency>
82+
<groupId>io.helidon.webserver.observe</groupId>
83+
<artifactId>helidon-webserver-observe-metrics</artifactId>
84+
<scope>runtime</scope>
85+
</dependency>
86+
<dependency>
87+
<groupId>io.helidon.metrics</groupId>
88+
<artifactId>helidon-metrics-system-meters</artifactId>
89+
<scope>runtime</scope>
8090
</dependency>
8191
<dependency>
8292
<groupId>io.helidon.tracing</groupId>

‎examples/dbclient/pokemons/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,14 @@
9595
<groupId>io.helidon.config</groupId>
9696
<artifactId>helidon-config-yaml</artifactId>
9797
</dependency>
98+
<dependency>
99+
<groupId>io.helidon.webserver.observe</groupId>
100+
<artifactId>helidon-webserver-observe-metrics</artifactId>
101+
<scope>runtime</scope>
102+
</dependency>
98103
<dependency>
99104
<groupId>io.helidon.metrics</groupId>
100-
<artifactId>helidon-metrics</artifactId>
105+
<artifactId>helidon-metrics-system-meters</artifactId>
101106
<scope>runtime</scope>
102107
</dependency>
103108
<dependency>

‎examples/employee-app/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,15 @@
6666
<groupId>io.helidon.health</groupId>
6767
<artifactId>helidon-health-checks</artifactId>
6868
</dependency>
69+
<dependency>
70+
<groupId>io.helidon.webserver.observe</groupId>
71+
<artifactId>helidon-webserver-observe-metrics</artifactId>
72+
<scope>runtime</scope>
73+
</dependency>
6974
<dependency>
7075
<groupId>io.helidon.metrics</groupId>
71-
<artifactId>helidon-metrics</artifactId>
76+
<artifactId>helidon-metrics-system-meters</artifactId>
77+
<scope>runtime</scope>
7278
</dependency>
7379
<dependency>
7480
<groupId>io.helidon.dbclient</groupId>

‎examples/integrations/microstream/greetings-se/pom.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,14 @@
6363
<groupId>io.helidon.metrics</groupId>
6464
<artifactId>helidon-metrics-api</artifactId>
6565
</dependency>
66+
<dependency>
67+
<groupId>io.helidon.webserver.observe</groupId>
68+
<artifactId>helidon-webserver-observe-metrics</artifactId>
69+
<scope>runtime</scope>
70+
</dependency>
6671
<dependency>
6772
<groupId>io.helidon.metrics</groupId>
68-
<artifactId>helidon-metrics</artifactId>
73+
<artifactId>helidon-metrics-system-meters</artifactId>
6974
<scope>runtime</scope>
7075
</dependency>
7176
<dependency>
@@ -98,4 +103,4 @@
98103
</plugin>
99104
</plugins>
100105
</build>
101-
</project>
106+
</project>

‎examples/metrics/exemplar/pom.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,7 @@
6363
</dependency>
6464
<dependency>
6565
<groupId>io.helidon.metrics</groupId>
66-
<artifactId>helidon-metrics-api</artifactId>
67-
</dependency>
68-
<dependency>
69-
<groupId>io.helidon.metrics</groupId>
70-
<artifactId>helidon-metrics</artifactId>
66+
<artifactId>helidon-metrics-system-meters</artifactId>
7167
<scope>runtime</scope>
7268
</dependency>
7369
<dependency>

‎examples/metrics/filtering/mp/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,16 @@
3939
<groupId>io.helidon.microprofile.metrics</groupId>
4040
<artifactId>helidon-microprofile-metrics</artifactId>
4141
</dependency>
42+
<dependency>
43+
<groupId>io.helidon.webserver.observe</groupId>
44+
<artifactId>helidon-webserver-observe-metrics</artifactId>
45+
<scope>runtime</scope>
46+
</dependency>
47+
<dependency>
48+
<groupId>io.helidon.metrics</groupId>
49+
<artifactId>helidon-metrics-system-meters</artifactId>
50+
<scope>runtime</scope>
51+
</dependency>
4252
<dependency>
4353
<groupId>io.helidon.webclient</groupId>
4454
<artifactId>helidon-webclient</artifactId>

‎examples/metrics/filtering/mp/src/main/resources/META-INF/microprofile-config.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ config_ordinal=1000
2121
server.port=8080
2222
server.host=0.0.0.0
2323

24-
metrics.registries.0.scope = application
25-
metrics.registries.0.filter.exclude = .*Gets
24+
metrics.scoping.scopes.0.name=application
25+
metrics.scoping.scopes.0.filter.exclude = .*Gets

0 commit comments

Comments
 (0)