Updating tally core dependency. (#769)

* Updating tally core dependency.

Author: mindaugasbarcauskas

build.gradle

@@ -61,7 +61,7 @@ dependencies {
     compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36'
     compile group: 'org.apache.thrift', name: 'libthrift', version: '0.9.3'
     compile group: 'com.google.code.gson', name: 'gson', version: '2.10'
-    compile group: 'com.uber.m3', name: 'tally-core', version: '0.4.0'
+    compile group: 'com.uber.m3', name: 'tally-core', version: '0.11.1'
     compile group: 'com.google.guava', name: 'guava', version: '31.1-jre'
     compile group: 'com.cronutils', name: 'cron-utils', version: '9.2.0'
     compile group: 'io.micrometer', name: 'micrometer-core', version: '1.10.2'

src/main/java/com/uber/cadence/internal/metrics/NoopScope.java

@@ -17,7 +17,6 @@
 
 package com.uber.cadence.internal.metrics;
 
-import com.uber.m3.tally.Buckets;
 import com.uber.m3.tally.Capabilities;
 import com.uber.m3.tally.CapableOf;
 import com.uber.m3.tally.Counter;
@@ -52,7 +51,8 @@ public Timer timer(String name) {
   }
 
   @Override
-  public Histogram histogram(String name, Buckets buckets) {
+  @SuppressWarnings("deprecation")
+  public Histogram histogram(String name, com.uber.m3.tally.Buckets buckets) {
     return noopHistogram;
   }
 

src/main/java/com/uber/cadence/internal/metrics/ReplayAwareScope.java

@@ -18,7 +18,6 @@
 package com.uber.cadence.internal.metrics;
 
 import com.uber.cadence.internal.replay.ReplayAware;
-import com.uber.m3.tally.Buckets;
 import com.uber.m3.tally.Capabilities;
 import com.uber.m3.tally.Counter;
 import com.uber.m3.tally.Gauge;
@@ -173,7 +172,8 @@ public Timer timer(String name) {
   }
 
   @Override
-  public Histogram histogram(String name, Buckets buckets) {
+  @SuppressWarnings("deprecation")
+  public Histogram histogram(String name, com.uber.m3.tally.Buckets buckets) {
     return new ReplayAwareHistogram(scope.histogram(name, buckets));
   }
 

src/main/java/com/uber/cadence/reporter/CadenceClientStatsReporter.java

@@ -22,7 +22,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.AtomicDouble;
 import com.uber.cadence.internal.metrics.MetricsTag;
-import com.uber.m3.tally.Buckets;
 import com.uber.m3.tally.Capabilities;
 import com.uber.m3.tally.CapableOf;
 import com.uber.m3.tally.StatsReporter;
@@ -77,21 +76,23 @@ public void reportTimer(String name, Map<String, String> tags, Duration interval
   }
 
   @Override
+  @SuppressWarnings("deprecation")
   public void reportHistogramValueSamples(
       String name,
       Map<String, String> tags,
-      Buckets buckets,
+      com.uber.m3.tally.Buckets buckets,
       double bucketLowerBound,
       double bucketUpperBound,
       long samples) {
     // NOOP
   }
 
   @Override
+  @SuppressWarnings("deprecation")
   public void reportHistogramDurationSamples(
       String name,
       Map<String, String> tags,
-      Buckets buckets,
+      com.uber.m3.tally.Buckets buckets,
       Duration bucketLowerBound,
       Duration bucketUpperBound,
       long samples) {

src/test/java/com/uber/cadence/metrics/ReplayAwareScopeTest.java

@@ -25,7 +25,6 @@
 
 import com.uber.cadence.internal.metrics.ReplayAwareScope;
 import com.uber.cadence.internal.replay.ReplayAware;
-import com.uber.m3.tally.Buckets;
 import com.uber.m3.tally.Counter;
 import com.uber.m3.tally.Gauge;
 import com.uber.m3.tally.Histogram;
@@ -60,20 +59,21 @@ public void testReplayAwareScopeReplaying() {
     Timer timer = mock(Timer.class);
     Histogram histogram = mock(Histogram.class);
 
-    Buckets buckets = ValueBuckets.linear(0, 10, 10);
     when(scope.counter("test-counter")).thenReturn(counter);
     when(scope.gauge("test-gauge")).thenReturn(gauge);
     when(scope.timer("test-timer")).thenReturn(timer);
-    when(scope.histogram("test-histogram", buckets)).thenReturn(histogram);
+    when(scope.histogram("test-histogram", ValueBuckets.linear(0, 10, 10))).thenReturn(histogram);
 
     TestContext context = new TestContext(true);
     Scope replayAwareScope = new ReplayAwareScope(scope, context, System::currentTimeMillis);
 
     replayAwareScope.counter("test-counter").inc(1);
     replayAwareScope.gauge("test-gauge").update(100.0);
     replayAwareScope.timer("test-timer").record(Duration.ofMillis(100));
-    replayAwareScope.histogram("test-histogram", buckets).recordValue(10);
-    replayAwareScope.histogram("test-histogram", buckets).recordDuration(Duration.ofHours(1));
+    replayAwareScope.histogram("test-histogram", ValueBuckets.linear(0, 10, 10)).recordValue(10);
+    replayAwareScope
+        .histogram("test-histogram", ValueBuckets.linear(0, 10, 10))
+        .recordDuration(Duration.ofHours(1));
 
     verify(counter, never()).inc(1);
     verify(gauge, never()).update(100.0);
@@ -90,20 +90,21 @@ public void testReplayAwareScopeNotReplaying() {
     Timer timer = mock(Timer.class);
     Histogram histogram = mock(Histogram.class);
 
-    Buckets buckets = ValueBuckets.linear(0, 10, 10);
     when(scope.counter("test-counter")).thenReturn(counter);
     when(scope.gauge("test-gauge")).thenReturn(gauge);
     when(scope.timer("test-timer")).thenReturn(timer);
-    when(scope.histogram("test-histogram", buckets)).thenReturn(histogram);
+    when(scope.histogram("test-histogram", ValueBuckets.linear(0, 10, 10))).thenReturn(histogram);
 
     TestContext context = new TestContext(false);
     Scope replayAwareScope = new ReplayAwareScope(scope, context, System::currentTimeMillis);
 
     replayAwareScope.counter("test-counter").inc(1);
     replayAwareScope.gauge("test-gauge").update(100.0);
     replayAwareScope.timer("test-timer").record(Duration.ofMillis(100));
-    replayAwareScope.histogram("test-histogram", buckets).recordValue(10);
-    replayAwareScope.histogram("test-histogram", buckets).recordDuration(Duration.ofHours(1));
+    replayAwareScope.histogram("test-histogram", ValueBuckets.linear(0, 10, 10)).recordValue(10);
+    replayAwareScope
+        .histogram("test-histogram", ValueBuckets.linear(0, 10, 10))
+        .recordDuration(Duration.ofHours(1));
 
     verify(counter, times(1)).inc(1);
     verify(gauge, times(1)).update(100.0);
@@ -131,9 +132,8 @@ public void testCustomClockForTimer() {
     Timer timer = mock(Timer.class);
     Histogram histogram = mock(Histogram.class);
 
-    Buckets buckets = ValueBuckets.linear(0, 10, 10);
     when(scope.timer("test-timer")).thenReturn(timer);
-    when(scope.histogram("test-histogram", buckets)).thenReturn(histogram);
+    when(scope.histogram("test-histogram", ValueBuckets.linear(0, 10, 10))).thenReturn(histogram);
 
     TestContext context = new TestContext(false);
     TestClock clock = new TestClock();
@@ -143,7 +143,7 @@ public void testCustomClockForTimer() {
     clock.setTime(100);
     sw.stop();
 
-    sw = replayAwareScope.histogram("test-histogram", buckets).start();
+    sw = replayAwareScope.histogram("test-histogram", ValueBuckets.linear(0, 10, 10)).start();
     clock.setTime(150);
     sw.stop();