Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
J. Wu authored and J. Wu committed Jul 3, 2023
1 parent 513fb76 commit 80130ce
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 28 deletions.
23 changes: 1 addition & 22 deletions mantis-common/src/main/java/io/mantisrx/common/metrics/MetricsServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,19 @@
package io.mantisrx.common.metrics;

import io.mantisrx.common.metrics.measurement.MicrometerMeasurements;
import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.Measurement;
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Metrics;
import io.mantisrx.common.metrics.measurement.CounterMeasurement;
import io.mantisrx.common.metrics.measurement.GaugeMeasurement;
import io.mantisrx.common.metrics.measurement.Measurements;
import io.mantisrx.common.metrics.spectator.MetricId;
import io.mantisrx.shaded.com.fasterxml.jackson.core.JsonProcessingException;
import io.mantisrx.shaded.com.fasterxml.jackson.databind.DeserializationFeature;
import io.mantisrx.shaded.com.fasterxml.jackson.databind.ObjectMapper;
import io.mantisrx.shaded.com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
import mantis.io.reactivex.netty.RxNetty;
import mantis.io.reactivex.netty.pipeline.PipelineConfigurators;
Expand Down Expand Up @@ -69,7 +63,6 @@ public MetricsServer(int port, long publishRateInSeconds, Map<String, String> ta

private Observable<MicrometerMeasurements> measurements(long timeFrequency) {
final MeterRegistry registry = Metrics.globalRegistry;
// final MetricsRegistry registry = MetricsRegistry.getInstance();
return
Observable.interval(0, timeFrequency, TimeUnit.SECONDS)
.flatMap(new Func1<Long, Observable<MicrometerMeasurements>>() {
Expand All @@ -85,20 +78,6 @@ public Observable<MicrometerMeasurements> call(Long t1) {
meter.measure().toString(),
tags));
}
// for (Metrics metrics : registry.metrics()) {
// Collection<CounterMeasurement> counters = new LinkedList<>();
// Collection<GaugeMeasurement> gauges = new LinkedList<>();
//
// for (Entry<MetricId, Counter> counterEntry : metrics.counters().entrySet()) {
// Counter counter = counterEntry.getValue();
// counters.add(new CounterMeasurement(counterEntry.getKey().metricName(), counter.value()));
// }
// for (Entry<MetricId, Gauge> gaugeEntry : metrics.gauges().entrySet()) {
// gauges.add(new GaugeMeasurement(gaugeEntry.getKey().metricName(), gaugeEntry.getValue().doubleValue()));
// }
// measurements.add(new Measurements(metrics.getMetricGroupId().name(),
// timestamp, counters, gauges, tags));
// }
return Observable.from(measurements);
}
});
Expand Down
6 changes: 0 additions & 6 deletions ...s-common/src/main/java/io/mantisrx/common/metrics/measurement/MicrometerMeasurements.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,10 @@

package io.mantisrx.common.metrics.measurement;

import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonUnwrapped;
import io.micrometer.core.instrument.Measurement;
import io.micrometer.core.instrument.Meter;
import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonCreator;
import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonProperty;

import io.micrometer.core.instrument.Meter;

import java.util.Map;


Expand Down Expand Up @@ -77,7 +72,6 @@ public String getMeasurement() {
public Map<String, String> getTags() {
return tags;
}

@Override
public String toString() {
return "Measurements{" +
Expand Down

0 comments on commit 80130ce

Please sign in to comment.