Fix : Package Exclusion Issue with com.nr and com.newrelic

instrumentation-security-test/src/main/java/com/newrelic/agent/security/introspec/internal/IntrospectorServiceManager.java

@@ -125,6 +125,7 @@ public static IntrospectorServiceManager createAndInitialize(Map<String, Object>
         Map<String, Object> sec = new HashMap<>();
         sec.put("enable", true);
         sec.put("validator_service_url", "ws://192.168.5.138:54321");
+        sec.put("low-priority-instrumentation", Collections.singletonMap("enabled", true));
         config.put("security", sec);
 
         if (configOverrides != null) {

instrumentation-security-test/src/main/java/com/newrelic/agent/security/introspec/internal/TransformingClassLoader.java

@@ -22,7 +22,7 @@ class TransformingClassLoader extends URLClassLoader {
             "java.lang.ProcessImpl", "java.io", "java.nio", "javax.servlet"
     };
     private static final String[] PROTECTED_PREFIXES = new String[]{"java.", "javax.", "com.sun.", "sun.",
-            "org.junit.", "junit.framework", "com.newrelic", "org.xml", "org.w3c"};
+            "org.junit.", "junit.framework", "com.newrelic.agent", "com.newrelic.api", "org.xml", "org.w3c"};
 
     private static final String[] INTROSPECTOR_MUST_LOADS = new String[]{
             // This class needs to be woven.

instrumentation-security/akka-http-core-10.0/src/main/scala/akka/http/scaladsl/HttpExt_Instrumentation.java

@@ -25,7 +25,7 @@
 import com.newrelic.api.agent.weaver.MatchType;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;
-import com.nr.agent.security.akka.core.AkkaCoreUtils;
+import com.newrelic.agent.security.instrumentation.akka.core.AkkaCoreUtils;
 import scala.concurrent.Future;
 
 import java.net.URI;

instrumentation-security/akka-http-core-10.0/src/main/scala/com/nr/agent/security/akka/core/AkkaCoreUtils.java → instrumentation-security/akka-http-core-10.0/src/main/scala/com/newrelic/agent/security/instrumentation/akka/core/AkkaCoreUtils.java

@@ -1,4 +1,4 @@
-package com.nr.agent.security.akka.core;
+package com.newrelic.agent.security.instrumentation.akka.core;
 
 public class AkkaCoreUtils {
 

instrumentation-security/akka-http-core-10.0/src/test/scala/com/agent/instrumentation/akka/http/core_10/AkkaHttpCoreTest.scala → instrumentation-security/akka-http-core-10.0/src/test/scala/com/nr/agent/security/instrumentation/akka/http/core_10/AkkaHttpCoreTest.scala

@@ -5,18 +5,18 @@
  *
  */
 
-package com.agent.instrumentation.akka.http.core_10
+package com.nr.agent.security.instrumentation.akka.http.core_10
 
 import akka.actor.ActorSystem
 import akka.http.scaladsl.Http
 import akka.http.scaladsl.model.{HttpHeader, HttpRequest, HttpResponse}
 import akka.stream.ActorMaterializer
+import com.newrelic.agent.security.instrumentation.akka.core.AkkaCoreUtils
 import com.newrelic.agent.security.introspec.{InstrumentationTestConfig, SecurityInstrumentationTestRunner, SecurityIntrospector}
 import com.newrelic.api.agent.Trace
 import com.newrelic.api.agent.security.instrumentation.helpers.ServletHelper
 import com.newrelic.api.agent.security.schema.VulnerabilityCaseType
 import com.newrelic.api.agent.security.schema.operation.SSRFOperation
-import com.nr.agent.security.akka.core.AkkaCoreUtils
 import org.junit.runner.RunWith
 import org.junit.{After, Assert, Test}
 

instrumentation-security/akka-http-core-2.11_10.0.11/src/test/scala/com/agent/instrumentation/akka/http/core_211_10011/AkkaServer.scala → instrumentation-security/akka-http-core-10.0/src/test/scala/com/nr/agent/security/instrumentation/akka/http/core_10/AkkaServer.scala

@@ -5,7 +5,7 @@
  *
  */
 
-package com.agent.instrumentation.akka.http.core_211_10011
+package com.nr.agent.security.instrumentation.akka.http.core_10
 
 import akka.actor.ActorSystem
 import akka.event.Logging

instrumentation-security/akka-http-core-10.0/src/test/scala/com/agent/instrumentation/akka/http/core_10/PlayServer.scala → instrumentation-security/akka-http-core-10.0/src/test/scala/com/nr/agent/security/instrumentation/akka/http/core_10/PlayServer.scala

@@ -5,7 +5,7 @@
  *
  */
 
-package com.agent.instrumentation.akka.http.core_10
+package com.nr.agent.security.instrumentation.akka.http.core_10
 
 import akka.actor.ActorSystem
 import akka.event.Logging

instrumentation-security/akka-http-core-2.11_10.0.11/src/main/scala/akka/http/scaladsl/HttpExt_Instrumentation.java

@@ -24,7 +24,7 @@
 import com.newrelic.api.agent.weaver.MatchType;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;
-import com.nr.agent.security.akka.core.AkkaCoreUtils;
+import com.newrelic.agent.security.instrumentation.akka.core.AkkaCoreUtils;
 import scala.concurrent.Future;
 
 import java.net.URI;

instrumentation-security/akka-http-core-2.11_10.0.11/src/main/scala/com/nr/agent/security/akka/core/AkkaCoreUtils.java → instrumentation-security/akka-http-core-2.11_10.0.11/src/main/scala/com/newrelic/agent/security/instrumentation/akka/core/AkkaCoreUtils.java

@@ -1,4 +1,4 @@
-package com.nr.agent.security.akka.core;
+package com.newrelic.agent.security.instrumentation.akka.core;
 
 public class AkkaCoreUtils {
 

instrumentation-security/akka-http-core-2.11_10.0.11/src/test/scala/com/agent/instrumentation/akka/http/core_211_10011/AkkaHttpCoreTest.scala → instrumentation-security/akka-http-core-2.11_10.0.11/src/test/scala/com/nr/agent/security/instrumentation/akka/http/core_10/AkkaHttpCoreTest.scala

@@ -5,19 +5,18 @@
  *
  */
 
-package com.agent.instrumentation.akka.http.core_10
+package com.nr.agent.security.instrumentation.akka.http.core_10
 
 import akka.actor.ActorSystem
 import akka.http.scaladsl.Http
 import akka.http.scaladsl.model.{HttpHeader, HttpRequest, HttpResponse}
 import akka.stream.ActorMaterializer
-import com.agent.instrumentation.akka.http.core_211_10011.{AkkaServer, PlayServer}
+import com.newrelic.agent.security.instrumentation.akka.core.AkkaCoreUtils
 import com.newrelic.agent.security.introspec.{InstrumentationTestConfig, SecurityInstrumentationTestRunner, SecurityIntrospector}
 import com.newrelic.api.agent.Trace
 import com.newrelic.api.agent.security.instrumentation.helpers.ServletHelper
 import com.newrelic.api.agent.security.schema.VulnerabilityCaseType
 import com.newrelic.api.agent.security.schema.operation.SSRFOperation
-import com.nr.agent.security.akka.core.AkkaCoreUtils
 import org.junit.runner.RunWith
 import org.junit.{After, Assert, Test}
 

instrumentation-security/akka-http-core-10.0/src/test/scala/com/agent/instrumentation/akka/http/core_10/AkkaServer.scala → instrumentation-security/akka-http-core-2.11_10.0.11/src/test/scala/com/nr/agent/security/instrumentation/akka/http/core_10/AkkaServer.scala

@@ -5,7 +5,7 @@
  *
  */
 
-package com.agent.instrumentation.akka.http.core_10
+package com.nr.agent.security.instrumentation.akka.http.core_10
 
 import akka.actor.ActorSystem
 import akka.event.Logging

instrumentation-security/akka-http-core-2.11_10.0.11/src/test/scala/com/agent/instrumentation/akka/http/core_211_10011/PlayServer.scala → instrumentation-security/akka-http-core-2.11_10.0.11/src/test/scala/com/nr/agent/security/instrumentation/akka/http/core_10/PlayServer.scala

@@ -5,15 +5,14 @@
  *
  */
 
-package com.agent.instrumentation.akka.http.core_211_10011
+package com.nr.agent.security.instrumentation.akka.http.core_10
 
 import akka.actor.ActorSystem
 import akka.event.Logging
 import akka.http.scaladsl.Http
 import akka.http.scaladsl.model.HttpMethods._
 import akka.http.scaladsl.model._
 import akka.stream.ActorMaterializer
-import akka.stream.scaladsl.{Source, _}
 import akka.util.Timeout
 import com.typesafe.config.ConfigFactory
 

instrumentation-security/apache-ldap/src/main/java/com/nr/instrumentation/security/apache/ldap/LDAPUtils.java → instrumentation-security/apache-ldap/src/main/java/com/newrelic/agent/security/instrumentation/apache/ldap/LDAPUtils.java

@@ -1,4 +1,4 @@
-package com.nr.instrumentation.security.apache.ldap;
+package com.newrelic.agent.security.instrumentation.apache.ldap;
 
 public class LDAPUtils {
 

instrumentation-security/apache-ldap/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection_Instrumentation.java

@@ -9,7 +9,7 @@
 import com.newrelic.api.agent.weaver.MatchType;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;
-import com.nr.instrumentation.security.apache.ldap.LDAPUtils;
+import com.newrelic.agent.security.instrumentation.apache.ldap.LDAPUtils;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.message.SearchRequest;
 import org.apache.directory.api.ldap.model.message.SearchScope;

instrumentation-security/apache-ldap/src/main/java/org/apache/directory/ldap/client/api/LdapConnection_Instrumentation.java

@@ -9,7 +9,7 @@
 import com.newrelic.api.agent.weaver.MatchType;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;
-import com.nr.instrumentation.security.apache.ldap.LDAPUtils;
+import com.newrelic.agent.security.instrumentation.apache.ldap.LDAPUtils;
 import org.apache.directory.api.ldap.model.cursor.EntryCursor;
 import org.apache.directory.api.ldap.model.cursor.SearchCursor;
 import org.apache.directory.api.ldap.model.exception.LdapException;

instrumentation-security/apache-ldap/src/test/java/com/nr/instrumentation/security/apache/ldap/LdapAsyncConnectionTest.java → instrumentation-security/apache-ldap/src/test/java/com/nr/agent/security/instrumentation/apache/ldap/LdapAsyncConnectionTest.java

@@ -1,4 +1,4 @@
-package com.nr.instrumentation.security.apache.ldap;
+package com.nr.agent.security.instrumentation.apache.ldap;
 
 import com.newrelic.agent.security.introspec.InstrumentationTestConfig;
 import com.newrelic.agent.security.introspec.SecurityInstrumentationTestRunner;
@@ -25,7 +25,7 @@
 import java.util.List;
 
 @RunWith(SecurityInstrumentationTestRunner.class)
-@InstrumentationTestConfig(includePrefixes = { "org.apache.directory.ldap.client.api", "com.nr.instrumentation.security.apache.ldap" })
+@InstrumentationTestConfig(includePrefixes = { "org.apache.directory.ldap.client.api", "com.newrelic.agent.security.instrumentation.apache.ldap" })
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class LdapAsyncConnectionTest {
     public static final String DOMAIN_DSN = "dc=example,dc=com";

instrumentation-security/apache-ldap/src/test/java/com/nr/instrumentation/security/apache/ldap/LdapConnectionTest.java → instrumentation-security/apache-ldap/src/test/java/com/nr/agent/security/instrumentation/apache/ldap/LdapConnectionTest.java

@@ -1,4 +1,4 @@
-package com.nr.instrumentation.security.apache.ldap;
+package com.nr.agent.security.instrumentation.apache.ldap;
 
 import com.newrelic.agent.security.introspec.InstrumentationTestConfig;
 import com.newrelic.agent.security.introspec.SecurityInstrumentationTestRunner;
@@ -28,7 +28,7 @@
 import java.util.List;
 
 @RunWith(SecurityInstrumentationTestRunner.class)
-@InstrumentationTestConfig(includePrefixes = { "org.apache.directory.ldap.client.api", "com.nr.instrumentation.security.apache.ldap" })
+@InstrumentationTestConfig(includePrefixes = { "org.apache.directory.ldap.client.api", "com.newrelic.agent.security.instrumentation.apache.ldap" })
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class LdapConnectionTest {
     public static final String DOMAIN_DSN = "dc=example,dc=com";

instrumentation-security/camel-xpath/src/main/java/com/nr/instrumentation/security/xpath/camel/XPATHUtils.java → instrumentation-security/camel-xpath/src/main/java/com/newrelic/agent/security/instrumentation/xpath/camel/XPATHUtils.java

@@ -1,4 +1,4 @@
-package com.nr.instrumentation.security.xpath.camel;
+package com.newrelic.agent.security.instrumentation.xpath.camel;
 
 public class XPATHUtils {
 

instrumentation-security/camel-xpath/src/main/java/org/apache/camel/builder/BuilderSupport_Instrumentation.java

@@ -9,7 +9,7 @@
 import com.newrelic.api.agent.weaver.MatchType;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;
-import com.nr.instrumentation.security.xpath.camel.XPATHUtils;
+import com.newrelic.agent.security.instrumentation.xpath.camel.XPATHUtils;
 import org.apache.camel.support.builder.Namespaces;
 
 @Weave(type = MatchType.BaseClass, originalName = "org.apache.camel.builder.BuilderSupport")

instrumentation-security/camel-xpath/src/test/java/com/nr/instrumentation/security/camel/xpath/BuilderSupportTest.java → instrumentation-security/camel-xpath/src/test/java/com/nr/agent/security/instrumentation/xpath/camel/BuilderSupportTest.java

@@ -1,4 +1,4 @@
-package com.nr.instrumentation.security.camel.xpath;
+package com.nr.agent.security.instrumentation.xpath.camel;
 
 import com.newrelic.agent.security.introspec.InstrumentationTestConfig;
 import com.newrelic.agent.security.introspec.SecurityInstrumentationTestRunner;

instrumentation-security/commons-jxpath/src/main/java/com/nr/instrumentation/security/xpath/commons/jxpath/XPATHUtils.java → instrumentation-security/commons-jxpath/src/main/java/com/newrelic/agent/security/instrumentation/xpath/commons/jxpath/XPATHUtils.java

@@ -1,4 +1,4 @@
-package com.nr.instrumentation.security.xpath.commons.jxpath;
+package com.newrelic.agent.security.instrumentation.xpath.commons.jxpath;
 
 public class XPATHUtils {
     public static final String NR_SEC_CUSTOM_ATTRIB_NAME = "XPATH_OPERATION_LOCK_COMMONS_JXPATH-";

instrumentation-security/commons-jxpath/src/main/java/org/apache/commons/jxpath/ri/compiler/JXPathContextReferenceImpl_Instrumentation.java

@@ -9,8 +9,7 @@
 import com.newrelic.api.agent.weaver.MatchType;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;
-import com.nr.instrumentation.security.xpath.commons.jxpath.XPATHUtils;
-import org.apache.commons.jxpath.ri.EvalContext;
+import com.newrelic.agent.security.instrumentation.xpath.commons.jxpath.XPATHUtils;
 
 import java.util.Iterator;
 

instrumentation-security/commons-jxpath/src/test/java/JXPathTest.java → instrumentation-security/commons-jxpath/src/test/java/com/nr/agent/security/instrumentation/xpath/commons/jxpath/JXPathTest.java

@@ -1,3 +1,5 @@
+package com.nr.agent.security.instrumentation.xpath.commons.jxpath;
+
 import com.newrelic.agent.security.introspec.InstrumentationTestConfig;
 import com.newrelic.agent.security.introspec.SecurityInstrumentationTestRunner;
 import com.newrelic.agent.security.introspec.SecurityIntrospector;
@@ -6,7 +8,6 @@
 import com.newrelic.api.agent.security.schema.operation.XPathOperation;
 import org.apache.commons.jxpath.Container;
 import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.ri.compiler.Expression;
 import org.apache.commons.jxpath.xml.DocumentContainer;
 import org.junit.Assert;
 import org.junit.Test;

instrumentation-security/dynamodb-1.11.390/src/main/java/com/amazonaws/services/dynamodbv2_1_11_390/AmazonDynamoDBClient_Instrumentation.java

@@ -18,7 +18,7 @@
 import com.newrelic.api.agent.security.schema.AbstractOperation;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;
-import com.nr.agent.security.dynamodb_1_11_390.DynamoDBUtil;
+import com.newrelic.agent.security.instrumentation.dynamodb_1_11_390.DynamoDBUtil;
 
 import java.net.URI;
 

instrumentation-security/dynamodb-1.11.390/src/main/java/com/nr/agent/security/dynamodb_1_11_390/DynamoDBUtil.java → instrumentation-security/dynamodb-1.11.390/src/main/java/com/newrelic/agent/security/instrumentation/dynamodb_1_11_390/DynamoDBUtil.java

@@ -5,7 +5,7 @@
  *
  */
 
-package com.nr.agent.security.dynamodb_1_11_390;
+package com.newrelic.agent.security.instrumentation.dynamodb_1_11_390;
 
 import com.amazonaws.AmazonWebServiceRequest;
 import com.amazonaws.Request;

instrumentation-security/dynamodb-1.11.453/src/test/java/com/nr/instrumentation/security/dynamodb453/DynamoServer.java → instrumentation-security/dynamodb-1.11.390/src/test/java/com/nr/agent/security/instrumentation/dynamodb_1_11_390/DynamoServer.java

@@ -5,7 +5,7 @@
  *
  */
 
-package com.nr.instrumentation.security.dynamodb453;
+package com.nr.agent.security.instrumentation.dynamodb_1_11_390;
 
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
@@ -90,7 +90,6 @@ public class DynamoServer extends ExternalResource {
 
     private void setUp() throws Exception {
         System.setProperty("sqlite4java.library.path", "src/test/resources/libs/");
-
         server = ServerRunner.createServerFromCommandLineArgs(new String[]{ "-inMemory", "-port", String.valueOf(PORT) });
         server.start();
 

instrumentation-security/dynamodb-1.11.453/src/test/java/com/nr/instrumentation/security/dynamodb453/DynamodbTest.java → instrumentation-security/dynamodb-1.11.390/src/test/java/com/nr/agent/security/instrumentation/dynamodb_1_11_390/DynamodbTest.java

@@ -1,15 +1,7 @@
-package com.nr.instrumentation.security.dynamodb453;
+package com.nr.agent.security.instrumentation.dynamodb_1_11_390;
 
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
 import com.amazonaws.services.dynamodbv2.model.AttributeValueUpdate;
-import com.amazonaws.services.dynamodbv2.model.DeleteItemRequest;
-import com.amazonaws.services.dynamodbv2.model.GetItemRequest;
-import com.amazonaws.services.dynamodbv2.model.KeysAndAttributes;
-import com.amazonaws.services.dynamodbv2.model.PutItemRequest;
-import com.amazonaws.services.dynamodbv2.model.PutRequest;
-import com.amazonaws.services.dynamodbv2.model.QueryRequest;
-import com.amazonaws.services.dynamodbv2.model.ScanRequest;
-import com.amazonaws.services.dynamodbv2.model.UpdateItemRequest;
 import com.newrelic.agent.security.introspec.InstrumentationTestConfig;
 import com.newrelic.agent.security.introspec.SecurityInstrumentationTestRunner;
 import com.newrelic.agent.security.introspec.SecurityIntrospector;
@@ -29,7 +21,7 @@
 
 @RunWith(SecurityInstrumentationTestRunner.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@InstrumentationTestConfig(includePrefixes = {"com.nr.agent.security.dynamodb_1_11_453", "com.amazonaws.services"})
+@InstrumentationTestConfig(includePrefixes = {"com.newrelic.agent.security.instrumentation.dynamodb_1_11_390", "com.amazonaws.services.dynamodbv2_1_11_390"})
 public class DynamodbTest {
     @ClassRule
     public static DynamoServer dynamo = new DynamoServer();

instrumentation-security/dynamodb-1.11.453/src/main/java/com/amazonaws/services/dynamodbv2_1_11_453/AmazonDynamoDBClient_Instrumentation.java

@@ -18,7 +18,7 @@
 import com.newrelic.api.agent.security.schema.AbstractOperation;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;
-import com.nr.agent.security.dynamodb_1_11_453.DynamoDBUtil;
+import com.newrelic.agent.security.instrumentation.dynamodb_1_11_453.DynamoDBUtil;
 
 import java.net.URI;
 

instrumentation-security/dynamodb-1.11.453/src/main/java/com/nr/agent/security/dynamodb_1_11_453/DynamoDBUtil.java → instrumentation-security/dynamodb-1.11.453/src/main/java/com/newrelic/agent/security/instrumentation/dynamodb_1_11_453/DynamoDBUtil.java

@@ -5,7 +5,7 @@
  *
  */
 
-package com.nr.agent.security.dynamodb_1_11_453;
+package com.newrelic.agent.security.instrumentation.dynamodb_1_11_453;
 
 import com.amazonaws.AmazonWebServiceRequest;
 import com.amazonaws.Request;

instrumentation-security/dynamodb-1.11.459/src/test/java/com/nr/instrumentation/security/dynamodb459/DynamoServer.java → instrumentation-security/dynamodb-1.11.453/src/test/java/com/nr/agent/security/instrumentation/dynamodb_1_11_453/DynamoServer.java

@@ -5,7 +5,7 @@
  *
  */
 
-package com.nr.instrumentation.security.dynamodb459;
+package com.nr.agent.security.instrumentation.dynamodb_1_11_453;
 
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
@@ -90,6 +90,7 @@ public class DynamoServer extends ExternalResource {
 
     private void setUp() throws Exception {
         System.setProperty("sqlite4java.library.path", "src/test/resources/libs/");
+
         server = ServerRunner.createServerFromCommandLineArgs(new String[]{ "-inMemory", "-port", String.valueOf(PORT) });
         server.start();
 

instrumentation-security/dynamodb-1.11.390/src/test/java/com/nr/instrumentation/security/dynamodb390/DynamodbTest.java → instrumentation-security/dynamodb-1.11.453/src/test/java/com/nr/agent/security/instrumentation/dynamodb_1_11_453/DynamodbTest.java

@@ -1,15 +1,7 @@
-package com.nr.instrumentation.security.dynamodb390;
+package com.nr.agent.security.instrumentation.dynamodb_1_11_453;
 
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
 import com.amazonaws.services.dynamodbv2.model.AttributeValueUpdate;
-import com.amazonaws.services.dynamodbv2.model.DeleteItemRequest;
-import com.amazonaws.services.dynamodbv2.model.GetItemRequest;
-import com.amazonaws.services.dynamodbv2.model.KeysAndAttributes;
-import com.amazonaws.services.dynamodbv2.model.PutItemRequest;
-import com.amazonaws.services.dynamodbv2.model.PutRequest;
-import com.amazonaws.services.dynamodbv2.model.QueryRequest;
-import com.amazonaws.services.dynamodbv2.model.ScanRequest;
-import com.amazonaws.services.dynamodbv2.model.UpdateItemRequest;
 import com.newrelic.agent.security.introspec.InstrumentationTestConfig;
 import com.newrelic.agent.security.introspec.SecurityInstrumentationTestRunner;
 import com.newrelic.agent.security.introspec.SecurityIntrospector;
@@ -29,7 +21,7 @@
 
 @RunWith(SecurityInstrumentationTestRunner.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@InstrumentationTestConfig(includePrefixes = {"com.nr.agent.security.dynamodb_1_11_390", "com.amazonaws.services.dynamodbv2_1_11_390"})
+@InstrumentationTestConfig(includePrefixes = {"com.newrelic.agent.security.instrumentation.dynamodb_1_11_453", "com.amazonaws.services"})
 public class DynamodbTest {
     @ClassRule
     public static DynamoServer dynamo = new DynamoServer();

instrumentation-security/dynamodb-1.11.459/src/main/java/com/amazonaws/services/dynamodbv2_1_11_459/AmazonDynamoDBClient_Instrumentation.java

@@ -18,7 +18,7 @@
 import com.newrelic.api.agent.security.schema.AbstractOperation;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;
-import com.nr.agent.security.dynamodb_1_11_459.DynamoDBUtil;
+import com.newrelic.agent.security.instrumentation.dynamodb_1_11_459.DynamoDBUtil;
 
 import java.net.URI;
 

instrumentation-security/dynamodb-1.11.459/src/main/java/com/nr/agent/security/dynamodb_1_11_459/DynamoDBUtil.java → instrumentation-security/dynamodb-1.11.459/src/main/java/com/newrelic/agent/security/instrumentation/dynamodb_1_11_459/DynamoDBUtil.java

@@ -5,7 +5,7 @@
  *
  */
 
-package com.nr.agent.security.dynamodb_1_11_459;
+package com.newrelic.agent.security.instrumentation.dynamodb_1_11_459;
 
 import com.amazonaws.AmazonWebServiceRequest;
 import com.amazonaws.Request;

instrumentation-security/dynamodb-1.11.390/src/test/java/com/nr/instrumentation/security/dynamodb390/DynamoServer.java → instrumentation-security/dynamodb-1.11.459/src/test/java/com/nr/agent/security/instrumentation/dynamodb_1_11_459/DynamoServer.java

@@ -5,7 +5,7 @@
  *
  */
 
-package com.nr.instrumentation.security.dynamodb390;
+package com.nr.agent.security.instrumentation.dynamodb_1_11_459;
 
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;