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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 6 additions & 6 deletions
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

Lines changed: 7 additions & 7 deletions
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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 {

0 commit comments

Comments
 (0)