hypertrace
diff --git a/‎instrumentation/build.gradle.kts‎
Lines changed: 1 addition & 1 deletion b/‎instrumentation/build.gradle.kts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎…servlet-3.0-no-wrapping/build.gradle.kts‎ ‎…ion/servlet/servlet-3.0/build.gradle.kts‎instrumentation/servlet/servlet-3.0-no-wrapping/build.gradle.kts renamed to instrumentation/servlet/servlet-3.0/build.gradle.kts b/‎…servlet-3.0-no-wrapping/build.gradle.kts‎ ‎…ion/servlet/servlet-3.0/build.gradle.kts‎instrumentation/servlet/servlet-3.0-no-wrapping/build.gradle.kts renamed to instrumentation/servlet/servlet-3.0/build.gradle.kts
diff --git a/‎…nowrapping/BodyCaptureAsyncListener.java‎ ‎…nowrapping/BodyCaptureAsyncListener.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/BodyCaptureAsyncListener.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/BodyCaptureAsyncListener.java b/‎…nowrapping/BodyCaptureAsyncListener.java‎ ‎…nowrapping/BodyCaptureAsyncListener.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/BodyCaptureAsyncListener.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/BodyCaptureAsyncListener.java
diff --git a/‎…apping/Servlet31InstrumentationName.java‎ ‎…apping/Servlet31InstrumentationName.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31InstrumentationName.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31InstrumentationName.java b/‎…apping/Servlet31InstrumentationName.java‎ ‎…apping/Servlet31InstrumentationName.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31InstrumentationName.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31InstrumentationName.java
diff --git a/‎…/Servlet31NoWrappingInstrumentation.java‎ ‎…/Servlet31NoWrappingInstrumentation.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31NoWrappingInstrumentation.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31NoWrappingInstrumentation.java b/‎…/Servlet31NoWrappingInstrumentation.java‎ ‎…/Servlet31NoWrappingInstrumentation.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31NoWrappingInstrumentation.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31NoWrappingInstrumentation.java
diff --git a/‎…et31NoWrappingInstrumentationModule.java‎ ‎…et31NoWrappingInstrumentationModule.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31NoWrappingInstrumentationModule.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31NoWrappingInstrumentationModule.java b/‎…et31NoWrappingInstrumentationModule.java‎ ‎…et31NoWrappingInstrumentationModule.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31NoWrappingInstrumentationModule.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31NoWrappingInstrumentationModule.java
diff --git a/‎…trace/servlet/v3_0/nowrapping/Utils.java‎ ‎…trace/servlet/v3_0/nowrapping/Utils.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Utils.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Utils.java b/‎…trace/servlet/v3_0/nowrapping/Utils.java‎ ‎…trace/servlet/v3_0/nowrapping/Utils.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Utils.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Utils.java
diff --git a/‎…t/ServletInputStreamInstrumentation.java‎ ‎…t/ServletInputStreamInstrumentation.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/request/ServletInputStreamInstrumentation.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/request/ServletInputStreamInstrumentation.java b/‎…t/ServletInputStreamInstrumentation.java‎ ‎…t/ServletInputStreamInstrumentation.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/request/ServletInputStreamInstrumentation.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/request/ServletInputStreamInstrumentation.java
diff --git a/‎…quest/ServletRequestInstrumentation.java‎ ‎…quest/ServletRequestInstrumentation.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/request/ServletRequestInstrumentation.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/request/ServletRequestInstrumentation.java b/‎…quest/ServletRequestInstrumentation.java‎ ‎…quest/ServletRequestInstrumentation.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/request/ServletRequestInstrumentation.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/request/ServletRequestInstrumentation.java
diff --git a/‎…rvlet/v3_0/nowrapping/request/Utils.java‎ ‎…rvlet/v3_0/nowrapping/request/Utils.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/request/Utils.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/request/Utils.java b/‎…rvlet/v3_0/nowrapping/request/Utils.java‎ ‎…rvlet/v3_0/nowrapping/request/Utils.java‎instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/request/Utils.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/request/Utils.java
@@ -30,7 +30,7 @@ subprojects {
 
 dependencies{
     implementation(project(":instrumentation:servlet:servlet-rw"))
-    implementation(project(":instrumentation:servlet:servlet-3.0-no-wrapping"))
+    implementation(project(":instrumentation:servlet:servlet-3.0"))
     implementation(project(":instrumentation:spark-2.3"))
     implementation(project(":instrumentation:grpc-1.5"))
     implementation(project(":instrumentation:okhttp:okhttp-3.0"))