Skip to content

Commit 78c4406

Browse files
ct-sdks[bot]ct-sdks[bot]
committed
spotless: Fix code style
1 parent a18fbcd commit 78c4406

File tree

10 files changed

+82
-56
lines changed

10 files changed

+82
-56
lines changed

‎commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/DatadogMiddleware.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,10 @@ public DatadogMiddleware(final MetricsApi apiInstance) {
6161

6262
public DatadogMiddleware(final MetricsApi apiInstance, final Map<String, String> tags) {
6363
this.apiInstance = apiInstance;
64-
this.tags = tags.entrySet().stream().map(entry -> format("%s:%s", entry.getKey(), entry.getValue())).collect(
65-
Collectors.toList());
64+
this.tags = tags.entrySet()
65+
.stream()
66+
.map(entry -> format("%s:%s", entry.getKey(), entry.getValue()))
67+
.collect(Collectors.toList());
6668
}
6769

6870
@Override

‎commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/DatadogResponseSerializer.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,25 @@ public class DatadogResponseSerializer implements ResponseSerializer {
3232

3333
private final Collection<String> tags;
3434

35-
36-
public DatadogResponseSerializer(final ResponseSerializer serializer, final MetricsApi apiInstance, final Map<String, String> tags) {
35+
public DatadogResponseSerializer(final ResponseSerializer serializer, final MetricsApi apiInstance,
36+
final Map<String, String> tags) {
3737
this.serializer = serializer;
3838
this.apiInstance = apiInstance;
39-
this.tags = tags.entrySet().stream().map(entry -> format("%s:%s", entry.getKey(), entry.getValue())).collect(
40-
Collectors.toList());
39+
this.tags = tags.entrySet()
40+
.stream()
41+
.map(entry -> format("%s:%s", entry.getKey(), entry.getValue()))
42+
.collect(Collectors.toList());
4143
}
4244

4345
public DatadogResponseSerializer(final ResponseSerializer serializer, final MetricsApi apiInstance) {
44-
this(serializer, apiInstance, Collections.emptyMap());
46+
this(serializer, apiInstance, Collections.emptyMap());
4547
}
4648

47-
public DatadogResponseSerializer(final ResponseSerializer serializer, final ApiClient ddApiClient, final Map<String, String> tags) {
49+
public DatadogResponseSerializer(final ResponseSerializer serializer, final ApiClient ddApiClient,
50+
final Map<String, String> tags) {
4851
this(serializer, new MetricsApi(ddApiClient), tags);
4952
}
53+
5054
public DatadogResponseSerializer(final ResponseSerializer serializer, final ApiClient ddApiClient) {
5155
this(serializer, new MetricsApi(ddApiClient), Collections.emptyMap());
5256
}

‎commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/DatadogUtils.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ public class DatadogUtils {
2525
private static final Logger logger = LoggerFactory.getLogger(DatadogMiddleware.class);
2626

2727
protected static void submitClientDurationMetric(final ApiHttpRequest request, final MetricsApi apiInstance,
28-
final double durationInMillis, final ApiHttpResponse<byte[]> response, final Collection<String> tags) throws ApiException {
28+
final double durationInMillis, final ApiHttpResponse<byte[]> response, final Collection<String> tags)
29+
throws ApiException {
2930
submitClientDurationMetric(request, apiInstance, durationInMillis, response.getStatusCode(), tags);
3031
}
3132

@@ -67,8 +68,8 @@ private static void submitMetricWithHttpTags(final String name, final double val
6768
}
6869

6970
private static void submitMetricWithHttpTags(final String name, final double value, final MetricIntakeType type,
70-
final String unit, final ApiHttpRequest request, final MetricsApi apiInstance, final int statusCode, final Collection<String> tags)
71-
throws ApiException {
71+
final String unit, final ApiHttpRequest request, final MetricsApi apiInstance, final int statusCode,
72+
final Collection<String> tags) throws ApiException {
7273
final List<String> currentTags = new ArrayList<>(tags);
7374
currentTags.add(format("%s:%s", HTTP_RESPONSE_STATUS_CODE, statusCode));
7475
currentTags.add(format("%s:%s", HTTP_REQUEST_METHOD, request.getMethod().name()));

‎commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/statsd/DatadogMiddleware.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ public DatadogMiddleware(final StatsDClient datadogStatsDClient) {
5050

5151
public DatadogMiddleware(final StatsDClient datadogStatsDClient, final Map<String, String> tags) {
5252
this.statsDClient = datadogStatsDClient;
53-
this.tags = tags.entrySet().stream().map(entry -> format("%s:%s", entry.getKey(), entry.getValue())).collect(
54-
Collectors.toList());
53+
this.tags = tags.entrySet()
54+
.stream()
55+
.map(entry -> format("%s:%s", entry.getKey(), entry.getValue()))
56+
.collect(Collectors.toList());
5557
}
5658

5759
@Override

‎commercetools/commercetools-monitoring-datadog/src/main/java/com/commercetools/monitoring/datadog/statsd/DatadogResponseSerializer.java‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,22 @@ public class DatadogResponseSerializer implements ResponseSerializer {
2828

2929
private final Collection<String> tags;
3030

31-
3231
public DatadogResponseSerializer(final ResponseSerializer serializer, final StatsDClient datadogStatsDClient) {
3332
this.serializer = serializer;
3433
this.statsDClient = datadogStatsDClient;
3534
this.tags = Collections.emptyList();
3635
}
3736

38-
public DatadogResponseSerializer(final ResponseSerializer serializer, final StatsDClient datadogStatsDClient, final Map<String, String> tags) {
37+
public DatadogResponseSerializer(final ResponseSerializer serializer, final StatsDClient datadogStatsDClient,
38+
final Map<String, String> tags) {
3939
this.serializer = serializer;
4040
this.statsDClient = datadogStatsDClient;
41-
this.tags = tags.entrySet().stream().map(entry -> format("%s:%s", entry.getKey(), entry.getValue())).collect(
42-
Collectors.toList());
41+
this.tags = tags.entrySet()
42+
.stream()
43+
.map(entry -> format("%s:%s", entry.getKey(), entry.getValue()))
44+
.collect(Collectors.toList());
4345
}
4446

45-
4647
@Override
4748
public <O> ApiHttpResponse<O> convertResponse(ApiHttpResponse<byte[]> response, Class<O> outputType) {
4849
Instant start = Instant.now();
@@ -51,7 +52,8 @@ public <O> ApiHttpResponse<O> convertResponse(ApiHttpResponse<byte[]> response,
5152
final Collection<String> tags = new ArrayList<>(this.tags);
5253
tags.add(format("%s:%s", RESPONSE_BODY_TYPE, outputType.getCanonicalName()));
5354

54-
this.statsDClient.recordHistogramValue(PREFIX + "." + JSON_DESERIALIZATION, durationInMillis, tags.toArray(new String[0]));
55+
this.statsDClient.recordHistogramValue(PREFIX + "." + JSON_DESERIALIZATION, durationInMillis,
56+
tags.toArray(new String[0]));
5557
return result;
5658
}
5759

@@ -63,7 +65,8 @@ public <O> ApiHttpResponse<O> convertResponse(ApiHttpResponse<byte[]> response,
6365
final Collection<String> tags = new ArrayList<>(this.tags);
6466
tags.add(format("%s:%s", RESPONSE_BODY_TYPE, outputType.toString()));
6567

66-
this.statsDClient.recordHistogramValue(PREFIX + "." + JSON_DESERIALIZATION, durationInMillis, tags.toArray(new String[0]));
68+
this.statsDClient.recordHistogramValue(PREFIX + "." + JSON_DESERIALIZATION, durationInMillis,
69+
tags.toArray(new String[0]));
6770
return result;
6871
}
6972

@@ -75,7 +78,8 @@ public <O> ApiHttpResponse<O> convertResponse(ApiHttpResponse<byte[]> response,
7578
final Collection<String> tags = new ArrayList<>(this.tags);
7679
tags.add(format("%s:%s", RESPONSE_BODY_TYPE, outputType.getType().getTypeName()));
7780

78-
this.statsDClient.recordHistogramValue(PREFIX + "." + JSON_DESERIALIZATION, durationInMillis, tags.toArray(new String[0]));
81+
this.statsDClient.recordHistogramValue(PREFIX + "." + JSON_DESERIALIZATION, durationInMillis,
82+
tags.toArray(new String[0]));
7983
return result;
8084
}
8185

@@ -87,7 +91,8 @@ public byte[] toJsonByteArray(Object value) throws JsonProcessingException {
8791
final Collection<String> tags = new ArrayList<>(this.tags);
8892
tags.add(format("%s:%s", RESPONSE_BODY_TYPE, value.getClass().getCanonicalName()));
8993

90-
this.statsDClient.recordHistogramValue(PREFIX + "." + JSON_SERIALIZATION, durationInMillis, tags.toArray(new String[0]));
94+
this.statsDClient.recordHistogramValue(PREFIX + "." + JSON_SERIALIZATION, durationInMillis,
95+
tags.toArray(new String[0]));
9196
return result;
9297
}
9398

‎commercetools/commercetools-monitoring-datadog/src/test/java/example/ResponseSerializerTest.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11

22
package example;
33

4+
import java.util.HashMap;
5+
import java.util.Map;
6+
47
import com.commercetools.api.models.common.Reference;
58
import com.commercetools.api.models.product.ProductReference;
69
import com.commercetools.monitoring.datadog.DatadogResponseSerializer;
@@ -16,9 +19,6 @@
1619
import org.junit.jupiter.api.Test;
1720
import org.mockito.Mockito;
1821

19-
import java.util.HashMap;
20-
import java.util.Map;
21-
2222
public class ResponseSerializerTest {
2323

2424
@Test
@@ -58,7 +58,8 @@ public void testSerializeWithAttributes() throws ApiException, JsonProcessingExc
5858
.isEqualTo("commercetools.json.serialization");
5959
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().size()).isEqualTo(2);
6060
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(0)).isEqualTo("foo:bar");
61-
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(1)).isEqualTo("response.body.type:com.commercetools.api.models.product.ProductReferenceImpl");
61+
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(1))
62+
.isEqualTo("response.body.type:com.commercetools.api.models.product.ProductReferenceImpl");
6263

6364
return true;
6465
}));
@@ -105,7 +106,8 @@ public void testDeserializeWithAttributes() throws ApiException, JsonProcessingE
105106
.isEqualTo("commercetools.json.deserialization");
106107
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().size()).isEqualTo(2);
107108
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(0)).isEqualTo("foo:bar");
108-
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(1)).isEqualTo("request.body.type:com.commercetools.api.models.common.Reference");
109+
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(1))
110+
.isEqualTo("request.body.type:com.commercetools.api.models.common.Reference");
109111
return true;
110112
}));
111113
}

‎commercetools/commercetools-monitoring-datadog/src/test/java/example/TelemetryMiddlewareTest.java‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,10 @@ public void testCounts(int statusCode, int count) throws ApiException {
5151
.isIn("commercetools.client.duration", "commercetools.client.request.total",
5252
"commercetools.client.request.error");
5353
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().size()).isEqualTo(3);
54-
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(0)).isEqualTo("http.response.status_code:" + statusCode);
55-
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(1)).isEqualTo("http.request.method:GET");
54+
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(0))
55+
.isEqualTo("http.response.status_code:" + statusCode);
56+
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(1))
57+
.isEqualTo("http.request.method:GET");
5658
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(2)).isEqualTo("server.address:null");
5759

5860
return true;
@@ -88,8 +90,10 @@ public void testHttpCounts(int statusCode, int count) throws URISyntaxException,
8890
.isIn("commercetools.client.duration", "commercetools.client.request.total",
8991
"commercetools.client.request.error");
9092
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().size()).isEqualTo(3);
91-
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(0)).isEqualTo("http.response.status_code:" + statusCode);
92-
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(1)).isEqualTo("http.request.method:GET");
93+
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(0))
94+
.isEqualTo("http.response.status_code:" + statusCode);
95+
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(1))
96+
.isEqualTo("http.request.method:GET");
9397
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(2)).isEqualTo("server.address:null");
9498
return true;
9599
}));
@@ -106,23 +110,25 @@ public void testCountsWithAttributes(int statusCode, int count) throws ApiExcept
106110
DatadogMiddleware middleware = new DatadogMiddleware(metricsApi, tags);
107111

108112
final ApiHttpRequest request = new ApiHttpRequest(ApiHttpMethod.GET, URI.create("/"), new ApiHttpHeaders(),
109-
"".getBytes());
113+
"".getBytes());
110114

111115
blockingWait(
112-
middleware.invoke(request,
113-
request1 -> CompletableFuture
114-
.completedFuture(new ApiHttpResponse<>(statusCode, new ApiHttpHeaders(), "".getBytes()))),
115-
Duration.ofSeconds(1));
116+
middleware.invoke(request,
117+
request1 -> CompletableFuture
118+
.completedFuture(new ApiHttpResponse<>(statusCode, new ApiHttpHeaders(), "".getBytes()))),
119+
Duration.ofSeconds(1));
116120

117121
Mockito.verify(metricsApi, Mockito.times(count)).submitMetrics(Mockito.argThat(metricPayload -> {
118122
Assertions.assertThat(metricPayload).isNotNull();
119123
Assertions.assertThat(metricPayload.getSeries().get(0).getMetric())
120124
.isIn("commercetools.client.duration", "commercetools.client.request.total",
121-
"commercetools.client.request.error");
125+
"commercetools.client.request.error");
122126
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().size()).isEqualTo(4);
123127
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(0)).isEqualTo("foo:bar");
124-
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(1)).isEqualTo("http.response.status_code:" + statusCode);
125-
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(2)).isEqualTo("http.request.method:GET");
128+
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(1))
129+
.isEqualTo("http.response.status_code:" + statusCode);
130+
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(2))
131+
.isEqualTo("http.request.method:GET");
126132
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(3)).isEqualTo("server.address:null");
127133

128134
return true;
@@ -148,7 +154,7 @@ public void testHttpCountsWithAttributes(int statusCode, int count) throws URISy
148154
.build();
149155

150156
final ApiHttpRequest request = new ApiHttpRequest(ApiHttpMethod.GET, URI.create("/"), new ApiHttpHeaders(),
151-
"".getBytes());
157+
"".getBytes());
152158
try {
153159
blockingWait(client.execute(request), Duration.ofSeconds(1));
154160
}
@@ -159,11 +165,13 @@ public void testHttpCountsWithAttributes(int statusCode, int count) throws URISy
159165
Assertions.assertThat(metricPayload).isNotNull();
160166
Assertions.assertThat(metricPayload.getSeries().get(0).getMetric())
161167
.isIn("commercetools.client.duration", "commercetools.client.request.total",
162-
"commercetools.client.request.error");
168+
"commercetools.client.request.error");
163169
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().size()).isEqualTo(4);
164170
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(0)).isEqualTo("foo:bar");
165-
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(1)).isEqualTo("http.response.status_code:" + statusCode);
166-
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(2)).isEqualTo("http.request.method:GET");
171+
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(1))
172+
.isEqualTo("http.response.status_code:" + statusCode);
173+
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(2))
174+
.isEqualTo("http.request.method:GET");
167175
Assertions.assertThat(metricPayload.getSeries().get(0).getTags().get(3)).isEqualTo("server.address:null");
168176

169177
return true;

‎commercetools/commercetools-monitoring-newrelic/src/main/java/com/commercetools/monitoring/newrelic/NewRelicTelemetryMiddleware.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
package com.commercetools.monitoring.newrelic;
33

44
import static com.commercetools.monitoring.newrelic.NewrelicInfo.*;
5-
import static java.lang.String.format;
65

76
import java.time.Duration;
87
import java.time.Instant;
98
import java.util.*;
109
import java.util.concurrent.CompletableFuture;
1110
import java.util.function.Function;
12-
import java.util.stream.Collectors;
1311

1412
import com.newrelic.api.agent.*;
1513

‎commercetools/commercetools-monitoring-opentelemetry/src/main/java/com/commercetools/monitoring/opentelemetry/OpenTelemetryMiddleware.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import java.util.function.Function;
1111

1212
import io.opentelemetry.api.OpenTelemetry;
13-
import io.opentelemetry.api.common.AttributeKey;
1413
import io.opentelemetry.api.common.Attributes;
1514
import io.opentelemetry.api.common.AttributesBuilder;
1615
import io.opentelemetry.api.metrics.LongCounter;
@@ -57,7 +56,9 @@ public OpenTelemetryMiddleware(final OpenTelemetry otel, final boolean enableHis
5756
public OpenTelemetryMiddleware(final OpenTelemetry otel, final boolean enableHistogram, final String prefix) {
5857
this(otel, enableHistogram, prefix, Collections.emptyMap());
5958
}
60-
public OpenTelemetryMiddleware(final OpenTelemetry otel, final boolean enableHistogram, final String prefix, final Map<String, String> attributes) {
59+
60+
public OpenTelemetryMiddleware(final OpenTelemetry otel, final boolean enableHistogram, final String prefix,
61+
final Map<String, String> attributes) {
6162
AttributesBuilder attrBuilder = Attributes.builder();
6263
attributes.forEach(attrBuilder::put);
6364
this.attributes = attrBuilder.build();

0 commit comments

Comments
 (0)