Skip to content

Commit ce595a8

Browse files
Bump org.asynchttpclient:async-http-client from 2.12.3 to 3.0.0 (#384)
Bumps [org.asynchttpclient:async-http-client](https://github.com/AsyncHttpClient/async-http-client) from 2.12.3 to 3.0.0. - [Release notes](https://github.com/AsyncHttpClient/async-http-client/releases) - [Changelog](https://github.com/AsyncHttpClient/async-http-client/blob/main/CHANGES.md) - [Commits](AsyncHttpClient/async-http-client@async-http-client-project-2.12.3...async-http-client-project-3.0.0) --- updated-dependencies: - dependency-name: org.asynchttpclient:async-http-client dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 9d338f0 commit ce595a8

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<apache.httpcore.version>4.4.16</apache.httpcore.version>
109109
<arpnetworking.commons.version>3.1.1</arpnetworking.commons.version>
110110
<aspectjrt.version>1.9.22.1</aspectjrt.version>
111-
<asynchttpclient.version>2.12.3</asynchttpclient.version>
111+
<asynchttpclient.version>3.0.0</asynchttpclient.version>
112112
<awaitility.version>4.2.1</awaitility.version>
113113
<commons.codec.version>1.17.1</commons.codec.version>
114114
<ebean.version>15.5.0</ebean.version>

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,15 @@ public Receive createReceive() {
199199
final int attempt = rejected.getAttempt();
200200
final Response response = rejected.getResponse();
201201
if (_retryableStatusCodes.contains(response.getStatusCode()) && attempt < _sink.getMaximumAttempts()) {
202+
final byte[] requestBodyBytes = rejected.getRequestEntry().getRequest().getByteData();
203+
// CHECKSTYLE.OFF: IllegalInstantiation - This is ok for String from byte[]
204+
final String requestBody = requestBodyBytes == null ? null : new String(requestBodyBytes, Charsets.UTF_8);
205+
// CHECKSTYLE.ON: IllegalInstantiation
202206
POST_RETRY_LOGGER.warn()
203207
.setMessage("Attempt rejected")
204208
.addData("sink", _sink)
205209
.addData("status", response.getStatusCode())
206-
// CHECKSTYLE.OFF: IllegalInstantiation - This is ok for String from byte[]
207-
.addData("request", new String(rejected.getRequestEntry().getRequest().getByteData(), Charsets.UTF_8))
208-
// CHECKSTYLE.ON: IllegalInstantiation
210+
.addData("request", requestBody)
209211
.addData("response", response.getResponseBody())
210212
.addContext("actor", self())
211213
.log();
@@ -294,12 +296,16 @@ private void processRejectedRequest(final PostRejected rejected) {
294296
responseStatusClass == i ? 1 : 0);
295297
}
296298

299+
final byte[] requestBodyBytes = rejected.getRequestEntry().getRequest().getByteData();
300+
// CHECKSTYLE.OFF: IllegalInstantiation - This is ok for String from byte[]
301+
final String requestBody = requestBodyBytes == null ? null : new String(requestBodyBytes, Charsets.UTF_8);
302+
// CHECKSTYLE.ON: IllegalInstantiation
297303
POST_ERROR_LOGGER.warn()
298304
.setMessage("Post rejected")
299305
.addData("sink", _sink)
300306
.addData("status", responseStatusCode)
301307
// CHECKSTYLE.OFF: IllegalInstantiation - This is ok for String from byte[]
302-
.addData("request", new String(rejected.getRequestEntry().getRequest().getByteData(), Charsets.UTF_8))
308+
.addData("request", requestBody)
303309
// CHECKSTYLE.ON: IllegalInstantiation
304310
.addData("response", responseBody)
305311
.addContext("actor", self())

0 commit comments

Comments
 (0)