Skip to content

Commit 58c8bbc

Browse files
rc-mairovichaarc-mairovichaa
authored
Merge pull request #73 from ringcentral/72_fix_static_metrics_exporting
72: Fix static metrics exporting
2 parents e328e2d + 4163110 commit 58c8bbc

File tree

20 files changed

+284
-43
lines changed

20 files changed

+284
-43
lines changed

‎README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ Base (Core):
371371
<dependency>
372372
<groupId>com.ringcentral.platform.metrics</groupId>
373373
<artifactId>metrics-facade-base</artifactId>
374-
<version>4.1.0-SNAPSHOT</version>
374+
<version>4.1.0-RELEASE</version>
375375
</dependency>
376376
```
377377

@@ -380,7 +380,7 @@ Base (Core):
380380
<dependency>
381381
<groupId>com.ringcentral.platform.metrics</groupId>
382382
<artifactId>metrics-facade-default-impl</artifactId>
383-
<version>4.1.0-SNAPSHOT</version>
383+
<version>4.1.0-RELEASE</version>
384384
</dependency>
385385
```
386386

@@ -389,7 +389,7 @@ Metrics reporter(s) (for example, ```PrometheusMetricsExporter```):
389389
<dependency>
390390
<groupId>com.ringcentral.platform.metrics</groupId>
391391
<artifactId>metrics-facade-prometheus</artifactId>
392-
<version>4.1.0-SNAPSHOT</version>
392+
<version>4.1.0-RELEASE</version>
393393
</dependency>
394394
```
395395

@@ -714,7 +714,7 @@ You can find the complete sample ```GettingStartedSample.java``` in the followin
714714
<dependency>
715715
<groupId>com.ringcentral.platform.metrics</groupId>
716716
<artifactId>metrics-facade-samples</artifactId>
717-
<version>4.1.0-SNAPSHOT</version>
717+
<version>4.1.0-RELEASE</version>
718718
</dependency>
719719
```
720720
@@ -1744,7 +1744,7 @@ Dependencies:
17441744
<dependency>
17451745
<groupId>com.ringcentral.platform.metrics</groupId>
17461746
<artifactId>metrics-facade-prometheus</artifactId>
1747-
<version>4.1.0-SNAPSHOT</version>
1747+
<version>4.1.0-RELEASE</version>
17481748
</dependency>
17491749
```
17501750

@@ -1935,7 +1935,7 @@ Dependencies:
19351935
<dependency>
19361936
<groupId>com.ringcentral.platform.metrics</groupId>
19371937
<artifactId>metrics-facade-base</artifactId>
1938-
<version>4.1.0-SNAPSHOT</version>
1938+
<version>4.1.0-RELEASE</version>
19391939
</dependency>
19401940
```
19411941

@@ -2289,7 +2289,7 @@ Dependencies:
22892289
<dependency>
22902290
<groupId>com.ringcentral.platform.metrics</groupId>
22912291
<artifactId>metrics-facade-base</artifactId>
2292-
<version>4.1.0-SNAPSHOT</version>
2292+
<version>4.1.0-RELEASE</version>
22932293
</dependency>
22942294
```
22952295

@@ -2385,7 +2385,7 @@ Dependencies:
23852385
<dependency>
23862386
<groupId>com.ringcentral.platform.metrics</groupId>
23872387
<artifactId>metrics-facade-base</artifactId>
2388-
<version>4.1.0-SNAPSHOT</version>
2388+
<version>4.1.0-RELEASE</version>
23892389
</dependency>
23902390
```
23912391

@@ -2553,7 +2553,7 @@ Required dependency:
25532553
<dependency>
25542554
<groupId>com.ringcentral.platform.metrics</groupId>
25552555
<artifactId>metrics-facade-dropwizard</artifactId>
2556-
<version>4.1.0-SNAPSHOT</version>
2556+
<version>4.1.0-RELEASE</version>
25572557
</dependency>
25582558
```
25592559

@@ -2628,7 +2628,7 @@ Required dependency:
26282628
<dependency>
26292629
<groupId>com.ringcentral.platform.metrics</groupId>
26302630
<artifactId>metrics-facade-dropwizard-to-prometheus</artifactId>
2631-
<version>4.1.0-SNAPSHOT</version>
2631+
<version>4.1.0-RELEASE</version>
26322632
</dependency>
26332633
```
26342634

‎metrics-facade-base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.ringcentral.platform.metrics</groupId>
1111
<artifactId>metrics-facade</artifactId>
12-
<version>4.1.0-SNAPSHOT</version>
12+
<version>4.1.0-RELEASE</version>
1313
</parent>
1414

1515
<artifactId>metrics-facade-base</artifactId>

‎metrics-facade-base/src/main/java/com/ringcentral/platform/metrics/producers/labeled/LabeledMemoryMetricsProducer.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ public void produceMetrics(MetricRegistry registry) {
210210
() -> memoryMxBean.getHeapMemoryUsage().getInit() + memoryMxBean.getNonHeapMemoryUsage().getInit(),
211211
TOTAL_TYPE_LABEL_VALUES);
212212

213-
initialSize.register(memoryMxBean.getHeapMemoryUsage()::getInit, HEAP_TYPE_LABEL_VALUES);
214-
initialSize.register(memoryMxBean.getNonHeapMemoryUsage()::getInit, NON_HEAP_TYPE_LABEL_VALUES);
213+
initialSize.register(() -> memoryMxBean.getHeapMemoryUsage().getInit(), HEAP_TYPE_LABEL_VALUES);
214+
initialSize.register(() -> memoryMxBean.getNonHeapMemoryUsage().getInit(), NON_HEAP_TYPE_LABEL_VALUES);
215215

216216
final var usedSize = registry.longVar(
217217
nameWithSuffix("used"),
@@ -222,8 +222,8 @@ public void produceMetrics(MetricRegistry registry) {
222222
() -> memoryMxBean.getHeapMemoryUsage().getUsed() + memoryMxBean.getNonHeapMemoryUsage().getUsed(),
223223
TOTAL_TYPE_LABEL_VALUES);
224224

225-
usedSize.register(memoryMxBean.getHeapMemoryUsage()::getUsed, HEAP_TYPE_LABEL_VALUES);
226-
usedSize.register(memoryMxBean.getNonHeapMemoryUsage()::getUsed, NON_HEAP_TYPE_LABEL_VALUES);
225+
usedSize.register(() -> memoryMxBean.getHeapMemoryUsage().getUsed(), HEAP_TYPE_LABEL_VALUES);
226+
usedSize.register(() -> memoryMxBean.getNonHeapMemoryUsage().getUsed(), NON_HEAP_TYPE_LABEL_VALUES);
227227

228228
final var maxSize = registry.longVar(
229229
nameWithSuffix("max"),
@@ -232,8 +232,8 @@ public void produceMetrics(MetricRegistry registry) {
232232

233233
maxSize.register(() -> memoryMxBean.getHeapMemoryUsage().getMax() + memoryMxBean.getNonHeapMemoryUsage().getMax(), TOTAL_TYPE_LABEL_VALUES);
234234

235-
maxSize.register(memoryMxBean.getHeapMemoryUsage()::getMax, HEAP_TYPE_LABEL_VALUES);
236-
maxSize.register(memoryMxBean.getNonHeapMemoryUsage()::getMax, NON_HEAP_TYPE_LABEL_VALUES);
235+
maxSize.register(() -> memoryMxBean.getHeapMemoryUsage().getMax(), HEAP_TYPE_LABEL_VALUES);
236+
maxSize.register(() -> memoryMxBean.getNonHeapMemoryUsage().getMax(), NON_HEAP_TYPE_LABEL_VALUES);
237237

238238
final var committedSize = registry.longVar(
239239
nameWithSuffix("committed"),
@@ -244,8 +244,8 @@ public void produceMetrics(MetricRegistry registry) {
244244
() -> memoryMxBean.getHeapMemoryUsage().getCommitted() + memoryMxBean.getNonHeapMemoryUsage().getCommitted(),
245245
TOTAL_TYPE_LABEL_VALUES);
246246

247-
committedSize.register(memoryMxBean.getHeapMemoryUsage()::getCommitted, HEAP_TYPE_LABEL_VALUES);
248-
committedSize.register(memoryMxBean.getNonHeapMemoryUsage()::getCommitted, NON_HEAP_TYPE_LABEL_VALUES);
247+
committedSize.register(() -> memoryMxBean.getHeapMemoryUsage().getCommitted(), HEAP_TYPE_LABEL_VALUES);
248+
committedSize.register(() -> memoryMxBean.getNonHeapMemoryUsage().getCommitted(), NON_HEAP_TYPE_LABEL_VALUES);
249249

250250
final var usageRatio = registry.doubleVar(
251251
nameWithSuffix("usage"),
@@ -298,10 +298,10 @@ public void produceMetrics(MetricRegistry registry) {
298298

299299
for (MemoryPoolMXBean pool : memoryPoolMxBeans) {
300300
final var labelValues = labelValues(NAME_LABEL.value(pool.getName()));
301-
initialPoolSize.register(pool.getUsage()::getInit, labelValues);
302-
maxPoolSize.register(pool.getUsage()::getMax, labelValues);
303-
committedPoolSize.register(pool.getUsage()::getCommitted, labelValues);
304-
usedPoolSize.register(pool.getUsage()::getUsed, labelValues);
301+
initialPoolSize.register(() -> pool.getUsage().getInit(), labelValues);
302+
maxPoolSize.register(() -> pool.getUsage().getMax(), labelValues);
303+
committedPoolSize.register(() -> pool.getUsage().getCommitted(), labelValues);
304+
usedPoolSize.register(() -> pool.getUsage().getUsed(), labelValues);
305305

306306
usagePoolRatio.register(
307307
() -> {
@@ -313,7 +313,7 @@ public void produceMetrics(MetricRegistry registry) {
313313
labelValues);
314314

315315
if (pool.getCollectionUsage() != null) {
316-
usedAfterGcPoolRatio.register(pool.getCollectionUsage()::getUsed, labelValues);
316+
usedAfterGcPoolRatio.register(() -> pool.getCollectionUsage().getUsed(), labelValues);
317317
}
318318
}
319319
}

0 commit comments

Comments
 (0)