Support Struts 7 (fixes CI muzzle failures)

Author: trask

instrumentation/struts-2.3/javaagent/build.gradle.kts renamed to instrumentation/struts/struts-2.3/javaagent/build.gradle.kts

@@ -6,7 +6,8 @@ muzzle {
   pass {
     group.set("org.apache.struts")
     module.set("struts2-core")
-    versions.set("[2.3.1,)")
+    versions.set("[2.1.0,7)")
+    assertInverse.set(true)
   }
 }
 

instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/ActionInvocationInstrumentation.java renamed to instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/ActionInvocationInstrumentation.java

@@ -12,6 +12,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.not;
 
 import com.opensymphony.xwork2.ActionInvocation;
 import io.opentelemetry.context.Context;
@@ -28,7 +29,8 @@ public class ActionInvocationInstrumentation implements TypeInstrumentation {
 
   @Override
   public ElementMatcher<ClassLoader> classLoaderOptimization() {
-    return hasClassesNamed("com.opensymphony.xwork2.ActionInvocation");
+    return hasClassesNamed("com.opensymphony.xwork2.ActionInvocation")
+        .and(not(hasClassesNamed("org.apache.struts2.ActionInvocation")));
   }
 
   @Override