liubao68 closed pull request #662: [SCB-507] avoid rest publisher get NaN
values when there is no period publisher
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/662
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/MetricsBootstrap.java
b/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/MetricsBootstrap.java
index 335d7c56a..1a6c0d132 100644
---
a/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/MetricsBootstrap.java
+++
b/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/MetricsBootstrap.java
@@ -29,6 +29,7 @@
import com.google.common.eventbus.EventBus;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.netflix.spectator.api.CompositeRegistry;
+import com.netflix.spectator.api.Measurement;
import com.netflix.spectator.api.Meter;
public class MetricsBootstrap {
@@ -77,7 +78,13 @@ protected void startPoll() {
protected void pollMeters() {
List<Meter> meters = Lists.newArrayList(globalRegistry.iterator());
- PolledEvent event = new PolledEvent(meters);
+ // must collect measurements
+ // otherwise if there is no any period publisher, normal publisher maybe
get NaN values
+ List<Measurement> measurements = new ArrayList<>();
+ for (Meter meter : meters) {
+ meter.measure().forEach(measurements::add);
+ }
+ PolledEvent event = new PolledEvent(meters, measurements);
eventBus.post(event);
}
diff --git
a/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/PolledEvent.java
b/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/PolledEvent.java
index b2aa0709b..6b7c3018c 100644
---
a/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/PolledEvent.java
+++
b/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/PolledEvent.java
@@ -18,13 +18,17 @@
import java.util.List;
+import com.netflix.spectator.api.Measurement;
import com.netflix.spectator.api.Meter;
public class PolledEvent {
private List<Meter> meters;
- public PolledEvent(List<Meter> meters) {
+ private List<Measurement> measurements;
+
+ public PolledEvent(List<Meter> meters, List<Measurement> measurements) {
this.meters = meters;
+ this.measurements = measurements;
}
public List<Meter> getMeters() {
@@ -34,4 +38,12 @@ public PolledEvent(List<Meter> meters) {
public void setMeters(List<Meter> meters) {
this.meters = meters;
}
+
+ public List<Measurement> getMeasurements() {
+ return measurements;
+ }
+
+ public void setMeasurements(List<Measurement> measurements) {
+ this.measurements = measurements;
+ }
}
diff --git
a/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/TestMetricsBootstrap.java
b/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/TestMetricsBootstrap.java
index a8fd7ecd2..b73834b7f 100644
---
a/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/TestMetricsBootstrap.java
+++
b/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/TestMetricsBootstrap.java
@@ -19,7 +19,9 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
import org.hamcrest.Matchers;
@@ -29,6 +31,7 @@
import com.google.common.eventbus.EventBus;
import com.google.common.eventbus.Subscribe;
import com.netflix.spectator.api.CompositeRegistry;
+import com.netflix.spectator.api.Measurement;
import com.netflix.spectator.api.Meter;
import mockit.Deencapsulation;
@@ -66,22 +69,27 @@ public void init(CompositeRegistry globalRegistry, EventBus
eventBus, MetricsBoo
}
@Test
- public void pollMeters() {
- bootstrap.start(globalRegistry, eventBus);
-
- List<Meter> meters = new ArrayList<>();
- new Expectations() {
+ public void pollMeters(@Mocked Meter meter, @Mocked Measurement measurement,
+ @Mocked ScheduledExecutorService executor) {
+ List<Meter> meters = Arrays.asList(meter);
+ new Expectations(Executors.class) {
{
+ Executors.newScheduledThreadPool(1, (ThreadFactory) any);
+ result = executor;
globalRegistry.iterator();
result = meters.iterator();
+ meter.measure();
+ result = Arrays.asList(measurement);
}
};
+ bootstrap.start(globalRegistry, eventBus);
- PolledEvent result = new PolledEvent(null);
+ PolledEvent result = new PolledEvent(null, null);
eventBus.register(new Object() {
@Subscribe
public void onEvent(PolledEvent event) {
result.setMeters(event.getMeters());
+ result.setMeasurements(event.getMeasurements());
}
});
@@ -89,6 +97,7 @@ public void onEvent(PolledEvent event) {
bootstrap.shutdown();
Assert.assertEquals(meters, result.getMeters());
+ Assert.assertThat(result.getMeasurements(),
Matchers.contains(measurement));
}
@Test
diff --git
a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java
b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java
index 57b107415..b4f31739b 100644
---
a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java
+++
b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java
@@ -167,7 +167,7 @@ DefaultPublishModel createDefaultPublishModel() {
}
};
- publisher.onPolledEvent(new PolledEvent(Collections.emptyList()));
+ publisher.onPolledEvent(new PolledEvent(Collections.emptyList(),
Collections.emptyList()));
List<LoggingEvent> events = collector.getEvents().stream().filter(e -> {
return DefaultLogPublisher.class.getName().equals(e.getLoggerName());
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
