Skip to content

Move servlet-common internal package under servlet.common.internal #18855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trask merged 3 commits into from
May 28, 2026
Merged

Move servlet-common internal package under servlet.common.internal #18855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b901285
Move servlet-common internal package under servlet.common.internal
trask May 26, 2026
adf0b6e
spotless
trask May 26, 2026
a7e4979
Merge branch 'main' into rename-servlet-common-internal
trask May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/scripts/check-package-names.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java |
if [[ "$module_name" == "runtime-telemetry" ]]; then
continue
fi
if [[ "$module_name" == "servlet-common" ]]; then
continue
fi
if [[ "$module_name" == "graphql-java-common-12.0" ]]; then
continue
fi
Expand All @@ -39,8 +36,9 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java |
# - lettuce-common
# - netty-common
# - resources
# - servlet-common
# - servlet-common-javax
if [[ ! "$module_name" =~ [0-9]$ && "$module_name" != "jdbc" && "$module_name" != "lettuce-common" && "$module_name" != "netty-common" && "$module_name" != "resources" && "$module_name" != "servlet-common-javax" ]]; then
if [[ ! "$module_name" =~ [0-9]$ && "$module_name" != "jdbc" && "$module_name" != "lettuce-common" && "$module_name" != "netty-common" && "$module_name" != "resources" && "$module_name" != "servlet-common" && "$module_name" != "servlet-common-javax" ]]; then
echo "module name doesn't have a base version: $dir"
exit 1
fi
Expand Down
2 changes: 1 addition & 1 deletion .../io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11InstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import com.google.auto.service.AutoService;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11Singletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
package io.opentelemetry.javaagent.instrumentation.jetty.v11_0;

import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.v5_0.internal.Servlet5Accessor;
import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
import io.opentelemetry.javaagent.instrumentation.jetty.common.v8_0.JettyHelper;
Expand Down
2 changes: 1 addition & 1 deletion ...va/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8InstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import com.google.auto.service.AutoService;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8Singletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.api.util.VirtualField;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.v3_0.internal.Servlet3Accessor;
import io.opentelemetry.javaagent.bootstrap.executors.PropagatedContext;
import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
Expand Down
6 changes: 3 additions & 3 deletions ...c/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/v8_0/JettyHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import io.opentelemetry.javaagent.instrumentation.servlet.common.ServletHelper;
import javax.annotation.Nullable;

Expand Down
6 changes: 3 additions & 3 deletions ...src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertyHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
import io.opentelemetry.javaagent.instrumentation.servlet.common.ServletHelper;
import javax.annotation.Nullable;
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertySingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
package io.opentelemetry.javaagent.instrumentation.liberty.v20_0;

import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.v3_0.internal.Servlet3Accessor;
import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
import io.opentelemetry.javaagent.instrumentation.servlet.common.AgentServletInstrumenterBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...o/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertyWebAppInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/ThreadLocalContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Accessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import static java.util.Collections.emptyList;

import io.opentelemetry.instrumentation.servlet.common.internal.ServletAsyncListener;
import io.opentelemetry.instrumentation.servlet.common.javax.JavaxServletAccessor;
import io.opentelemetry.instrumentation.servlet.internal.ServletAsyncListener;
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseMutator;
import java.util.List;
import javax.annotation.Nullable;
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Advice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.javaagent.bootstrap.CallDepth;
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Helper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import io.opentelemetry.javaagent.instrumentation.servlet.common.BaseServletHelper;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
Expand Down
8 changes: 4 additions & 4 deletions ...io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

package io.opentelemetry.javaagent.instrumentation.servlet.v2_2;

import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor;
import io.opentelemetry.instrumentation.servlet.internal.ServletHttpAttributesGetter;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletHttpAttributesGetter;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Singletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
import io.opentelemetry.instrumentation.api.util.VirtualField;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import io.opentelemetry.javaagent.instrumentation.servlet.common.AgentServletInstrumenterBuilder;
import io.opentelemetry.javaagent.instrumentation.servlet.common.response.ResponseInstrumenterFactory;
import javax.servlet.ServletResponse;
Expand Down
4 changes: 2 additions & 2 deletions ...va/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2SpanNameExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
package io.opentelemetry.javaagent.instrumentation.servlet.v2_2;

import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
import java.util.Set;

Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Advice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.javaagent.bootstrap.CallDepth;
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Singletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import io.opentelemetry.instrumentation.api.incubator.semconv.util.ClassAndMethod;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.api.util.VirtualField;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.v3_0.internal.Servlet3Accessor;
import io.opentelemetry.javaagent.bootstrap.servlet.ExperimentalSnippetHolder;
import io.opentelemetry.javaagent.bootstrap.servlet.MappingResolver;
Expand Down
4 changes: 2 additions & 2 deletions ...library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.v3_0.internal.Servlet3TelemetryFilter;
import javax.servlet.Filter;
import javax.servlet.http.HttpServletRequest;
Expand Down
8 changes: 4 additions & 4 deletions .../src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter;
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor;
import io.opentelemetry.instrumentation.servlet.internal.ServletHttpAttributesGetter;
import io.opentelemetry.instrumentation.servlet.internal.ServletInstrumenterBuilder;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletHttpAttributesGetter;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletInstrumenterBuilder;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.v3_0.internal.Experimental;
import io.opentelemetry.instrumentation.servlet.v3_0.internal.Servlet3Accessor;
import java.util.Collection;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/io/opentelemetry/instrumentation/servlet/v3_0/internal/Servlet3Accessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import static java.util.Collections.emptyList;

import io.opentelemetry.instrumentation.servlet.common.internal.ServletAsyncListener;
import io.opentelemetry.instrumentation.servlet.common.javax.JavaxServletAccessor;
import io.opentelemetry.instrumentation.servlet.internal.ServletAsyncListener;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions .../java/io/opentelemetry/instrumentation/servlet/v3_0/internal/Servlet3TelemetryFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import java.io.IOException;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.Nullable;
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5Singletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import io.opentelemetry.instrumentation.api.incubator.semconv.util.ClassAndMethod;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.api.util.VirtualField;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.v5_0.internal.Servlet5Accessor;
import io.opentelemetry.javaagent.bootstrap.servlet.ExperimentalSnippetHolder;
import io.opentelemetry.javaagent.bootstrap.servlet.MappingResolver;
Expand Down
2 changes: 1 addition & 1 deletion ...telemetry/javaagent/instrumentation/servlet/v5_0/service/JakartaServletServiceAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.javaagent.bootstrap.CallDepth;
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
Expand Down
4 changes: 2 additions & 2 deletions ...library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/ServletTelemetry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.v5_0.internal.Servlet5TelemetryFilter;
import jakarta.servlet.Filter;
import jakarta.servlet.http.HttpServletRequest;
Expand Down
8 changes: 4 additions & 4 deletions .../src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/ServletTelemetryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter;
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor;
import io.opentelemetry.instrumentation.servlet.internal.ServletHttpAttributesGetter;
import io.opentelemetry.instrumentation.servlet.internal.ServletInstrumenterBuilder;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletHttpAttributesGetter;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletInstrumenterBuilder;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.v5_0.internal.Experimental;
import io.opentelemetry.instrumentation.servlet.v5_0.internal.Servlet5Accessor;
import jakarta.servlet.http.HttpServletRequest;
Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/io/opentelemetry/instrumentation/servlet/v5_0/internal/Servlet5Accessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;

import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor;
import io.opentelemetry.instrumentation.servlet.internal.ServletAsyncListener;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletAsyncListener;
import jakarta.servlet.AsyncEvent;
import jakarta.servlet.AsyncListener;
import jakarta.servlet.ServletException;
Expand Down
4 changes: 2 additions & 2 deletions .../java/io/opentelemetry/instrumentation/servlet/v5_0/internal/Servlet5TelemetryFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.AsyncEvent;
import jakarta.servlet.AsyncListener;
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/io/opentelemetry/instrumentation/servlet/common/javax/JavaxServletAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;

import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor;
import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor;
import java.security.Principal;
import java.util.Collections;
import java.util.Enumeration;
Expand Down
Loading
Loading