Skip to content

Add metrics option for use global registry #12238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
songxiaosheng merged 11 commits into from
May 16, 2023
Merged

Add metrics option for use global registry #12238

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f92e427
remove unuse code
May 6, 2023
c2fa890
add jvm option for if use micrometer globalRegistry
May 6, 2023
8cff329
Merge branch '3.2' into metrics_option
songxiaosheng May 8, 2023
a06b898
Optional use of CompositeMeterRegistry
May 9, 2023
30b5db9
Optional use of CompositeMeterRegistry
May 9, 2023
c743f29
fix npe
May 10, 2023
5340d73
Compatible with old api
May 11, 2023
5de61af
Merge branch '3.2' into metrics_option
songxiaosheng May 11, 2023
9893eb6
Merge branch '3.2' into metrics_option
wxbty May 11, 2023
1d584ba
add comment
May 15, 2023
1056f93
Merge branch '3.2' into metrics_option
wxbty May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/DubboMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,8 @@

public class DubboMetrics implements MeterBinder {

private MeterRegistry globalRegistry = null;

@Override
public void bindTo(MeterRegistry registry) {
globalRegistry = registry;
CompositeMeterRegistry compositeRegistry = MetricsGlobalRegistry.getCompositeRegistry();
if (compositeRegistry != null) {
compositeRegistry.add(registry);
Expand Down
7 changes: 6 additions & 1 deletion ...s/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/MetricsGlobalRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,18 @@

package org.apache.dubbo.metrics;

import io.micrometer.core.instrument.Metrics;
import io.micrometer.core.instrument.composite.CompositeMeterRegistry;

public class MetricsGlobalRegistry {

private static final CompositeMeterRegistry compositeRegistry = new CompositeMeterRegistry();

public static CompositeMeterRegistry getCompositeRegistry() {
return compositeRegistry;
if (Boolean.parseBoolean(System.getProperty("dubbo.metrics.useGlobalRegistry", "true"))) {
return Metrics.globalRegistry;
} else {
return compositeRegistry;
}
}
}