From 0bd4af09ea3ba9708f4ff8784d8cfae2dd7eefdd Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Fri, 3 Feb 2023 13:49:54 +0200 Subject: [PATCH] Fix flaky http url connection test (#7724) https://ge.opentelemetry.io/s/2x656dnceehhk/tests/:instrumentation:http-url-connection:javaagent:test/io.opentelemetry.javaagent.instrumentation.httpurlconnection.HttpUrlConnectionTest/traceRequest(boolean)%5B1%5D?top-execution=1 --- .../instrumentation/httpurlconnection/StreamUtils.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/StreamUtils.java b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/StreamUtils.java index 1af8d42129..e1bbe19b16 100644 --- a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/StreamUtils.java +++ b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/StreamUtils.java @@ -7,7 +7,6 @@ package io.opentelemetry.javaagent.instrumentation.httpurlconnection; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.common.base.Strings; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -19,9 +18,9 @@ final class StreamUtils { static List readLines(InputStream stream) throws IOException { List lines = new ArrayList<>(); BufferedReader reader = new BufferedReader(new InputStreamReader(stream, UTF_8)); - while (reader.ready()) { - String line = reader.readLine(); - if (!Strings.isNullOrEmpty(line)) { + String line; + while ((line = reader.readLine()) != null) { + if (!line.isEmpty()) { lines.add(line); } }