Skip to content

Commit dea3d1c

Browse files
committed
spotlessApply
1 parent 4f0eb99 commit dea3d1c

File tree

12 files changed

+39
-11
lines changed

12 files changed

+39
-11
lines changed

instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3FilterInitAdvice.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public static void filterInit(
2020
if (filterConfig == null) {
2121
return;
2222
}
23-
FILTER_MAPPING_RESOLVER.set(
24-
filter, new Servlet3FilterMappingResolverFactory(filterConfig));
23+
FILTER_MAPPING_RESOLVER.set(filter, new Servlet3FilterMappingResolverFactory(filterConfig));
2524
}
2625
}

instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InitAdvice.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public static void servletInit(
2020
if (servletConfig == null) {
2121
return;
2222
}
23-
SERVLET_MAPPING_RESOLVER.set(
24-
servlet, new Servlet3MappingResolverFactory(servletConfig));
23+
SERVLET_MAPPING_RESOLVER.set(servlet, new Servlet3MappingResolverFactory(servletConfig));
2524
}
2625
}

instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3RequestAdviceScope.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
27

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

instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3ResponseAdviceScope.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
27

38
import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.responseInstrumenter;

instrumentation/servlet/servlet-3.0/library/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ dependencies {
1919
testLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:8.0.41")
2020
}
2121

22-
2322
tasks {
2423
withType<Test>().configureEach {
2524
// required on jdk17 to allow tomcat to shutdown properly.

instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/OpenTelemetryServletFilter.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.servlet.v3_0;
27

38
import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.FILTER_MAPPING_RESOLVER;
@@ -22,7 +27,7 @@
2227
* will miss anything that happens earlier in the filter stack or problems handled directly by the
2328
* app server. For this reason, Java Agent instrumentation is preferred when possible.
2429
*/
25-
@WebFilter("/*")
30+
@WebFilter("/*")
2631
public class OpenTelemetryServletFilter implements Filter {
2732

2833
@Override

instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/OtelAsyncContext.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.servlet.v3_0;
27

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

instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/OtelHttpServletRequest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.servlet.v3_0;
27

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

instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/OtelHttpServletResponse.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
package io.opentelemetry.instrumentation.servlet.v3_0;
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
25

6+
package io.opentelemetry.instrumentation.servlet.v3_0;
37

48
import io.opentelemetry.javaagent.bootstrap.CallDepth;
59
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3ResponseAdviceScope;
@@ -9,7 +13,7 @@
913

1014
/// Wrapper around [HttpServletResponse].
1115
public class OtelHttpServletResponse extends HttpServletResponseWrapper {
12-
16+
1317
public OtelHttpServletResponse(HttpServletResponse response) {
1418
super(response);
1519
}

instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v3_0/jetty/JettyServlet3Test.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ protected void handleErrorPage(
9494
writer.write(th != null ? th.getMessage() : message);
9595
}
9696
});
97-
servletContext.addFilter(OpenTelemetryServletFilter.class, "/*", EnumSet.allOf(DispatcherType.class));
97+
servletContext.addFilter(
98+
OpenTelemetryServletFilter.class, "/*", EnumSet.allOf(DispatcherType.class));
9899
setupServlets(servletContext);
99100
jettyServer.setHandler(servletContext);
100101

0 commit comments

Comments
 (0)