Merge branch 'unittest/httpclient-5' into feature/async-httpclient-5

# Conflicts: # instrumentation-security/httpclient-5.0/src/main/java/com/newrelic/agent/security/instrumentation/httpclient50/BasicRequestProducer_Instrumentation.java # instrumentation-security/httpclient-5.0/src/main/java/com/newrelic/agent/security/instrumentation/httpclient50/HttpAsyncClient_Instrumentation.java # instrumentation-security/httpclient-5.0/src/test/java/com/newrelic/agent/security/instrumentation/httpclient5/HttpAsyncClientTest.java
newrelic · Sep 21, 2023 · c6ea476 · c6ea476
2 parents 8ba2ba5 + 3b2fec3
commit c6ea476
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 11 deletions.
diff --git a/...BasicRequestProducer_Instrumentation.java → ...BasicRequestProducer_Instrumentation.java b/...BasicRequestProducer_Instrumentation.java → ...BasicRequestProducer_Instrumentation.java
diff --git a/...nt50/HttpAsyncClient_Instrumentation.java → ...nt50/HttpAsyncClient_Instrumentation.java b/...nt50/HttpAsyncClient_Instrumentation.java → ...nt50/HttpAsyncClient_Instrumentation.java
diff --git a/...pclient50/HttpClient_Instrumentation.java → ...pclient50/HttpClient_Instrumentation.java b/...pclient50/HttpClient_Instrumentation.java → ...pclient50/HttpClient_Instrumentation.java
@@ -5,17 +5,10 @@
  *
  */
 
-package com.nr.agent.instrumentation.security.httpclient50;
+package com.newrelic.agent.security.instrumentation.httpclient50;
 
-import com.newrelic.api.agent.Trace;
-import com.newrelic.api.agent.security.NewRelicSecurity;
 import com.newrelic.api.agent.security.instrumentation.helpers.GenericHelper;
-import com.newrelic.api.agent.security.instrumentation.helpers.ServletHelper;
 import com.newrelic.api.agent.security.schema.AbstractOperation;
-import com.newrelic.api.agent.security.schema.SecurityMetaData;
-import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityException;
-import com.newrelic.api.agent.security.schema.operation.SSRFOperation;
-import com.newrelic.api.agent.security.utils.SSRFUtils;
 import com.newrelic.api.agent.weaver.MatchType;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;

diff --git a/...security/httpclient50/SecurityHelper.java → ...entation/httpclient50/SecurityHelper.java b/...security/httpclient50/SecurityHelper.java → ...entation/httpclient50/SecurityHelper.java
@@ -1,4 +1,4 @@
-package com.nr.agent.instrumentation.security.httpclient50;
+package com.newrelic.agent.security.instrumentation.httpclient50;
 
 import com.newrelic.api.agent.security.NewRelicSecurity;
 import com.newrelic.api.agent.security.instrumentation.helpers.GenericHelper;

diff --git a/...rity/httpclient5/HttpAsyncClientTest.java → ...tion/httpclient5/HttpAsyncClientTest.java b/...rity/httpclient5/HttpAsyncClientTest.java → ...tion/httpclient5/HttpAsyncClientTest.java
diff --git a/.../security/httpclient5/HttpClientTest.java → ...mentation/httpclient5/HttpClientTest.java b/.../security/httpclient5/HttpClientTest.java → ...mentation/httpclient5/HttpClientTest.java
@@ -1,4 +1,4 @@
-package com.nr.instrumentation.security.httpclient5;
+package com.newrelic.agent.security.instrumentation.httpclient5;
 
 import com.newrelic.agent.security.introspec.InstrumentationTestConfig;
 import com.newrelic.agent.security.introspec.SecurityInstrumentationTestRunner;
@@ -29,7 +29,7 @@
 import java.util.UUID;
 
 @RunWith(SecurityInstrumentationTestRunner.class)
-@InstrumentationTestConfig(includePrefixes = "com.nr.agent.instrumentation.security.httpclient50")
+@InstrumentationTestConfig(includePrefixes = "com.newrelic.agent.security.instrumentation.httpclient50")
 public class HttpClientTest {
     @ClassRule
     public static HttpServerRule server = new HttpServerRule();