Skip to content

Commit a1e5009

Browse files
lauritlaurit
committed
rename package
1 parent 6229255 commit a1e5009

File tree

19 files changed

+37
-37
lines changed

19 files changed

+37
-37
lines changed

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ These are the supported libraries and frameworks:
3939
| [Apache Pulsar](https://pulsar.apache.org/) | 2.8+ | N/A | [Messaging Spans] |
4040
| [Apache RocketMQ gRPC/Protobuf-based Client](https://rocketmq.apache.org/) | 5.0+ | N/A | [Messaging Spans] |
4141
| [Apache RocketMQ Remoting-based Client](https://rocketmq.apache.org/) | 4.8+ | [opentelemetry-rocketmq-client-4.8](../instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library) | [Messaging Spans] |
42-
| [Apache Struts 2](https://github.com/apache/struts) | 2.3+ | N/A | Provides `http.route` [2], Controller Spans [3] |
42+
| [Apache Struts](https://github.com/apache/struts) | 2.3+ | N/A | Provides `http.route` [2], Controller Spans [3] |
4343
| [Apache Tapestry](https://tapestry.apache.org/) | 5.4+ | N/A | Provides `http.route` [2], Controller Spans [3] |
4444
| [Apache Wicket](https://wicket.apache.org/) | 8.0+ | N/A | Provides `http.route` [2] |
4545
| [Armeria](https://armeria.dev) | 1.3+ | [opentelemetry-armeria-1.3](../instrumentation/armeria/armeria-1.3/library) | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics] |

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

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

6-
package io.opentelemetry.javaagent.instrumentation.struts2.v2_3;
6+
package io.opentelemetry.javaagent.instrumentation.struts.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.v2_3.StrutsSingletons.instrumenter;
11+
import static io.opentelemetry.javaagent.instrumentation.struts.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;

‎instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/v2_3/Struts2InstrumentationModule.java‎ renamed to ‎instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/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.v2_3;
6+
package io.opentelemetry.javaagent.instrumentation.struts.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/v2_3/StrutsCodeAttributesGetter.java‎ renamed to ‎instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/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.v2_3;
6+
package io.opentelemetry.javaagent.instrumentation.struts.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/v2_3/StrutsServerSpanNaming.java‎ renamed to ‎instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/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.v2_3;
6+
package io.opentelemetry.javaagent.instrumentation.struts.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/v2_3/StrutsSingletons.java‎ renamed to ‎instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/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.v2_3;
6+
package io.opentelemetry.javaagent.instrumentation.struts.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/v2_3/GreetingAction.java‎ renamed to ‎instrumentation/struts/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts/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.v2_3;
6+
package io.opentelemetry.javaagent.instrumentation.struts.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/v2_3/GreetingServlet.java‎ renamed to ‎instrumentation/struts/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts/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.v2_3;
6+
package io.opentelemetry.javaagent.instrumentation.struts.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/v2_3/Struts2ActionSpanTest.java‎ renamed to ‎instrumentation/struts/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts/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.v2_3;
6+
package io.opentelemetry.javaagent.instrumentation.struts.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.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"
29+
<action name="success" class="io.opentelemetry.javaagent.instrumentation.struts.v2_3.GreetingAction" method="success"/>
30+
<action name="redirect" class="io.opentelemetry.javaagent.instrumentation.struts.v2_3.GreetingAction" method="redirect"/>
31+
<action name="query" class="io.opentelemetry.javaagent.instrumentation.struts.v2_3.GreetingAction" method="query_param"/>
32+
<action name="error-status" class="io.opentelemetry.javaagent.instrumentation.struts.v2_3.GreetingAction" method="error"/>
33+
<action name="exception" class="io.opentelemetry.javaagent.instrumentation.struts.v2_3.GreetingAction" method="exception"/>
34+
<action name="/path/{id}/param" class="io.opentelemetry.javaagent.instrumentation.struts.v2_3.GreetingAction"
3535
method="path_param"/>
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"/>
36+
<action name="child" class="io.opentelemetry.javaagent.instrumentation.struts.v2_3.GreetingAction" method="indexed_child"/>
37+
<action name="captureHeaders" class="io.opentelemetry.javaagent.instrumentation.struts.v2_3.GreetingAction" method="capture_headers"/>
38+
<action name="dispatch" class="io.opentelemetry.javaagent.instrumentation.struts.v2_3.GreetingAction" method="dispatch_servlet"/>
3939
</package>
4040

4141

0 commit comments

Comments
 (0)