Consistency: instrumentation classes should be in files ending with I…

…nstrumentation.java (#8144) This is so we can direct load requests to a special class-loader that can be unloaded after use. See https://github.com/DataDog/dd-trace-java/blob/master/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/DatadogClassLoader.java#L97
DataDog · Jan 3, 2025 · a8b33d5 · a8b33d5
1 parent 865594b
commit a8b33d5
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/...upload/CommonsFileuploadInstrumenter.java → ...oad/CommonsFileuploadInstrumentation.java b/...upload/CommonsFileuploadInstrumenter.java → ...oad/CommonsFileuploadInstrumentation.java
@@ -22,10 +22,10 @@
 import net.bytebuddy.asm.Advice;
 
 @AutoService(InstrumenterModule.class)
-public class CommonsFileuploadInstrumenter extends InstrumenterModule.Iast
+public class CommonsFileuploadInstrumentation extends InstrumenterModule.Iast
     implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public CommonsFileuploadInstrumenter() {
+  public CommonsFileuploadInstrumentation() {
     super("commons-fileupload");
   }
 

diff --git a/...mons/fileupload/FileItemInstrumenter.java → ...s/fileupload/FileItemInstrumentation.java b/...mons/fileupload/FileItemInstrumenter.java → ...s/fileupload/FileItemInstrumentation.java
@@ -22,10 +22,10 @@
 import org.apache.commons.fileupload.FileItem;
 
 @AutoService(InstrumenterModule.class)
-public class FileItemInstrumenter extends InstrumenterModule.Iast
+public class FileItemInstrumentation extends InstrumenterModule.Iast
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public FileItemInstrumenter() {
+  public FileItemInstrumentation() {
     super("commons-fileupload", "fileitem");
   }
 

diff --git a/...eupload/FileItemIteratorInstrumenter.java → ...load/FileItemIteratorInstrumentation.java b/...eupload/FileItemIteratorInstrumenter.java → ...load/FileItemIteratorInstrumentation.java
@@ -22,10 +22,10 @@
 import org.apache.commons.fileupload.FileItemStream;
 
 @AutoService(InstrumenterModule.class)
-public class FileItemIteratorInstrumenter extends InstrumenterModule.Iast
+public class FileItemIteratorInstrumentation extends InstrumenterModule.Iast
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public FileItemIteratorInstrumenter() {
+  public FileItemIteratorInstrumentation() {
     super("commons-fileupload", "fileitemiterator");
   }
 

diff --git a/...ileupload/FileItemStreamInstrumenter.java → ...upload/FileItemStreamInstrumentation.java b/...ileupload/FileItemStreamInstrumenter.java → ...upload/FileItemStreamInstrumentation.java
@@ -22,10 +22,10 @@
 import org.apache.commons.fileupload.FileItemStream;
 
 @AutoService(InstrumenterModule.class)
-public class FileItemStreamInstrumenter extends InstrumenterModule.Iast
+public class FileItemStreamInstrumentation extends InstrumenterModule.Iast
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public FileItemStreamInstrumenter() {
+  public FileItemStreamInstrumentation() {
     super("commons-fileupload", "fileitemstream");
   }
 

diff --git a/...upload/ServletFileUploadInstrumenter.java → ...oad/ServletFileUploadInstrumentation.java b/...upload/ServletFileUploadInstrumenter.java → ...oad/ServletFileUploadInstrumentation.java
@@ -23,10 +23,10 @@
 import org.apache.commons.fileupload.FileItemIterator;
 
 @AutoService(InstrumenterModule.class)
-public class ServletFileUploadInstrumenter extends InstrumenterModule.Iast
+public class ServletFileUploadInstrumentation extends InstrumenterModule.Iast
     implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ServletFileUploadInstrumenter() {
+  public ServletFileUploadInstrumentation() {
     super("commons-fileupload", "servlet");
   }
 

diff --git a/...st/groovy/FileItemInstrumenterTest.groovy → ...groovy/FileItemInstrumentationTest.groovy b/...st/groovy/FileItemInstrumenterTest.groovy → ...groovy/FileItemInstrumentationTest.groovy
@@ -6,7 +6,7 @@ import datadog.trace.bootstrap.instrumentation.api.AgentTracer
 import datadog.trace.bootstrap.instrumentation.api.TagContext
 import foo.bar.smoketest.MockFileItem
 
-class FileItemInstrumenterTest extends AgentTestRunner {
+class FileItemInstrumentationTest extends AgentTestRunner {
 
   private Object iastCtx
 

diff --git a/...y/FileItemIteratorInstrumenterTest.groovy → ...ileItemIteratorInstrumentationTest.groovy b/...y/FileItemIteratorInstrumenterTest.groovy → ...ileItemIteratorInstrumentationTest.groovy
@@ -7,7 +7,7 @@ import datadog.trace.bootstrap.instrumentation.api.TagContext
 import foo.bar.smoketest.MockFileItemIterator
 import foo.bar.smoketest.MockFileItemStream
 
-class FileItemIteratorInstrumenterTest extends AgentTestRunner {
+class FileItemIteratorInstrumentationTest extends AgentTestRunner {
 
   private Object iastCtx
 

diff --git a/...ovy/FileItemStreamInstrumenterTest.groovy → .../FileItemStreamInstrumentationTest.groovy b/...ovy/FileItemStreamInstrumenterTest.groovy → .../FileItemStreamInstrumentationTest.groovy
@@ -6,7 +6,7 @@ import datadog.trace.bootstrap.instrumentation.api.AgentTracer
 import datadog.trace.bootstrap.instrumentation.api.TagContext
 import foo.bar.smoketest.MockFileItemStream
 
-class FileItemStreamInstrumenterTest extends AgentTestRunner {
+class FileItemStreamInstrumentationTest extends AgentTestRunner {
 
   private Object iastCtx
 

diff --git a/.../ServletFileUploadInstrumenterTest.groovy → ...rvletFileUploadInstrumentationTest.groovy b/.../ServletFileUploadInstrumenterTest.groovy → ...rvletFileUploadInstrumentationTest.groovy
@@ -11,7 +11,7 @@ import org.apache.commons.fileupload.FileItemIterator
 import org.apache.commons.fileupload.disk.DiskFileItemFactory
 import org.apache.commons.fileupload.servlet.ServletFileUpload
 
-class ServletFileUploadInstrumenterTest extends AgentTestRunner {
+class ServletFileUploadInstrumentationTest extends AgentTestRunner {
 
   private Object iastCtx