Skip to content

Commit 6229255

Browse files
lauritlaurit
committed
move struts 2.3 and 7 instrumenation to separate pacakges
1 parent 11d7c19 commit 6229255

File tree

20 files changed

+39
-39
lines changed

20 files changed

+39
-39
lines changed

‎instrumentation/struts/struts-2.3/javaagent/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ dependencies {
2525
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
2626
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
2727
testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
28+
testInstrumentation(project(":instrumentation:struts:struts-7.0:javaagent"))
2829

2930
latestDepTestLibrary("org.apache.struts:struts2-core:6.0.+")
3031
}

‎instrumentation/struts/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/v2_3/ActionInvocationInstrumentation.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.struts2;
6+
package io.opentelemetry.javaagent.instrumentation.struts2.v2_3;
77

88
import static io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource.CONTROLLER;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
1010
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
11-
import static io.opentelemetry.javaagent.instrumentation.struts2.StrutsSingletons.instrumenter;
11+
import static io.opentelemetry.javaagent.instrumentation.struts2.v2_3.StrutsSingletons.instrumenter;
1212
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
1313
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
1414
import static net.bytebuddy.matcher.ElementMatchers.named;
15-
import static net.bytebuddy.matcher.ElementMatchers.not;
1615

1716
import com.opensymphony.xwork2.ActionInvocation;
1817
import io.opentelemetry.context.Context;
@@ -29,8 +28,7 @@ public class ActionInvocationInstrumentation implements TypeInstrumentation {
2928

3029
@Override
3130
public ElementMatcher<ClassLoader> classLoaderOptimization() {
32-
return hasClassesNamed("com.opensymphony.xwork2.ActionInvocation")
33-
.and(not(hasClassesNamed("org.apache.struts2.ActionInvocation")));
31+
return hasClassesNamed("com.opensymphony.xwork2.ActionInvocation");
3432
}
3533

3634
@Override

‎instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2InstrumentationModule.java‎ renamed to ‎instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/v2_3/Struts2InstrumentationModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.struts2;
6+
package io.opentelemetry.javaagent.instrumentation.struts2.v2_3;
77

88
import static java.util.Collections.singletonList;
99

‎instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/StrutsCodeAttributesGetter.java‎ renamed to ‎instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/v2_3/StrutsCodeAttributesGetter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.struts2;
6+
package io.opentelemetry.javaagent.instrumentation.struts2.v2_3;
77

88
import com.opensymphony.xwork2.ActionInvocation;
99
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter;

‎instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/StrutsServerSpanNaming.java‎ renamed to ‎instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/v2_3/StrutsServerSpanNaming.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.struts2;
6+
package io.opentelemetry.javaagent.instrumentation.struts2.v2_3;
77

88
import com.opensymphony.xwork2.ActionProxy;
99
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteGetter;

‎instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/StrutsSingletons.java‎ renamed to ‎instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/v2_3/StrutsSingletons.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.struts2;
6+
package io.opentelemetry.javaagent.instrumentation.struts2.v2_3;
77

88
import com.opensymphony.xwork2.ActionInvocation;
99
import io.opentelemetry.api.GlobalOpenTelemetry;

‎instrumentation/struts/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts2/GreetingAction.java‎ renamed to ‎instrumentation/struts/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts2/v2_3/GreetingAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.struts2;
6+
package io.opentelemetry.javaagent.instrumentation.struts2.v2_3;
77

88
import static io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest.controller;
99

‎instrumentation/struts/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts2/GreetingServlet.java‎ renamed to ‎instrumentation/struts/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts2/v2_3/GreetingServlet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.struts2;
6+
package io.opentelemetry.javaagent.instrumentation.struts2.v2_3;
77

88
import java.io.IOException;
99
import javax.servlet.http.HttpServlet;

‎instrumentation/struts/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2ActionSpanTest.java‎ renamed to ‎instrumentation/struts/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts2/v2_3/Struts2ActionSpanTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.struts2;
6+
package io.opentelemetry.javaagent.instrumentation.struts2.v2_3;
77

88
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.ERROR;
99
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION;

‎instrumentation/struts/struts-2.3/javaagent/src/test/resources/struts.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@
2626
<exception-mapping exception="java.lang.Exception" result="error"/>
2727
</global-exception-mappings>
2828

29-
<action name="success" class="io.opentelemetry.javaagent.instrumentation.struts2.GreetingAction" method="success"/>
30-
<action name="redirect" class="io.opentelemetry.javaagent.instrumentation.struts2.GreetingAction" method="redirect"/>
31-
<action name="query" class="io.opentelemetry.javaagent.instrumentation.struts2.GreetingAction" method="query_param"/>
32-
<action name="error-status" class="io.opentelemetry.javaagent.instrumentation.struts2.GreetingAction" method="error"/>
33-
<action name="exception" class="io.opentelemetry.javaagent.instrumentation.struts2.GreetingAction" method="exception"/>
34-
<action name="/path/{id}/param" class="io.opentelemetry.javaagent.instrumentation.struts2.GreetingAction"
29+
<action name="success" class="io.opentelemetry.javaagent.instrumentation.struts2.v2_3.GreetingAction" method="success"/>
30+
<action name="redirect" class="io.opentelemetry.javaagent.instrumentation.struts2.v2_3.GreetingAction" method="redirect"/>
31+
<action name="query" class="io.opentelemetry.javaagent.instrumentation.struts2.v2_3.GreetingAction" method="query_param"/>
32+
<action name="error-status" class="io.opentelemetry.javaagent.instrumentation.struts2.v2_3.GreetingAction" method="error"/>
33+
<action name="exception" class="io.opentelemetry.javaagent.instrumentation.struts2.v2_3.GreetingAction" method="exception"/>
34+
<action name="/path/{id}/param" class="io.opentelemetry.javaagent.instrumentation.struts2.v2_3.GreetingAction"
3535
method="path_param"/>
36-
<action name="child" class="io.opentelemetry.javaagent.instrumentation.struts2.GreetingAction" method="indexed_child"/>
37-
<action name="captureHeaders" class="io.opentelemetry.javaagent.instrumentation.struts2.GreetingAction" method="capture_headers"/>
38-
<action name="dispatch" class="io.opentelemetry.javaagent.instrumentation.struts2.GreetingAction" method="dispatch_servlet"/>
36+
<action name="child" class="io.opentelemetry.javaagent.instrumentation.struts2.v2_3.GreetingAction" method="indexed_child"/>
37+
<action name="captureHeaders" class="io.opentelemetry.javaagent.instrumentation.struts2.v2_3.GreetingAction" method="capture_headers"/>
38+
<action name="dispatch" class="io.opentelemetry.javaagent.instrumentation.struts2.v2_3.GreetingAction" method="dispatch_servlet"/>
3939
</package>
4040

4141

0 commit comments

Comments
 (0)