Skip to content

Commit 3f86ad6

Browse files
trasktrask
authored
Move servlet-common internal package under servlet.common.internal (#18855)
1 parent 6a3862f commit 3f86ad6

45 files changed

Lines changed: 85 additions & 87 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/scripts/check-package-names.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java |
1313
if [[ "$module_name" == "runtime-telemetry" ]]; then
1414
continue
1515
fi
16-
if [[ "$module_name" == "servlet-common" ]]; then
17-
continue
18-
fi
1916
if [[ "$module_name" == "graphql-java-common-12.0" ]]; then
2017
continue
2118
fi
@@ -39,8 +36,9 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java |
3936
# - lettuce-common
4037
# - netty-common
4138
# - resources
39+
# - servlet-common
4240
# - servlet-common-javax
43-
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
41+
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
4442
echo "module name doesn't have a base version: $dir"
4543
exit 1
4644
fi

‎instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11InstrumentationModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.google.auto.service.AutoService;
1313
import io.opentelemetry.context.Context;
1414
import io.opentelemetry.context.Scope;
15-
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
15+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
1616
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
1717
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1818
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;

‎instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11Singletons.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package io.opentelemetry.javaagent.instrumentation.jetty.v11_0;
77

88
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
9-
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
10-
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
9+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
10+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
1111
import io.opentelemetry.instrumentation.servlet.v5_0.internal.Servlet5Accessor;
1212
import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
1313
import io.opentelemetry.javaagent.instrumentation.jetty.common.v8_0.JettyHelper;

‎instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8InstrumentationModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.google.auto.service.AutoService;
1313
import io.opentelemetry.context.Context;
1414
import io.opentelemetry.context.Scope;
15-
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
15+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
1616
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
1717
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1818
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;

‎instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8Singletons.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
99
import io.opentelemetry.instrumentation.api.util.VirtualField;
10-
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
11-
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
10+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
11+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
1212
import io.opentelemetry.instrumentation.servlet.v3_0.internal.Servlet3Accessor;
1313
import io.opentelemetry.javaagent.bootstrap.executors.PropagatedContext;
1414
import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;

‎instrumentation/jetty/jetty-common-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/v8_0/JettyHelper.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import io.opentelemetry.context.Context;
99
import io.opentelemetry.context.Scope;
1010
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
11-
import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor;
12-
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
13-
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
11+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor;
12+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
13+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
1414
import io.opentelemetry.javaagent.instrumentation.servlet.common.ServletHelper;
1515
import javax.annotation.Nullable;
1616

‎instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertyHelper.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import io.opentelemetry.context.Context;
99
import io.opentelemetry.context.Scope;
1010
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
11-
import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor;
12-
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
13-
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
11+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor;
12+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
13+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
1414
import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
1515
import io.opentelemetry.javaagent.instrumentation.servlet.common.ServletHelper;
1616
import javax.annotation.Nullable;

‎instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertySingletons.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package io.opentelemetry.javaagent.instrumentation.liberty.v20_0;
77

88
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
9-
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
10-
import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
9+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
10+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext;
1111
import io.opentelemetry.instrumentation.servlet.v3_0.internal.Servlet3Accessor;
1212
import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
1313
import io.opentelemetry.javaagent.instrumentation.servlet.common.AgentServletInstrumenterBuilder;

‎instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertyWebAppInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
import io.opentelemetry.context.Context;
1313
import io.opentelemetry.context.Scope;
14-
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
14+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
1515
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
1616
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
1717
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;

‎instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/ThreadLocalContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import io.opentelemetry.context.Context;
99
import io.opentelemetry.context.Scope;
10-
import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
10+
import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext;
1111
import javax.annotation.Nullable;
1212
import javax.servlet.http.HttpServletRequest;
1313
import javax.servlet.http.HttpServletResponse;

0 commit comments

Comments
 (0)