Merge remote-tracking branch 'origin/release_2-1-1' into release_3-0

# Conflicts:
#	README.md
#	metrics-facade-base/pom.xml
#	metrics-facade-benchmark/pom.xml
#	metrics-facade-default-impl/pom.xml
#	metrics-facade-dropwizard-to-prometheus/pom.xml
#	metrics-facade-dropwizard/pom.xml
#	metrics-facade-prometheus/pom.xml
#	metrics-facade-samples/pom.xml
#	metrics-facade-shared-tests/pom.xml
#	metrics-facade-spring/metrics-facade-prometheus-spring-boot-autoconfigure/pom.xml
#	metrics-facade-spring/metrics-facade-prometheus-spring-boot-starter/pom.xml
#	metrics-facade-spring/metrics-facade-spring-boot-autoconfigure/pom.xml
#	metrics-facade-spring/metrics-facade-spring-boot-sample-app/pom.xml
#	metrics-facade-spring/metrics-facade-spring-boot-starter/pom.xml
#	metrics-facade-spring/micrometer-registry-metrics-facade/pom.xml
#	metrics-facade-spring/pom.xml
#	metrics-facade-test-support/pom.xml
#	pom.xml

Author: Roman Shulnyaev

metrics-facade-base/src/main/java/com/ringcentral/platform/metrics/infoProviders/ConcurrentMaskTreeMetricNamedInfoProvider.java

@@ -1,21 +1,44 @@
 package com.ringcentral.platform.metrics.infoProviders;
 
-import java.util.List;
-import java.util.concurrent.locks.*;
 import com.ringcentral.platform.metrics.names.MetricNamed;
 import com.ringcentral.platform.metrics.predicates.MetricNamedPredicate;
 
+import java.util.List;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.function.Predicate;
+
 public class ConcurrentMaskTreeMetricNamedInfoProvider<I>
     extends MaskTreeMetricNamedInfoProvider<I>
     implements ConcurrentMetricNamedInfoProvider<I> {
 
     private final ReadWriteLock rwLock = new ReentrantReadWriteLock();
 
     @Override
-    public MaskTreeMetricNamedInfoProvider<I> addInfo(MetricNamedPredicate predicate, I info) {
+    public MaskTreeMetricNamedInfoProvider<I> addInfo(String key, MetricNamedPredicate predicate, I info) {
+        try {
+            rwLock.writeLock().lock();
+            return super.addInfo(key, predicate, info);
+        } finally {
+            rwLock.writeLock().unlock();
+        }
+    }
+
+    @Override
+    public MaskTreeMetricNamedInfoProvider<I> removeInfo(String key) {
+        try {
+            rwLock.writeLock().lock();
+            return super.removeInfo(key);
+        } finally {
+            rwLock.writeLock().unlock();
+        }
+    }
+
+    @Override
+    public PredicativeMetricNamedInfoProvider<I> removeInfos(Predicate<String> keyPredicate) {
         try {
             rwLock.writeLock().lock();
-            return super.addInfo(predicate, info);
+            return super.removeInfos(keyPredicate);
         } finally {
             rwLock.writeLock().unlock();
         }

metrics-facade-base/src/main/java/com/ringcentral/platform/metrics/infoProviders/DefaultConcurrentMetricNamedInfoProvider.java

@@ -1,12 +1,34 @@
 package com.ringcentral.platform.metrics.infoProviders;
 
+import com.ringcentral.platform.metrics.predicates.MetricNamedPredicate;
+
+import java.util.HashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Predicate;
 
 public class DefaultConcurrentMetricNamedInfoProvider<I>
     extends DefaultMetricNamedInfoProvider<I>
     implements ConcurrentMetricNamedInfoProvider<I> {
 
     public DefaultConcurrentMetricNamedInfoProvider() {
-        super(new CopyOnWriteArrayList<>());
+        super(new CopyOnWriteArrayList<>(), new HashMap<>());
+    }
+
+    @Override
+    public synchronized DefaultConcurrentMetricNamedInfoProvider<I> addInfo(String key, MetricNamedPredicate predicate, I info) {
+        super.addInfo(key, predicate, info);
+        return this;
+    }
+
+    @Override
+    public synchronized DefaultConcurrentMetricNamedInfoProvider<I> removeInfo(String key) {
+        super.removeInfo(key);
+        return this;
+    }
+
+    @Override
+    public synchronized DefaultConcurrentMetricNamedInfoProvider<I> removeInfos(Predicate<String> keyPredicate) {
+        super.removeInfos(keyPredicate);
+        return this;
     }
 }

metrics-facade-base/src/main/java/com/ringcentral/platform/metrics/infoProviders/DefaultMetricNamedInfoProvider.java

@@ -1,25 +1,67 @@
 package com.ringcentral.platform.metrics.infoProviders;
 
-import java.util.*;
 import com.ringcentral.platform.metrics.names.MetricNamed;
 import com.ringcentral.platform.metrics.predicates.MetricNamedPredicate;
-import static java.util.stream.Collectors.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+
+import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.toList;
 
 public class DefaultMetricNamedInfoProvider<I> implements PredicativeMetricNamedInfoProvider<I> {
 
     private final List<Entry<I>> entries;
+    private final Map<String, Entry<I>> keyToEntry;
 
     public DefaultMetricNamedInfoProvider() {
-        this(new ArrayList<>());
+        this(new ArrayList<>(), new HashMap<>());
     }
 
-    protected DefaultMetricNamedInfoProvider(List<Entry<I>> entries) {
-        this.entries = entries;
+    protected DefaultMetricNamedInfoProvider(List<Entry<I>> entries, Map<String, Entry<I>> keyToEntry) {
+        this.entries = requireNonNull(entries);
+        this.keyToEntry = requireNonNull(keyToEntry);
     }
 
     @Override
     public DefaultMetricNamedInfoProvider<I> addInfo(MetricNamedPredicate predicate, I info) {
-        entries.add(new Entry<>(predicate, info));
+        return addInfo(null, predicate, info);
+    }
+
+    @Override
+    public DefaultMetricNamedInfoProvider<I> addInfo(String key, MetricNamedPredicate predicate, I info) {
+        Entry<I> entry = new Entry<>(key, predicate, info);
+
+        if (key != null) {
+            if (keyToEntry.containsKey(key)) {
+                throw new IllegalArgumentException("Duplicate key " + key);
+            }
+
+            keyToEntry.put(key, entry);
+        }
+
+        entries.add(entry);
+        return this;
+    }
+
+    @Override
+    public DefaultMetricNamedInfoProvider<I> removeInfo(String key) {
+        Entry<I> entry = keyToEntry.remove(key);
+
+        if (entry != null) {
+            entries.remove(entry);
+        }
+
+        return this;
+    }
+
+    @Override
+    public PredicativeMetricNamedInfoProvider<I> removeInfos(Predicate<String> keyPredicate) {
+        keyToEntry.keySet().removeIf(keyPredicate);
+        entries.removeIf(e -> keyPredicate.test(e.key));
         return this;
     }
 
@@ -30,10 +72,12 @@ public List<I> infosFor(MetricNamed named) {
 
     private static class Entry<I> {
 
+        final String key;
         final MetricNamedPredicate predicate;
         final I info;
 
-        Entry(MetricNamedPredicate predicate, I info) {
+        Entry(String key, MetricNamedPredicate predicate, I info) {
+            this.key = key;
             this.predicate = predicate;
             this.info = info;
         }