Merge pull request #731 from scalecube/get-rid-of-drowizard

Get rid of drowizard

Author: artem-v

pom.xml

@@ -29,7 +29,6 @@
     <scalecube-config.version>0.4.3</scalecube-config.version>
     <reactor.version>Dysprosium-SR7</reactor.version>
     <rsocket.version>1.0.0-RC7</rsocket.version>
-    <metrics.version>3.1.2</metrics.version>
     <protostuff.version>1.6.0</protostuff.version>
     <netty.version>4.1.48.Final</netty.version>
     <slf4j.version>1.7.30</slf4j.version>
@@ -177,13 +176,6 @@
         <version>${scalecube-benchmarks.version}</version>
       </dependency>
 
-      <!-- Codahale -->
-      <dependency>
-        <groupId>io.dropwizard.metrics</groupId>
-        <artifactId>metrics-core</artifactId>
-        <version>${metrics.version}</version>
-      </dependency>
-
       <!-- JCTools -->
       <dependency>
         <groupId>org.jctools</groupId>

services-benchmarks/pom.xml

@@ -59,11 +59,6 @@
       <artifactId>scalecube-benchmarks-log4j2</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>io.dropwizard.metrics</groupId>
-      <artifactId>metrics-core</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>io.scalecube</groupId>
       <artifactId>scalecube-services-examples</artifactId>

services-benchmarks/src/main/java/io/scalecube/services/benchmarks/transport/BenchmarkServiceState.java

@@ -32,7 +32,6 @@ public BenchmarkServiceState(BenchmarkSettings settings, Object... services) {
   public void beforeAll() {
     seed =
         Microservices.builder()
-            .metrics(registry())
             .discovery(ScalecubeServiceDiscovery::new)
             .transport(RSocketServiceTransport::new)
             .startAwait();
@@ -41,7 +40,6 @@ public void beforeAll() {
 
     node =
         Microservices.builder()
-            .metrics(registry())
             .discovery(
                 endpoint ->
                     new ScalecubeServiceDiscovery(endpoint)

services/pom.xml

@@ -23,11 +23,6 @@
       <artifactId>reactor-core</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>io.dropwizard.metrics</groupId>
-      <artifactId>metrics-core</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.jctools</groupId>
       <artifactId>jctools-core</artifactId>

services/src/main/java/io/scalecube/services/Microservices.java

@@ -1,6 +1,5 @@
 package io.scalecube.services;
 
-import com.codahale.metrics.MetricRegistry;
 import io.scalecube.net.Address;
 import io.scalecube.services.auth.Authenticator;
 import io.scalecube.services.discovery.api.ServiceDiscovery;
@@ -13,7 +12,6 @@
 import io.scalecube.services.methods.ServiceMethodInvoker;
 import io.scalecube.services.methods.ServiceMethodRegistry;
 import io.scalecube.services.methods.ServiceMethodRegistryImpl;
-import io.scalecube.services.metrics.Metrics;
 import io.scalecube.services.registry.ServiceRegistryImpl;
 import io.scalecube.services.registry.api.ServiceRegistry;
 import io.scalecube.services.routing.RoundRobinServiceRouter;
@@ -116,7 +114,6 @@ public final class Microservices {
   public static final Logger LOGGER = LoggerFactory.getLogger(Microservices.class);
 
   private final String id = generateId();
-  private final Metrics metrics;
   private final Map<String, String> tags;
   private final List<ServiceProvider> serviceProviders;
   private final ServiceRegistry serviceRegistry;
@@ -132,7 +129,6 @@ public final class Microservices {
   private final MonoProcessor<Void> onShutdown = MonoProcessor.create();
 
   private Microservices(Builder builder) {
-    this.metrics = builder.metrics;
     this.tags = new HashMap<>(builder.tags);
     this.serviceProviders = new ArrayList<>(builder.serviceProviders);
     this.serviceRegistry = builder.serviceRegistry;
@@ -233,11 +229,7 @@ private void registerInMethodRegistry(ServiceInfo serviceInfo) {
   }
 
   private Mono<GatewayBootstrap> startGateway(ServiceCall call) {
-    return gatewayBootstrap.start(this, new GatewayOptions().call(call).metrics(metrics));
-  }
-
-  public Metrics metrics() {
-    return this.metrics;
+    return gatewayBootstrap.start(this, new GatewayOptions().call(call));
   }
 
   public Address serviceAddress() {
@@ -311,7 +303,6 @@ private Mono<Void> processBeforeDestroy() {
 
   public static final class Builder {
 
-    private Metrics metrics;
     private Map<String, String> tags = new HashMap<>();
     private List<ServiceProvider> serviceProviders = new ArrayList<>();
     private ServiceRegistry serviceRegistry = new ServiceRegistryImpl();
@@ -388,11 +379,6 @@ public Builder transport(Supplier<ServiceTransport> supplier) {
       return this;
     }
 
-    public Builder metrics(MetricRegistry metrics) {
-      this.metrics = new Metrics(metrics);
-      return this;
-    }
-
     public Builder tags(Map<String, String> tags) {
       this.tags = tags;
       return this;

services/src/main/java/io/scalecube/services/gateway/GatewayMetrics.java

@@ -1,15 +1,13 @@
 package io.scalecube.services.gateway;
 
 import io.scalecube.services.ServiceCall;
-import io.scalecube.services.metrics.Metrics;
 import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 
 public class GatewayOptions {
 
   private Executor workerPool;
   private ServiceCall call;
-  private Metrics metrics;
   private String id;
   private int port = 0;
 
@@ -25,7 +23,6 @@ public GatewayOptions(GatewayOptions other) {
     this.port = other.port;
     this.workerPool = other.workerPool;
     this.call = other.call;
-    this.metrics = other.metrics;
   }
 
   private GatewayOptions set(Consumer<GatewayOptions> c) {
@@ -65,12 +62,4 @@ public GatewayOptions call(ServiceCall call) {
   public ServiceCall call() {
     return call;
   }
-
-  public GatewayOptions metrics(Metrics metrics) {
-    return set(o -> o.metrics = metrics);
-  }
-
-  public Metrics metrics() {
-    return metrics;
-  }
 }