fix: 修复设备统计没有产品字段问题

Author: zhou-hao

jetlinks-components/common-component/src/main/java/org/jetlinks/community/micrometer/MeterRegistryConfiguration.java

@@ -0,0 +1,25 @@
+package org.jetlinks.community.micrometer;
+
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Role;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+
+import java.util.stream.Collectors;
+
+@AutoConfiguration
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
+public class MeterRegistryConfiguration {
+
+    @Bean(destroyMethod = "shutdown")
+    @Order(Ordered.HIGHEST_PRECEDENCE + 100)
+    public MeterRegistryManager meterRegistryManager(ObjectProvider<MeterRegistrySupplier> registrySuppliers,
+                                                     ObjectProvider<MeterRegistryCustomizer> customizers) {
+        return new MeterRegistryManager(registrySuppliers.stream().collect(Collectors.toList()),
+                                        customizers.stream().collect(Collectors.toList()));
+    }
+
+}

jetlinks-components/common-component/src/main/java/org/jetlinks/community/micrometer/MeterRegistryManager.java

@@ -19,37 +19,74 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
 import lombok.Setter;
+import org.jetlinks.core.metadata.DataType;
+import org.jetlinks.core.metadata.types.StringType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
  * @author bsetfeng
  * @author wanghzeng
  * @since 1.0
  **/
-@Component
 @Setter
 public class MeterRegistryManager {
 
+
     private Map<String, MeterRegistry> meterRegistryMap = new ConcurrentHashMap<>();
 
-    @Autowired
-    private List<MeterRegistrySupplier> suppliers;
+    private final List<MeterRegistrySupplier> suppliers;
+
+    private final List<MeterRegistryCustomizer> customizers;
+
+    public MeterRegistryManager(List<MeterRegistrySupplier> suppliers,
+                                List<MeterRegistryCustomizer> customizers) {
+        this.suppliers = suppliers == null ? Collections.emptyList() : suppliers;
+        this.customizers = customizers == null ? Collections.emptyList() : customizers;
+    }
+
+    public void shutdown() {
+        meterRegistryMap
+            .values()
+            .forEach(MeterRegistry::close);
+    }
+
+    private MeterRegistry createMeterRegistry(String metric, Map<String, DataType> tagDefine) {
+        Map<String, DataType> tags = new HashMap<>(tagDefine);
+        MeterRegistrySettings settings = tags::put;
+        customizers.forEach(customizer -> customizer.custom(metric, settings));
+
+        if (suppliers.size() == 1) {
+            return suppliers.get(0).getMeterRegistry(metric, tags);
+        }
 
-    private MeterRegistry createMeterRegistry(String metric, String... tagKeys) {
-        return new CompositeMeterRegistry(Clock.SYSTEM,
-            suppliers.stream()
-                .map(supplier -> supplier.getMeterRegistry(metric, tagKeys))
-                .collect(Collectors.toList()));
+        return new CompositeMeterRegistry(Clock.SYSTEM, suppliers
+            .stream()
+            .map(supplier -> supplier.getMeterRegistry(metric, tags))
+            .collect(Collectors.toList()));
     }
 
     public MeterRegistry getMeterRegister(String metric, String... tagKeys) {
-        return meterRegistryMap.computeIfAbsent(metric, _metric -> createMeterRegistry(_metric, tagKeys));
+
+        return meterRegistryMap.computeIfAbsent(metric, _metric -> {
+            if (tagKeys.length == 0) {
+                return createMeterRegistry(metric, Collections.emptyMap());
+            }
+            return createMeterRegistry(metric, Arrays
+                .stream(tagKeys)
+                .collect(Collectors.toMap(Function.identity(), key -> StringType.GLOBAL)));
+        });
     }
 
+    @Deprecated
+    public MeterRegistry getMeterRegister(String metric, Map<String, DataType> tagDefine) {
+        return meterRegistryMap.computeIfAbsent(metric, _metric -> createMeterRegistry(_metric, tagDefine));
+    }
+
+
 }

jetlinks-components/common-component/src/main/java/org/jetlinks/community/micrometer/MeterRegistrySupplier.java

@@ -16,9 +16,14 @@
 package org.jetlinks.community.micrometer;
 
 import io.micrometer.core.instrument.MeterRegistry;
+import org.jetlinks.core.metadata.DataType;
+
+import java.util.Map;
 
 public interface MeterRegistrySupplier {
 
     MeterRegistry getMeterRegistry(String metric, String... tagKeys);
 
+    MeterRegistry getMeterRegistry(String metric, Map<String, DataType> tagDefine);
+
 }

jetlinks-components/common-component/src/main/java/org/jetlinks/community/micrometer/NoopMeterRegistry.java

@@ -0,0 +1,91 @@
+package org.jetlinks.community.micrometer;
+
+import io.micrometer.core.instrument.*;
+import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
+import io.micrometer.core.instrument.distribution.pause.PauseDetector;
+import io.micrometer.core.instrument.noop.*;
+
+import javax.annotation.Nonnull;
+import java.util.concurrent.TimeUnit;
+import java.util.function.ToDoubleFunction;
+import java.util.function.ToLongFunction;
+
+public class NoopMeterRegistry extends MeterRegistry {
+    public static final NoopMeterRegistry INSTANCE = new NoopMeterRegistry();
+
+    private NoopMeterRegistry() {
+        super(Clock.SYSTEM);
+    }
+
+    @Override
+    @Nonnull
+    protected <T> Gauge newGauge(@Nonnull Meter.Id id, T t, @Nonnull ToDoubleFunction<T> toDoubleFunction) {
+        return new NoopGauge(id);
+    }
+
+    @Override
+    @Nonnull
+    protected Counter newCounter(@Nonnull Meter.Id id) {
+        return new NoopCounter(id);
+    }
+
+    @Override
+    protected LongTaskTimer newLongTaskTimer(Meter.Id id, DistributionStatisticConfig distributionStatisticConfig) {
+        return new NoopLongTaskTimer(id);
+    }
+
+    @Override
+    protected <T> TimeGauge newTimeGauge(Meter.Id id, T obj, TimeUnit valueFunctionUnit, ToDoubleFunction<T> valueFunction) {
+        return new NoopTimeGauge(id);
+    }
+
+    @Override
+    protected LongTaskTimer newLongTaskTimer(Meter.Id id) {
+        return new NoopLongTaskTimer(id);
+    }
+
+    @Override
+    @Nonnull
+    protected Timer newTimer(@Nonnull Meter.Id id, @Nonnull DistributionStatisticConfig distributionStatisticConfig, @Nonnull PauseDetector pauseDetector) {
+        return new NoopTimer(id);
+    }
+
+    @Override
+    @Nonnull
+    protected DistributionSummary newDistributionSummary(@Nonnull Meter.Id id, @Nonnull DistributionStatisticConfig distributionStatisticConfig, double v) {
+        return new NoopDistributionSummary(id);
+    }
+
+    @Override
+    @Nonnull
+    protected Meter newMeter(@Nonnull Meter.Id id, @Nonnull Meter.Type type, @Nonnull Iterable<Measurement> iterable) {
+        return new NoopMeter(id);
+    }
+
+    @Override
+    @Nonnull
+    protected <T> FunctionTimer newFunctionTimer(@Nonnull Meter.Id id, @Nonnull T t,
+                                                 @Nonnull ToLongFunction<T> toLongFunction,
+                                                 @Nonnull ToDoubleFunction<T> toDoubleFunction,
+                                                 @Nonnull TimeUnit timeUnit) {
+        return new NoopFunctionTimer(id);
+    }
+
+    @Override
+    @Nonnull
+    protected <T> FunctionCounter newFunctionCounter(@Nonnull Meter.Id id, @Nonnull T t, @Nonnull ToDoubleFunction<T> toDoubleFunction) {
+        return new NoopFunctionCounter(id);
+    }
+
+    @Override
+    @Nonnull
+    protected TimeUnit getBaseTimeUnit() {
+        return TimeUnit.MILLISECONDS;
+    }
+
+    @Override
+    @Nonnull
+    protected DistributionStatisticConfig defaultHistogramConfig() {
+        return DistributionStatisticConfig.NONE;
+    }
+}

jetlinks-components/common-component/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,3 +1,4 @@
 org.jetlinks.community.configuration.CommonConfiguration
 org.jetlinks.community.dictionary.DictionaryConfiguration
-org.jetlinks.community.configuration.UiResourceConfiguration
+org.jetlinks.community.configuration.UiResourceConfiguration
+org.jetlinks.community.micrometer.MeterRegistryConfiguration

jetlinks-components/timeseries-component/src/main/java/org/jetlinks/community/timeseries/micrometer/MeterTimeSeriesData.java

@@ -16,18 +16,22 @@
 package org.jetlinks.community.timeseries.micrometer;
 
 import io.micrometer.core.instrument.*;
+import org.hswebframework.web.id.IDGenerator;
 import org.jetlinks.community.timeseries.TimeSeriesData;
+import org.jetlinks.core.metadata.Converter;
+import org.jetlinks.core.metadata.DataType;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 
 public class MeterTimeSeriesData implements TimeSeriesData {
 
-    private Map<String, Object> data = new HashMap<>();
+    private final Map<String, Object> data = new HashMap<>(24);
 
-    private long timestamp = System.currentTimeMillis();
+    private final long timestamp = System.currentTimeMillis();
 
     @Override
     public long getTimestamp() {
@@ -52,9 +56,14 @@ public MeterTimeSeriesData write(Map<String, String> tags) {
         return this;
     }
 
-    public MeterTimeSeriesData write(List<Tag> tags) {
+    public MeterTimeSeriesData write(List<Tag> tags, Function<String, DataType> typeGetter) {
         for (Tag tag : tags) {
-            data.put(tag.getKey(), tag.getValue());
+            DataType type = typeGetter.apply(tag.getKey());
+            Object value = tag.getValue();
+            if (type instanceof Converter) {
+                value = ((Converter<?>) type).convert(value);
+            }
+            data.put(tag.getKey(), value);
         }
         return this;
     }
@@ -84,7 +93,6 @@ public MeterTimeSeriesData write(TimeGauge gauge) {
     }
 
     public MeterTimeSeriesData write(FunctionTimer timer) {
-
         data.put("count", timer.count());
         data.put("sum", timer.totalTime(TimeUnit.MILLISECONDS));
         data.put("mean", timer.mean(TimeUnit.MILLISECONDS));
@@ -126,6 +134,7 @@ public MeterTimeSeriesData write(Meter meter) {
 
     public static MeterTimeSeriesData of(Meter meter) {
         MeterTimeSeriesData data = new MeterTimeSeriesData();
+        data.data.put("id", IDGenerator.RANDOM.generate());
         data.write(meter);
         meter.match(
             data::write,

jetlinks-components/timeseries-component/src/main/java/org/jetlinks/community/timeseries/micrometer/MeterTimeSeriesMetadata.java

@@ -19,21 +19,21 @@
 import lombok.Getter;
 import org.jetlinks.community.timeseries.TimeSeriesMetadata;
 import org.jetlinks.community.timeseries.TimeSeriesMetric;
+import org.jetlinks.core.metadata.DataType;
 import org.jetlinks.core.metadata.PropertyMetadata;
 import org.jetlinks.core.metadata.SimplePropertyMetadata;
 import org.jetlinks.core.metadata.types.DoubleType;
 import org.jetlinks.core.metadata.types.StringType;
 
 import java.util.ArrayList;
 import java.util.List;
-
+import java.util.Map;
+@Getter
 @AllArgsConstructor(staticName = "of")
 class MeterTimeSeriesMetadata implements TimeSeriesMetadata {
-    @Getter
     private TimeSeriesMetric metric;
 
-    @Getter
-    private List<String> keys;
+    private Map<String, DataType> keys;
 
     static final List<PropertyMetadata> properties = new ArrayList<>();
 
@@ -133,11 +133,11 @@ class MeterTimeSeriesMetadata implements TimeSeriesMetadata {
     public List<PropertyMetadata> getProperties() {
 
         List<PropertyMetadata> metadata = new ArrayList<>(properties);
-        for (String key : keys) {
+        for (Map.Entry<String,DataType> key : keys.entrySet()) {
             SimplePropertyMetadata property = new SimplePropertyMetadata();
-            property.setId(key);
-            property.setName(key);
-            property.setValueType(new StringType());
+            property.setId(key.getKey());
+            property.setName(key.getKey());
+            property.setValueType(key.getValue());
             metadata.add(property);
         }
         return metadata;