Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update apache-httpclient to not use HttpEntity getContent #410

Merged
merged 2 commits into from
Dec 31, 2024
Merged

feat: update apache-httpclient to not use HttpEntity getContent #410

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba2aae6
update apache-httpclient to not use getContent
thugrock7 Dec 10, 2024
7d3729e
spotless apply
thugrock7 Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...try/javaagent/instrumentation/hypertrace/apachehttpclient/v4_0/ApacheHttpClientUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.javaagent.instrumentation.hypertrace.apachehttpclient.v4_0.ApacheHttpClientObjectRegistry.SpanAndAttributeKey;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
Expand Down Expand Up @@ -113,7 +114,10 @@ public static void traceEntity(
&& contentEncoding.getValue().toLowerCase().contains("gzip");
if (entity.isRepeatable()) {
try {
InputStream contentStream = entity.getContent();
BoundedByteArrayOutputStream byteArrayOutputStream =
BoundedBuffersFactory.createStream(charset);
entity.writeTo(byteArrayOutputStream);
InputStream contentStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
if (isGzipEncoded) {
try {
contentStream = new GZIPInputStream(contentStream);
Expand Down
Loading