Skip to content

Commit 9ec6c11

Browse files
vjkoskelaBrandonArp
authored andcommitted
Use the latest commons with thread local builder clone support. (#79)
1 parent e1da55d commit 9ec6c11

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<akka.http.version>10.0.11</akka.http.version>
7676
<apache.httpclient.version>4.5.1</apache.httpclient.version>
7777
<apache.httpcore.version>4.4.3</apache.httpcore.version>
78-
<arpnetworking.commons.version>1.14.0</arpnetworking.commons.version>
78+
<arpnetworking.commons.version>1.15.0</arpnetworking.commons.version>
7979
<aspectjrt.version>1.8.9</aspectjrt.version>
8080
<cglib.version>3.2.5</cglib.version>
8181
<client.protocol.version>0.10.0</client.protocol.version>

src/main/java/com/arpnetworking/metrics/mad/sources/MappingSource.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.arpnetworking.metrics.mad.sources;
1717

18-
import com.arpnetworking.commons.builder.OvalBuilder;
1918
import com.arpnetworking.commons.builder.ThreadLocalBuilder;
2019
import com.arpnetworking.commons.observer.Observable;
2120
import com.arpnetworking.commons.observer.Observer;
@@ -147,10 +146,9 @@ public void notify(final Observable observable, final Object event) {
147146
Maps.transformEntries(
148147
mergedMetrics,
149148
(key, mergingMetric) ->
150-
OvalBuilder.clone(
149+
ThreadLocalBuilder.clone(
151150
mergingMetric,
152-
new DefaultMetric.Builder())
153-
.build())))
151+
DefaultMetric.Builder.class))))
154152
.setId(record.getId())
155153
.setTime(record.getTime())
156154
.setAnnotations(record.getAnnotations())

src/main/java/com/arpnetworking/tsdcore/sinks/TimeThresholdSink.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package com.arpnetworking.tsdcore.sinks;
1717

18+
import com.arpnetworking.commons.builder.ThreadLocalBuilder;
1819
import com.arpnetworking.logback.annotations.LogValue;
1920
import com.arpnetworking.steno.LogValueMapFactory;
2021
import com.arpnetworking.steno.Logger;
@@ -56,9 +57,10 @@ public void recordAggregateData(final PeriodicData periodicData) {
5657
final ImmutableMultimap<String, AggregatedData> filteredData = _filter.filter(periodicData);
5758
if (!filteredData.isEmpty()) {
5859
_sink.recordAggregateData(
59-
PeriodicData.Builder.clone(periodicData, new PeriodicData.Builder())
60-
.setData(filteredData)
61-
.build());
60+
ThreadLocalBuilder.clone(
61+
periodicData,
62+
PeriodicData.Builder.class,
63+
b -> b.setData(filteredData)));
6264
}
6365
}
6466
}

0 commit comments

Comments
 (0)