Skip to content

Commit 77f48ac

Browse files
committed
Avoid boxing in Measurment.hashCode
Use Long.hashCode / Double.hashCode to avoid boxing in Measurment.hashCode.
1 parent 9cdfe4c commit 77f48ac

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

spectator-api/src/main/java/com/netflix/spectator/api/Measurement.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ public int hashCode() {
6363
final int prime = 31;
6464
int hc = prime;
6565
hc = prime * hc + id.hashCode();
66-
hc = prime * hc + Long.valueOf(timestamp).hashCode();
67-
hc = prime * hc + Double.valueOf(value).hashCode();
66+
hc = prime * hc + Long.hashCode(timestamp);
67+
hc = prime * hc + Double.hashCode(value);
6868
return hc;
6969
}
7070

spectator-reg-metrics5/src/test/java/com/netflix/spectator/metrics5/MetricsRegistryTest.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.netflix.spectator.metrics5;
1717

18-
import io.dropwizard.metrics5.Gauge;
1918
import io.dropwizard.metrics5.MetricName;
2019
import io.dropwizard.metrics5.MetricRegistry;
2120
import com.netflix.spectator.api.ManualClock;
@@ -24,7 +23,11 @@
2423
import org.junit.jupiter.api.Assertions;
2524
import org.junit.jupiter.api.Test;
2625

27-
import java.util.*;
26+
import java.util.Collections;
27+
import java.util.HashMap;
28+
import java.util.HashSet;
29+
import java.util.Map;
30+
import java.util.Set;
2831
import java.util.concurrent.TimeUnit;
2932
import java.util.concurrent.atomic.AtomicInteger;
3033

@@ -49,31 +52,31 @@ public void counter() {
4952
MetricRegistry dwRegistry = new MetricRegistry();
5053
MetricsRegistry r = new MetricsRegistry(clock, dwRegistry);
5154
r.counter("foo").increment();
52-
Assertions.assertEquals(1, dwRegistry.getMeters().get(new MetricName("foo", Collections.EMPTY_MAP)).getCount());
55+
Assertions.assertEquals(1, dwRegistry.getMeters().get(new MetricName("foo", Collections.emptyMap())).getCount());
5356
r.counter("foo").increment(15);
54-
Assertions.assertEquals(16, dwRegistry.getMeters().get(new MetricName("foo", Collections.EMPTY_MAP)).getCount());
57+
Assertions.assertEquals(16, dwRegistry.getMeters().get(new MetricName("foo", Collections.emptyMap())).getCount());
5558
}
5659

5760
@Test
5861
public void timer() {
5962
MetricRegistry dwRegistry = new MetricRegistry();
6063
MetricsRegistry r = new MetricsRegistry(clock, dwRegistry);
6164
r.timer("foo").record(1, TimeUnit.MILLISECONDS);
62-
Assertions.assertEquals(1, dwRegistry.getTimers().get(new MetricName("foo", Collections.EMPTY_MAP)).getCount());
65+
Assertions.assertEquals(1, dwRegistry.getTimers().get(new MetricName("foo", Collections.emptyMap())).getCount());
6366
}
6467

6568
@Test
6669
public void distributionSummary() {
6770
MetricRegistry dwRegistry = new MetricRegistry();
6871
MetricsRegistry r = new MetricsRegistry(clock, dwRegistry);
6972
r.distributionSummary("foo").record(1);
70-
Assertions.assertEquals(1, dwRegistry.getHistograms().get(new MetricName("foo", Collections.EMPTY_MAP)).getCount());
73+
Assertions.assertEquals(1, dwRegistry.getHistograms().get(new MetricName("foo", Collections.emptyMap())).getCount());
7174
}
7275

7376
private void assertGaugeValue(
7477
MetricsRegistry r, MetricRegistry dwRegistry, String name, double expected) {
7578
PolledMeter.update(r);
76-
Assertions.assertEquals(expected, (Double) dwRegistry.getGauges().get(new MetricName(name, Collections.EMPTY_MAP)).getValue(), 1e-12);
79+
Assertions.assertEquals(expected, (Double) dwRegistry.getGauges().get(new MetricName(name, Collections.emptyMap())).getValue(), 1e-12);
7780
}
7881

7982
@Test
@@ -123,7 +126,7 @@ public void gaugeRegisteredDirectly() throws Exception {
123126
AtomicInteger num = r.gauge("foo", new AtomicInteger(42));
124127

125128
// Should be registered with the Dropwizard registry
126-
Assertions.assertEquals(42.0, (Double) dwRegistry.getGauges().get(new MetricName("foo", Collections.EMPTY_MAP)).getValue(), 1e-12);
129+
Assertions.assertEquals(42.0, (Double) dwRegistry.getGauges().get(new MetricName("foo", Collections.emptyMap())).getValue(), 1e-12);
127130

128131
// Should not be registered with spectator
129132
Assertions.assertNull(r.get(r.createId("foo")));

0 commit comments

Comments
 (0)