Skip to content

Commit 2b43e92

Browse files
pavolloffaypavolloffay
authored
Refactor javaagent core package (#203)
Signed-off-by: Pavol Loffay <[email protected]>
1 parent 651cc0f commit 2b43e92

File tree

70 files changed

+140
-136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+140
-136
lines changed

‎filter-api/src/main/java/org/hypertrace/agent/filter/FilterRegistry.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.Iterator;
2121
import java.util.List;
2222
import java.util.ServiceLoader;
23-
import org.hypertrace.agent.core.EnvironmentConfig;
23+
import org.hypertrace.agent.core.config.EnvironmentConfig;
2424
import org.hypertrace.agent.filter.api.Filter;
2525
import org.hypertrace.agent.filter.spi.FilterProvider;
2626

‎filter-custom-opa/src/main/java/org/hypertrace/agent/filter/opa/custom/CustomOpaLibProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.google.auto.service.AutoService;
2020
import org.hypertrace.agent.config.Config.AgentConfig;
2121
import org.hypertrace.agent.config.Config.Reporting;
22-
import org.hypertrace.agent.core.HypertraceConfig;
22+
import org.hypertrace.agent.core.config.HypertraceConfig;
2323
import org.hypertrace.agent.filter.FilterRegistry;
2424
import org.hypertrace.agent.filter.api.Filter;
2525
import org.hypertrace.agent.filter.spi.FilterProvider;

‎instrumentation/apache-httpasyncclient-4.1/src/test/java/io/opentelemetry/instrumentation/hypertrace/apachehttpasyncclient/ApacheAsyncClientInstrumentationModuleTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
4242
import org.apache.http.impl.nio.client.HttpAsyncClients;
4343
import org.apache.http.message.BasicHeader;
44-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
44+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
4545
import org.hypertrace.agent.testing.AbstractInstrumenterTest;
4646
import org.hypertrace.agent.testing.TestHttpServer;
4747
import org.hypertrace.agent.testing.TestHttpServer.GetJsonHandler;

‎instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/apachehttpclient/v4_0/ApacheHttpClientUtils.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
import org.apache.http.HttpMessage;
3131
import org.apache.http.HttpResponse;
3232
import org.hypertrace.agent.config.Config.AgentConfig;
33-
import org.hypertrace.agent.core.BoundedByteArrayOutputStream;
34-
import org.hypertrace.agent.core.BoundedByteArrayOutputStreamFactory;
35-
import org.hypertrace.agent.core.ContentTypeCharsetUtils;
36-
import org.hypertrace.agent.core.ContentTypeUtils;
37-
import org.hypertrace.agent.core.HypertraceConfig;
38-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
33+
import org.hypertrace.agent.core.config.HypertraceConfig;
34+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
35+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStream;
36+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStreamFactory;
37+
import org.hypertrace.agent.core.instrumentation.utils.ContentTypeCharsetUtils;
38+
import org.hypertrace.agent.core.instrumentation.utils.ContentTypeUtils;
3939
import org.slf4j.Logger;
4040
import org.slf4j.LoggerFactory;
4141

‎instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/apachehttpclient/v4_0/HttpEntityInstrumentation.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
import net.bytebuddy.matcher.ElementMatcher;
3838
import org.apache.http.Header;
3939
import org.apache.http.HttpEntity;
40-
import org.hypertrace.agent.core.BoundedByteArrayOutputStream;
41-
import org.hypertrace.agent.core.BoundedByteArrayOutputStreamFactory;
42-
import org.hypertrace.agent.core.ContentLengthUtils;
43-
import org.hypertrace.agent.core.ContentTypeCharsetUtils;
44-
import org.hypertrace.agent.core.ContentTypeUtils;
45-
import org.hypertrace.agent.core.GlobalObjectRegistry;
46-
import org.hypertrace.agent.core.GlobalObjectRegistry.SpanAndBuffer;
40+
import org.hypertrace.agent.core.instrumentation.GlobalObjectRegistry;
41+
import org.hypertrace.agent.core.instrumentation.GlobalObjectRegistry.SpanAndBuffer;
42+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStream;
43+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStreamFactory;
44+
import org.hypertrace.agent.core.instrumentation.utils.ContentLengthUtils;
45+
import org.hypertrace.agent.core.instrumentation.utils.ContentTypeCharsetUtils;
46+
import org.hypertrace.agent.core.instrumentation.utils.ContentTypeUtils;
4747

4848
public class HttpEntityInstrumentation implements TypeInstrumentation {
4949

‎instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/apachehttpclient/v4_0/readall/ApacheClientReadAllInstrumentationModule.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
import org.apache.http.Header;
5050
import org.apache.http.HttpEntity;
5151
import org.apache.http.HttpResponse;
52-
import org.hypertrace.agent.core.BoundedByteArrayOutputStreamFactory;
53-
import org.hypertrace.agent.core.ContentTypeUtils;
54-
import org.hypertrace.agent.core.GlobalObjectRegistry;
55-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
52+
import org.hypertrace.agent.core.instrumentation.GlobalObjectRegistry;
53+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
54+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStreamFactory;
55+
import org.hypertrace.agent.core.instrumentation.utils.ContentTypeUtils;
5656

5757
@AutoService(InstrumentationModule.class)
5858
public class ApacheClientReadAllInstrumentationModule extends InstrumentationModule {

‎instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/apachehttpclient/v4_0/readall/InputStreamReadAllInstrumentationModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import net.bytebuddy.description.method.MethodDescription;
3737
import net.bytebuddy.description.type.TypeDescription;
3838
import net.bytebuddy.matcher.ElementMatcher;
39-
import org.hypertrace.agent.core.GlobalObjectRegistry;
39+
import org.hypertrace.agent.core.instrumentation.GlobalObjectRegistry;
4040

4141
@AutoService(InstrumentationModule.class)
4242
public class InputStreamReadAllInstrumentationModule extends InstrumentationModule {

‎instrumentation/apache-httpclient-4.0/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/apachehttpclient/v4_0/ApacheHttpClientInstrumentationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.apache.http.impl.client.DefaultHttpClient;
4141
import org.apache.http.message.BasicNameValuePair;
4242
import org.apache.http.protocol.HTTP;
43-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
43+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
4444
import org.hypertrace.agent.testing.AbstractInstrumenterTest;
4545
import org.hypertrace.agent.testing.TestHttpServer;
4646
import org.hypertrace.agent.testing.TestHttpServer.GetJsonHandler;

‎instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/GrpcSpanDecorator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.LinkedHashMap;
2727
import java.util.Map;
2828
import java.util.function.Function;
29-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
29+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
3030
import org.slf4j.Logger;
3131
import org.slf4j.LoggerFactory;
3232

‎instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/NettyHttp2HeadersInstrumentationModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import net.bytebuddy.description.method.MethodDescription;
3838
import net.bytebuddy.description.type.TypeDescription;
3939
import net.bytebuddy.matcher.ElementMatcher;
40-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
40+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
4141

4242
@AutoService(InstrumentationModule.class)
4343
public class NettyHttp2HeadersInstrumentationModule extends InstrumentationModule {

‎instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/client/GrpcClientInterceptor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import io.opentelemetry.api.trace.Span;
2929
import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.GrpcInstrumentationName;
3030
import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.GrpcSpanDecorator;
31-
import org.hypertrace.agent.core.HypertraceConfig;
32-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
31+
import org.hypertrace.agent.core.config.HypertraceConfig;
32+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
3333

3434
public class GrpcClientInterceptor implements ClientInterceptor {
3535

‎instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerInterceptor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.GrpcInstrumentationName;
2929
import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_5.GrpcSpanDecorator;
3030
import java.util.Map;
31-
import org.hypertrace.agent.core.HypertraceConfig;
32-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
31+
import org.hypertrace.agent.core.config.HypertraceConfig;
32+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
3333
import org.hypertrace.agent.filter.FilterRegistry;
3434

3535
public class GrpcServerInterceptor implements ServerInterceptor {

‎instrumentation/grpc-1.5/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/GrpcInstrumentationTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
import java.net.URL;
3636
import java.util.List;
3737
import java.util.concurrent.TimeoutException;
38-
import org.hypertrace.agent.core.EnvironmentConfig;
39-
import org.hypertrace.agent.core.HypertraceConfig;
40-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
38+
import org.hypertrace.agent.core.config.EnvironmentConfig;
39+
import org.hypertrace.agent.core.config.HypertraceConfig;
40+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
4141
import org.hypertrace.agent.testing.AbstractInstrumenterTest;
4242
import org.hypertrace.example.GreeterGrpc;
4343
import org.hypertrace.example.GreeterGrpc.GreeterBlockingStub;

‎instrumentation/java-streams/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/java/inputstream/InputStreamInstrumentationModule.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
import net.bytebuddy.description.method.MethodDescription;
3737
import net.bytebuddy.description.type.TypeDescription;
3838
import net.bytebuddy.matcher.ElementMatcher;
39-
import org.hypertrace.agent.core.GlobalObjectRegistry;
40-
import org.hypertrace.agent.core.GlobalObjectRegistry.SpanAndBuffer;
39+
import org.hypertrace.agent.core.instrumentation.GlobalObjectRegistry;
40+
import org.hypertrace.agent.core.instrumentation.GlobalObjectRegistry.SpanAndBuffer;
4141

4242
/**
4343
* {@link InputStream} instrumentation. The type matcher applies to all implementations. However

‎instrumentation/java-streams/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/java/inputstream/InputStreamUtils.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import java.io.InputStream;
2828
import java.io.UnsupportedEncodingException;
2929
import java.nio.charset.Charset;
30-
import org.hypertrace.agent.core.GlobalObjectRegistry;
31-
import org.hypertrace.agent.core.GlobalObjectRegistry.SpanAndBuffer;
32-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
30+
import org.hypertrace.agent.core.instrumentation.GlobalObjectRegistry;
31+
import org.hypertrace.agent.core.instrumentation.GlobalObjectRegistry.SpanAndBuffer;
32+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
3333
import org.slf4j.Logger;
3434
import org.slf4j.LoggerFactory;
3535

‎instrumentation/java-streams/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/java/outputstream/OutputStreamInstrumentationModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import net.bytebuddy.description.method.MethodDescription;
3737
import net.bytebuddy.description.type.TypeDescription;
3838
import net.bytebuddy.matcher.ElementMatcher;
39-
import org.hypertrace.agent.core.GlobalObjectRegistry;
39+
import org.hypertrace.agent.core.instrumentation.GlobalObjectRegistry;
4040

4141
/**
4242
* {@link OutputStream} instrumentation. The type matcher applies to all implementations. However

‎instrumentation/java-streams/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/java/outputstream/OutputStreamUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import io.opentelemetry.javaagent.instrumentation.api.CallDepthThreadLocalMap;
2020
import java.io.IOException;
2121
import java.io.OutputStream;
22-
import org.hypertrace.agent.core.GlobalObjectRegistry;
22+
import org.hypertrace.agent.core.instrumentation.GlobalObjectRegistry;
2323

2424
public class OutputStreamUtils {
2525

‎instrumentation/java-streams/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/java/inputstream/InputStreamInstrumentationModuleTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import java.io.InputStream;
2626
import java.nio.charset.StandardCharsets;
2727
import java.util.List;
28-
import org.hypertrace.agent.core.GlobalObjectRegistry;
29-
import org.hypertrace.agent.core.GlobalObjectRegistry.SpanAndBuffer;
28+
import org.hypertrace.agent.core.instrumentation.GlobalObjectRegistry;
29+
import org.hypertrace.agent.core.instrumentation.GlobalObjectRegistry.SpanAndBuffer;
3030
import org.hypertrace.agent.testing.AbstractInstrumenterTest;
3131
import org.junit.jupiter.api.Assertions;
3232
import org.junit.jupiter.api.Test;

‎instrumentation/java-streams/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/java/outputstream/OutputStreamInstrumentationModuleTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import java.io.OutputStream;
2222
import java.nio.charset.Charset;
2323
import java.nio.charset.StandardCharsets;
24-
import org.hypertrace.agent.core.BoundedByteArrayOutputStream;
25-
import org.hypertrace.agent.core.BoundedByteArrayOutputStreamFactory;
26-
import org.hypertrace.agent.core.GlobalObjectRegistry;
24+
import org.hypertrace.agent.core.instrumentation.GlobalObjectRegistry;
25+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStream;
26+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStreamFactory;
2727
import org.hypertrace.agent.testing.AbstractInstrumenterTest;
2828
import org.junit.jupiter.api.Assertions;
2929
import org.junit.jupiter.api.Test;

‎instrumentation/jaxrs-client-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/jaxrs/v2_0/JaxrsClientBodyCaptureFilter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import javax.ws.rs.client.ClientResponseFilter;
3030
import javax.ws.rs.core.MultivaluedMap;
3131
import org.hypertrace.agent.config.Config.AgentConfig;
32-
import org.hypertrace.agent.core.HypertraceConfig;
33-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
32+
import org.hypertrace.agent.core.config.HypertraceConfig;
33+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
3434
import org.slf4j.Logger;
3535
import org.slf4j.LoggerFactory;
3636

‎instrumentation/jaxrs-client-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/jaxrs/v2_0/JaxrsClientEntityInterceptor.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
import javax.ws.rs.ext.WriterInterceptor;
3232
import javax.ws.rs.ext.WriterInterceptorContext;
3333
import org.hypertrace.agent.config.Config.AgentConfig;
34-
import org.hypertrace.agent.core.BoundedByteArrayOutputStream;
35-
import org.hypertrace.agent.core.BoundedByteArrayOutputStreamFactory;
36-
import org.hypertrace.agent.core.ContentLengthUtils;
37-
import org.hypertrace.agent.core.ContentTypeCharsetUtils;
38-
import org.hypertrace.agent.core.ContentTypeUtils;
39-
import org.hypertrace.agent.core.GlobalObjectRegistry;
40-
import org.hypertrace.agent.core.GlobalObjectRegistry.SpanAndBuffer;
41-
import org.hypertrace.agent.core.HypertraceConfig;
42-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
34+
import org.hypertrace.agent.core.config.HypertraceConfig;
35+
import org.hypertrace.agent.core.instrumentation.GlobalObjectRegistry;
36+
import org.hypertrace.agent.core.instrumentation.GlobalObjectRegistry.SpanAndBuffer;
37+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
38+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStream;
39+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStreamFactory;
40+
import org.hypertrace.agent.core.instrumentation.utils.ContentLengthUtils;
41+
import org.hypertrace.agent.core.instrumentation.utils.ContentTypeCharsetUtils;
42+
import org.hypertrace.agent.core.instrumentation.utils.ContentTypeUtils;
4343
import org.slf4j.Logger;
4444
import org.slf4j.LoggerFactory;
4545

‎instrumentation/jaxrs-client-2.0/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/jaxrs/v2_0/JaxrsClientBodyInstrumentationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import javax.ws.rs.core.MultivaluedMap;
3737
import javax.ws.rs.core.Response;
3838
import javax.ws.rs.ext.MessageBodyWriter;
39-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
39+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
4040
import org.hypertrace.agent.testing.AbstractInstrumenterTest;
4141
import org.hypertrace.agent.testing.TestHttpServer;
4242
import org.hypertrace.agent.testing.TestHttpServer.GetJsonHandler;

‎instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/AttributeKeys.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import java.util.Map;
2222
import java.util.concurrent.ConcurrentHashMap;
2323
import java.util.concurrent.ConcurrentMap;
24-
import org.hypertrace.agent.core.BoundedByteArrayOutputStream;
25-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
24+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
25+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStream;
2626

2727
/**
2828
* Copied from

‎instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/server/DataCaptureUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import io.opentelemetry.api.trace.Span;
2626
import java.io.ByteArrayOutputStream;
2727
import java.io.UnsupportedEncodingException;
28-
import org.hypertrace.agent.core.BoundedByteArrayOutputStream;
28+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStream;
2929

3030
public class DataCaptureUtils {
3131

‎instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/server/HttpServerRequestTracingHandler.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
import java.util.HashMap;
3333
import java.util.Map;
3434
import org.hypertrace.agent.config.Config.AgentConfig;
35-
import org.hypertrace.agent.core.BoundedByteArrayOutputStream;
36-
import org.hypertrace.agent.core.BoundedByteArrayOutputStreamFactory;
37-
import org.hypertrace.agent.core.ContentLengthUtils;
38-
import org.hypertrace.agent.core.ContentTypeCharsetUtils;
39-
import org.hypertrace.agent.core.ContentTypeUtils;
40-
import org.hypertrace.agent.core.HypertraceConfig;
41-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
35+
import org.hypertrace.agent.core.config.HypertraceConfig;
36+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
37+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStream;
38+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStreamFactory;
39+
import org.hypertrace.agent.core.instrumentation.utils.ContentLengthUtils;
40+
import org.hypertrace.agent.core.instrumentation.utils.ContentTypeCharsetUtils;
41+
import org.hypertrace.agent.core.instrumentation.utils.ContentTypeUtils;
4242

4343
public class HttpServerRequestTracingHandler extends ChannelInboundHandlerAdapter {
4444

‎instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/server/HttpServerResponseTracingHandler.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
import java.nio.charset.Charset;
3838
import java.util.Map;
3939
import org.hypertrace.agent.config.Config.AgentConfig;
40-
import org.hypertrace.agent.core.BoundedByteArrayOutputStream;
41-
import org.hypertrace.agent.core.BoundedByteArrayOutputStreamFactory;
42-
import org.hypertrace.agent.core.ContentLengthUtils;
43-
import org.hypertrace.agent.core.ContentTypeCharsetUtils;
44-
import org.hypertrace.agent.core.ContentTypeUtils;
45-
import org.hypertrace.agent.core.HypertraceConfig;
46-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
40+
import org.hypertrace.agent.core.config.HypertraceConfig;
41+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
42+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStream;
43+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStreamFactory;
44+
import org.hypertrace.agent.core.instrumentation.utils.ContentLengthUtils;
45+
import org.hypertrace.agent.core.instrumentation.utils.ContentTypeCharsetUtils;
46+
import org.hypertrace.agent.core.instrumentation.utils.ContentTypeUtils;
4747

4848
public class HttpServerResponseTracingHandler extends ChannelOutboundHandlerAdapter {
4949

‎instrumentation/netty/netty-4.0/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/Netty40ServerInstrumentationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import okhttp3.Response;
5151
import okio.Buffer;
5252
import okio.BufferedSink;
53-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
53+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
5454
import org.hypertrace.agent.testing.AbstractInstrumenterTest;
5555
import org.junit.jupiter.api.AfterAll;
5656
import org.junit.jupiter.api.Assertions;

‎instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/AttributeKeys.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import io.netty.util.AttributeKey;
2020
import java.util.Map;
21-
import org.hypertrace.agent.core.BoundedByteArrayOutputStream;
22-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
21+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
22+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStream;
2323

2424
public class AttributeKeys {
2525

‎instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/NettyChannelPipelineInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import net.bytebuddy.description.method.MethodDescription;
4040
import net.bytebuddy.description.type.TypeDescription;
4141
import net.bytebuddy.matcher.ElementMatcher;
42-
import org.hypertrace.agent.core.HypertraceCallDepthThreadLocalMap;
42+
import org.hypertrace.agent.core.instrumentation.HypertraceCallDepthThreadLocalMap;
4343

4444
public class NettyChannelPipelineInstrumentation implements TypeInstrumentation {
4545

‎instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/server/DataCaptureUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import io.opentelemetry.api.trace.Span;
2626
import java.io.ByteArrayOutputStream;
2727
import java.io.UnsupportedEncodingException;
28-
import org.hypertrace.agent.core.BoundedByteArrayOutputStream;
28+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStream;
2929

3030
public class DataCaptureUtils {
3131

‎instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/server/HttpServerRequestTracingHandler.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
import java.util.HashMap;
3333
import java.util.Map;
3434
import org.hypertrace.agent.config.Config.AgentConfig;
35-
import org.hypertrace.agent.core.BoundedByteArrayOutputStream;
36-
import org.hypertrace.agent.core.BoundedByteArrayOutputStreamFactory;
37-
import org.hypertrace.agent.core.ContentLengthUtils;
38-
import org.hypertrace.agent.core.ContentTypeCharsetUtils;
39-
import org.hypertrace.agent.core.ContentTypeUtils;
40-
import org.hypertrace.agent.core.HypertraceConfig;
41-
import org.hypertrace.agent.core.HypertraceSemanticAttributes;
35+
import org.hypertrace.agent.core.config.HypertraceConfig;
36+
import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
37+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStream;
38+
import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStreamFactory;
39+
import org.hypertrace.agent.core.instrumentation.utils.ContentLengthUtils;
40+
import org.hypertrace.agent.core.instrumentation.utils.ContentTypeCharsetUtils;
41+
import org.hypertrace.agent.core.instrumentation.utils.ContentTypeUtils;
4242

4343
public class HttpServerRequestTracingHandler extends ChannelInboundHandlerAdapter {
4444

0 commit comments

Comments
 (0)