Skip to content

Commit 9e2b647

Browse files
lojzatranlojzatran
committed
Merge branch 'newrelic_add_metrics' of github.com:commercetools/commercetools-sdk-java-v2 into newrelic_add_metrics
2 parents 4c6fa01 + dd2fe9b commit 9e2b647

File tree

6 files changed

+159
-9
lines changed

6 files changed

+159
-9
lines changed

‎.git-blame-ignore-revs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
a8ec45c8ea4ba559247b654d01b0d35b21a68865
22
33f3224cb40e3fa8c56ddb88962e3a4e9319685d
33
430a1a0a5dd4efe78e21526c37bec9dbce036401
4-
d0129c1095216d5c830900c8a6223ef5d4274de1
4+
d0129c1095216d5c830900c8a6223ef5d4274de14bc5c823b8ebf5a00491c7e63e1ea49d29bf5ee7

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
package com.commercetools.monitoring.newrelic;
33

4+
import static com.commercetools.monitoring.newrelic.NewrelicInfo.*;
5+
46
import java.time.Duration;
57
import java.time.Instant;
68
import java.util.Optional;
@@ -14,8 +16,6 @@
1416
import io.vrap.rmf.base.client.ContextApiHttpClientImpl;
1517
import io.vrap.rmf.base.client.http.TelemetryMiddleware;
1618

17-
import static com.commercetools.monitoring.newrelic.NewrelicInfo.*;
18-
1919
/**
2020
* <p>The NewRelicTelemetry middleware can be used to report outgoing request to commercetools to NewRelic.
2121
* It can be registered as TelemetryMiddleware to the {@link io.vrap.rmf.base.client.ClientBuilder#withTelemetryMiddleware(TelemetryMiddleware) ClientBuilder}
@@ -72,7 +72,8 @@ public CompletableFuture<ApiHttpResponse<byte[]>> invoke(ApiHttpRequest request,
7272
segment.ifPresent(Segment::end);
7373

7474
NewRelic.incrementCounter(PREFIX + CLIENT_REQUEST_TOTAL);
75-
NewRelic.recordResponseTimeMetric(PREFIX + CLIENT_DURATION, Duration.between(start, Instant.now()).toMillis());
75+
NewRelic.recordResponseTimeMetric(PREFIX + CLIENT_DURATION,
76+
Duration.between(start, Instant.now()).toMillis());
7677

7778
if (response.getStatusCode() >= 400) {
7879
NewRelic.incrementCounter(PREFIX + CLIENT_REQUEST_ERROR);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
package com.commercetools.monitoring.newrelic;
23

34
public class NewrelicInfo {

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

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

22
package com.commercetools.monitoring.newrelic;
33

4+
import static com.commercetools.monitoring.newrelic.NewrelicInfo.*;
5+
6+
import java.time.Duration;
7+
import java.time.Instant;
8+
49
import com.fasterxml.jackson.core.JsonProcessingException;
510
import com.fasterxml.jackson.core.type.TypeReference;
611
import com.fasterxml.jackson.databind.JavaType;
712
import com.newrelic.api.agent.NewRelic;
13+
814
import io.vrap.rmf.base.client.ApiHttpResponse;
915
import io.vrap.rmf.base.client.ResponseSerializer;
1016

11-
import java.time.Duration;
12-
import java.time.Instant;
13-
14-
import static com.commercetools.monitoring.newrelic.NewrelicInfo.*;
15-
1617
/**
1718
* This serializer uses API to submit metrics to newrelic.
1819
*/

‎licenses/commercetools-monitoring-newrelic/index.json

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,32 @@
7878
}
7979
]
8080
},
81+
{
82+
"moduleName": "com.newrelic.telemetry:telemetry-core",
83+
"moduleVersion": "0.16.0",
84+
"moduleUrls": [
85+
"https://github.com/newrelic/newrelic-telemetry-sdk-java"
86+
],
87+
"moduleLicenses": [
88+
{
89+
"moduleLicense": "Apache License, Version 2.0",
90+
"moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
91+
}
92+
]
93+
},
94+
{
95+
"moduleName": "com.newrelic.telemetry:telemetry-http-okhttp",
96+
"moduleVersion": "0.16.0",
97+
"moduleUrls": [
98+
"https://github.com/newrelic/newrelic-telemetry-sdk-java"
99+
],
100+
"moduleLicenses": [
101+
{
102+
"moduleLicense": "Apache License, Version 2.0",
103+
"moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
104+
}
105+
]
106+
},
81107
{
82108
"moduleName": "com.spotify:completable-futures",
83109
"moduleVersion": "0.3.6",
@@ -91,6 +117,36 @@
91117
}
92118
]
93119
},
120+
{
121+
"moduleName": "com.squareup.okhttp3:okhttp",
122+
"moduleVersion": "4.12.0",
123+
"moduleUrls": [
124+
"https://square.github.io/okhttp/"
125+
],
126+
"moduleLicenses": [
127+
{
128+
"moduleLicense": "Apache License, Version 2.0",
129+
"moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
130+
}
131+
]
132+
},
133+
{
134+
"moduleName": "com.squareup.okio:okio",
135+
"moduleVersion": "3.6.0"
136+
},
137+
{
138+
"moduleName": "com.squareup.okio:okio-jvm",
139+
"moduleVersion": "3.6.0",
140+
"moduleUrls": [
141+
"https://github.com/square/okio/"
142+
],
143+
"moduleLicenses": [
144+
{
145+
"moduleLicense": "Apache License, Version 2.0",
146+
"moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
147+
}
148+
]
149+
},
94150
{
95151
"moduleName": "dev.failsafe:failsafe",
96152
"moduleVersion": "3.3.2",
@@ -128,6 +184,71 @@
128184
}
129185
]
130186
},
187+
{
188+
"moduleName": "org.jetbrains.kotlin:kotlin-stdlib",
189+
"moduleVersion": "1.9.10",
190+
"moduleUrls": [
191+
"https://kotlinlang.org/"
192+
],
193+
"moduleLicenses": [
194+
{
195+
"moduleLicense": "Apache License, Version 2.0",
196+
"moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
197+
}
198+
]
199+
},
200+
{
201+
"moduleName": "org.jetbrains.kotlin:kotlin-stdlib-common",
202+
"moduleVersion": "1.9.10",
203+
"moduleUrls": [
204+
"https://kotlinlang.org/"
205+
],
206+
"moduleLicenses": [
207+
{
208+
"moduleLicense": "Apache License, Version 2.0",
209+
"moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
210+
}
211+
]
212+
},
213+
{
214+
"moduleName": "org.jetbrains.kotlin:kotlin-stdlib-jdk7",
215+
"moduleVersion": "1.9.10",
216+
"moduleUrls": [
217+
"https://kotlinlang.org/"
218+
],
219+
"moduleLicenses": [
220+
{
221+
"moduleLicense": "Apache License, Version 2.0",
222+
"moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
223+
}
224+
]
225+
},
226+
{
227+
"moduleName": "org.jetbrains.kotlin:kotlin-stdlib-jdk8",
228+
"moduleVersion": "1.9.10",
229+
"moduleUrls": [
230+
"https://kotlinlang.org/"
231+
],
232+
"moduleLicenses": [
233+
{
234+
"moduleLicense": "Apache License, Version 2.0",
235+
"moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
236+
}
237+
]
238+
},
239+
{
240+
"moduleName": "org.jetbrains:annotations",
241+
"moduleVersion": "13.0",
242+
"moduleUrls": [
243+
"http://www.jetbrains.org"
244+
],
245+
"moduleLicenses": [
246+
{
247+
"moduleLicense": "Apache License, Version 2.0",
248+
"moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
249+
}
250+
]
251+
},
131252
{
132253
"moduleName": "org.slf4j:slf4j-api",
133254
"moduleVersion": "1.7.36",

‎licenses/index.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,32 @@
385385
}
386386
]
387387
},
388+
{
389+
"moduleName": "com.newrelic.telemetry:telemetry-core",
390+
"moduleVersion": "0.16.0",
391+
"moduleUrls": [
392+
"https://github.com/newrelic/newrelic-telemetry-sdk-java"
393+
],
394+
"moduleLicenses": [
395+
{
396+
"moduleLicense": "Apache License, Version 2.0",
397+
"moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
398+
}
399+
]
400+
},
401+
{
402+
"moduleName": "com.newrelic.telemetry:telemetry-http-okhttp",
403+
"moduleVersion": "0.16.0",
404+
"moduleUrls": [
405+
"https://github.com/newrelic/newrelic-telemetry-sdk-java"
406+
],
407+
"moduleLicenses": [
408+
{
409+
"moduleLicense": "Apache License, Version 2.0",
410+
"moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
411+
}
412+
]
413+
},
388414
{
389415
"moduleName": "com.spotify:completable-futures",
390416
"moduleVersion": "0.3.6",

0 commit comments

Comments
 (0)