Skip to content

Commit 4f0eb99

Browse files
tylerbensontylerbenson
committed
fix package name
1 parent 58773b5 commit 4f0eb99

28 files changed

+59
-55
lines changed

‎instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/OpenTelemetryServletFilter.java‎ renamed to ‎instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/OpenTelemetryServletFilter.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
1+
package io.opentelemetry.instrumentation.servlet.v3_0;
22

33
import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.FILTER_MAPPING_RESOLVER;
44

55
import io.opentelemetry.javaagent.bootstrap.CallDepth;
6+
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3FilterMappingResolverFactory;
7+
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3RequestAdviceScope;
68
import java.io.IOException;
79
import javax.servlet.Filter;
810
import javax.servlet.FilterChain;
@@ -24,7 +26,7 @@
2426
public class OpenTelemetryServletFilter implements Filter {
2527

2628
@Override
27-
public void init(FilterConfig filterConfig) throws ServletException {
29+
public void init(FilterConfig filterConfig) {
2830
FILTER_MAPPING_RESOLVER.set(this, new Servlet3FilterMappingResolverFactory(filterConfig));
2931
}
3032

‎instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/OtelAsyncContext.java‎ renamed to ‎instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/OtelAsyncContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
1+
package io.opentelemetry.instrumentation.servlet.v3_0;
22

33
import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.helper;
44

‎instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/OtelHttpServletRequest.java‎ renamed to ‎instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/OtelHttpServletRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
1+
package io.opentelemetry.instrumentation.servlet.v3_0;
22

33
import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.helper;
44

‎instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/OtelHttpServletResponse.java‎ renamed to ‎instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/OtelHttpServletResponse.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
1+
package io.opentelemetry.instrumentation.servlet.v3_0;
22

33

44
import io.opentelemetry.javaagent.bootstrap.CallDepth;
5+
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3ResponseAdviceScope;
56
import java.io.IOException;
67
import javax.servlet.http.HttpServletResponse;
78
import javax.servlet.http.HttpServletResponseWrapper;

‎instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/AbstractServlet3Test.java‎ renamed to ‎instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v3_0/AbstractServlet3Test.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.servlet.v3_0;
6+
package io.opentelemetry.instrumentation.servlet.v3_0;
77

88
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.AUTH_REQUIRED;
99
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.CAPTURE_HEADERS;

‎instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/RequestDispatcherServlet.java‎ renamed to ‎instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v3_0/RequestDispatcherServlet.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.servlet.v3_0;
6+
package io.opentelemetry.instrumentation.servlet.v3_0;
77

88
import java.io.IOException;
99
import javax.servlet.RequestDispatcher;

‎instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/TestAgentHttpResponseCustomizer.java‎ renamed to ‎instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v3_0/TestAgentHttpResponseCustomizer.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.servlet.v3_0;
6+
package io.opentelemetry.instrumentation.servlet.v3_0;
77

88
import io.opentelemetry.api.trace.Span;
99
import io.opentelemetry.api.trace.SpanContext;

‎instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/TestServlet3.java‎ renamed to ‎instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v3_0/TestServlet3.java‎

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

6-
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
6+
package io.opentelemetry.instrumentation.servlet.v3_0;
77

8+
import static io.opentelemetry.instrumentation.servlet.v3_0.AbstractServlet3Test.HTML_PRINT_WRITER;
9+
import static io.opentelemetry.instrumentation.servlet.v3_0.AbstractServlet3Test.HTML_SERVLET_OUTPUT_STREAM;
810
import static io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest.controller;
911
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.CAPTURE_HEADERS;
1012
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.CAPTURE_PARAMETERS;
@@ -14,12 +16,11 @@
1416
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.QUERY_PARAM;
1517
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
1618
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
17-
import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.AbstractServlet3Test.HTML_PRINT_WRITER;
18-
import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.AbstractServlet3Test.HTML_SERVLET_OUTPUT_STREAM;
1919
import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.SERVLET_MAPPING_RESOLVER;
2020

2121
import io.opentelemetry.instrumentation.testing.GlobalTraceUtil;
2222
import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
23+
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3MappingResolverFactory;
2324
import java.io.IOException;
2425
import java.io.PrintWriter;
2526
import java.nio.charset.StandardCharsets;

‎instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3AsyncTest.java‎ renamed to ‎instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v3_0/jetty/JettyServlet3AsyncTest.java‎

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

6-
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.jetty;
6+
package io.opentelemetry.instrumentation.servlet.v3_0.jetty;
77

88
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
99
import static org.assertj.core.api.Assertions.assertThat;
1010

1111
import io.opentelemetry.api.trace.SpanKind;
12-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
12+
import io.opentelemetry.instrumentation.servlet.v3_0.TestServlet3;
1313
import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest;
1414
import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse;
1515
import io.opentelemetry.testing.internal.armeria.common.HttpMethod;

‎instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3FakeAsyncTest.java‎ renamed to ‎instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v3_0/jetty/JettyServlet3FakeAsyncTest.java‎

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

6-
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.jetty;
6+
package io.opentelemetry.instrumentation.servlet.v3_0.jetty;
77

8-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TestServlet3;
8+
import io.opentelemetry.instrumentation.servlet.v3_0.TestServlet3;
99
import javax.servlet.Servlet;
1010

1111
class JettyServlet3FakeAsyncTest extends JettyServlet3Test {

0 commit comments

Comments
 (0)