Skip to content

Commit 7312f98

Browse files
shs96cshs96c
committed
Ensure that the tracing library does not touch the old grid code
1 parent 0840fb9 commit 7312f98

File tree

33 files changed

+97
-75
lines changed

33 files changed

+97
-75
lines changed

‎java/client/src/org/openqa/selenium/remote/BUCK

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ java_library(name = 'remote-lib',
122122
'mobile/RemoteNetworkConnection.java',
123123
] + glob([
124124
'service/*.java',
125-
'tracing/*.java',
126125
]),
127126
resources = [
128127
':get-attribute',
@@ -134,14 +133,10 @@ java_library(name = 'remote-lib',
134133
'//java/client/src/org/openqa/selenium/json:json',
135134
'//java/client/src/org/openqa/selenium/remote/session:session',
136135
'//third_party/java/okhttp3:okhttp',
137-
'//third_party/java/opencensus:opencensus-api',
138-
'//third_party/java/opentracing:opentracing-api',
139136
],
140137
deps = [
141138
':http-session-id',
142139
'//java/client/src/org/openqa/selenium:selenium',
143-
'//third_party/java/contrib:opentracing-tracerresolver',
144-
'//third_party/java/opentracing:opentracing-noop',
145140
'//third_party/java/guava:guava',
146141
],
147142
)

‎java/client/src/org/openqa/selenium/remote/tracing/BUCK

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
java_library(
3+
name = "tracing",
4+
srcs = glob(["*.java"]),
5+
exported_deps = [
6+
# Required for the "register" API
7+
"//third_party/java/opencensus:opencensus-api",
8+
"//third_party/java/opentracing:opentracing-api",
9+
],
10+
deps = [
11+
"//java/client/src/org/openqa/selenium/remote:remote",
12+
'//third_party/java/contrib:opentracing-tracerresolver',
13+
"//third_party/java/guava:guava",
14+
"//third_party/java/opentracing:opentracing-noop",
15+
"//third_party/java/opentracing:opentracing-util",
16+
],
17+
visibility = [
18+
"//java/client/test/org/openqa/selenium/remote/tracing:",
19+
"//java/server/src/org/openqa/selenium/grid/...",
20+
"//java/server/test/org/openqa/selenium/grid/...",
21+
],
22+
)

‎java/client/test/org/openqa/selenium/remote/tracing/BUCK

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ java_test(
77
srcs = glob(["*.java"]),
88
deps = [
99
"//java/client/src/org/openqa/selenium/remote:remote",
10+
"//java/client/src/org/openqa/selenium/remote/tracing:tracing",
11+
"//java/client/test/org/openqa/selenium/remote/tracing/simple:simple",
1012
"//java/client/test/org/openqa/selenium/environment:environment",
1113
"//java/client/test/org/openqa/selenium/remote/tracing/simple:simple",
1214
"//third_party/java/assertj:assertj",

‎java/server/src/org/openqa/selenium/grid/commands/BUCK

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ java_library(
1414
'com.google.auto.service.processor.AutoServiceProcessor',
1515
],
1616
deps = [
17+
"//java/client/src/org/openqa/selenium/remote/tracing:tracing",
1718
"//java/server/src/org/openqa/selenium/cli:cli",
1819
"//java/server/src/org/openqa/selenium/grid/config:config",
1920
"//java/server/src/org/openqa/selenium/grid/distributor:distributor",
@@ -31,4 +32,4 @@ java_library(
3132
"//java/server/src/org/openqa/selenium/grid:",
3233
"//java/server/src/org/openqa/selenium/grid:"
3334
],
34-
)
35+
)

‎java/server/src/org/openqa/selenium/grid/commands/Hub.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,16 @@ public Executable configure(String... args) {
8888
new EnvConfig(),
8989
new ConcatenatingConfig("selenium", '.', System.getProperties()));
9090

91-
DistributedTracer tracer = DistributedTracer.getInstance();
91+
DistributedTracer tracer = DistributedTracer.builder()
92+
.registerDetectedTracers()
93+
.build();
94+
DistributedTracer.setInstance(tracer);
9295

9396
SessionMap sessions = new LocalSessionMap();
9497
Distributor distributor = new LocalDistributor(tracer);
9598
Router router = new Router(sessions, distributor);
9699

97100
Server<?> server = new BaseServer<>(
98-
tracer,
99101
new BaseServerOptions(config));
100102
server.addRoute(Routes.matching(router).using(router).decorateWith(W3CCommandHandler.class));
101103
server.start();

‎java/server/src/org/openqa/selenium/grid/commands/Standalone.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ public Executable configure(String... args) {
9494
new EnvConfig(),
9595
new ConcatenatingConfig("selenium", '.', System.getProperties()));
9696

97-
DistributedTracer tracer = DistributedTracer.getInstance();
97+
DistributedTracer tracer = DistributedTracer.builder()
98+
.registerDetectedTracers()
99+
.build();
100+
DistributedTracer.setInstance(tracer);
98101

99102
SessionMap sessions = new LocalSessionMap();
100103
Distributor distributor = new LocalDistributor(tracer);
@@ -122,7 +125,7 @@ public Executable configure(String... args) {
122125

123126
distributor.add(node.build());
124127

125-
Server<?> server = new BaseServer<>(tracer, new BaseServerOptions(config));
128+
Server<?> server = new BaseServer<>(new BaseServerOptions(config));
126129
server.addRoute(Routes.matching(router).using(router).decorateWith(W3CCommandHandler.class));
127130
server.start();
128131
};

‎java/server/src/org/openqa/selenium/grid/distributor/BUCK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ java_library(
77
"//java/server/src/org/openqa/selenium/grid/node:node",
88
],
99
deps = [
10-
"//java/client/src/org/openqa/selenium/remote:remote",
10+
"//java/client/src/org/openqa/selenium/remote/tracing:tracing",
1111
"//java/server/src/org/openqa/selenium/grid/config:config",
1212
"//java/server/src/org/openqa/selenium/grid/node/remote:remote",
1313
"//java/server/src/org/openqa/selenium/grid/server:server",

‎java/server/src/org/openqa/selenium/grid/distributor/httpd/BUCK

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ java_library(
33
name = "httpd",
44
srcs = glob(["*.java"]),
55
deps = [
6+
"//java/client/src/org/openqa/selenium/remote/tracing:tracing",
67
"//java/server/src/org/openqa/selenium/cli:cli",
78
"//java/server/src/org/openqa/selenium/grid/config:config",
89
"//java/server/src/org/openqa/selenium/grid/distributor:distributor",
@@ -25,4 +26,4 @@ java_library(
2526
visibility = [
2627
"//java/server/src/org/openqa/selenium/grid:"
2728
],
28-
)
29+
)

‎java/server/src/org/openqa/selenium/grid/distributor/httpd/DistributorServer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,13 @@ public Executable configure(String... args) {
8787
DistributedTracer tracer = DistributedTracer.builder()
8888
.registerDetectedTracers()
8989
.build();
90+
DistributedTracer.setInstance(tracer);
9091

9192
Distributor distributor = new LocalDistributor(tracer);
9293

9394
BaseServerOptions serverOptions = new BaseServerOptions(config);
9495

95-
Server<?> server = new BaseServer<>(tracer, serverOptions);
96+
Server<?> server = new BaseServer<>(serverOptions);
9697
server.addRoute(
9798
Routes.matching(distributor)
9899
.using(distributor)

‎java/server/src/org/openqa/selenium/grid/distributor/local/BUCK

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ java_library(
66
"//java/server/src/org/openqa/selenium/grid/distributor:distributor",
77
],
88
deps = [
9-
"//java/client/src/org/openqa/selenium/remote:remote",
9+
"//java/client/src/org/openqa/selenium/remote/tracing:tracing",
1010
"//java/server/src/org/openqa/selenium/grid/web:web",
1111
"//java/server/src/org/openqa/selenium/grid/node:node",
1212
"//java/server/src/org/openqa/selenium/grid/node/remote:remote",
@@ -16,4 +16,4 @@ java_library(
1616
"//java/server/src/org/openqa/selenium/grid/...",
1717
"//java/server/test/org/openqa/selenium/grid/...",
1818
]
19-
)
19+
)

‎java/server/src/org/openqa/selenium/grid/distributor/remote/BUCK

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ java_library(
66
"//java/server/src/org/openqa/selenium/grid/distributor:distributor",
77
],
88
deps = [
9-
"//java/client/src/org/openqa/selenium/remote:remote",
9+
"//java/client/src/org/openqa/selenium/remote/tracing:tracing",
1010
"//java/server/src/org/openqa/selenium/grid/web:web",
1111
],
1212
visibility = [
1313
"//java/server/src/org/openqa/selenium/grid/...",
1414
"//java/server/test/org/openqa/selenium/grid/...",
1515
]
16-
)
16+
)

‎java/server/src/org/openqa/selenium/grid/node/BUCK

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ java_library(
88
"//java/server/src/org/openqa/selenium/grid/data:data",
99
],
1010
deps = [
11+
"//java/client/src/org/openqa/selenium/remote/tracing:tracing",
1112
"//java/server/src/org/openqa/selenium/grid/server:server",
1213
"//java/server/src/org/openqa/selenium/grid/sessionmap:sessionmap",
1314
"//java/server/src/org/openqa/selenium/grid/web:web",

‎java/server/src/org/openqa/selenium/grid/node/httpd/BUCK

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ java_library(
1414
'com.google.auto.service.processor.AutoServiceProcessor',
1515
],
1616
deps = [
17+
"//java/client/src/org/openqa/selenium/remote/tracing:tracing",
1718
"//java/server/src/org/openqa/selenium/cli:cli",
1819
"//java/server/src/org/openqa/selenium/concurrent:concurrent",
1920
"//java/server/src/org/openqa/selenium/grid/config:config",

‎java/server/src/org/openqa/selenium/grid/node/httpd/NodeServer.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,18 @@ public Executable configure(String... args) {
101101
new EnvConfig(),
102102
new ConcatenatingConfig("node", '.', System.getProperties()));
103103

104+
DistributedTracer tracer = DistributedTracer.builder()
105+
.registerDetectedTracers()
106+
.build();
107+
DistributedTracer.setInstance(tracer);
108+
104109
SessionMapOptions sessionsOptions = new SessionMapOptions(config);
105110
URL sessionMapUrl = sessionsOptions.getSessionMapUri().toURL();
106111
SessionMap sessions = new RemoteSessionMap(
107112
HttpClient.Factory.createDefault().createClient(sessionMapUrl));
108113

109114
BaseServerOptions serverOptions = new BaseServerOptions(config);
110115

111-
DistributedTracer tracer = DistributedTracer.builder()
112-
.registerDetectedTracers()
113-
.build();
114-
115116
LocalNode.Builder builder = LocalNode.builder(
116117
tracer,
117118
serverOptions.getExternalUri(),
@@ -125,7 +126,7 @@ public Executable configure(String... args) {
125126
tracer,
126127
HttpClient.Factory.createDefault().createClient(distributorUrl));
127128

128-
Server<?> server = new BaseServer<>(tracer, serverOptions);
129+
Server<?> server = new BaseServer<>(serverOptions);
129130
server.addRoute(Routes.matching(node).using(node).decorateWith(W3CCommandHandler.class));
130131
server.start();
131132

‎java/server/src/org/openqa/selenium/grid/node/local/BUCK

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ java_library(
33
name = "local",
44
srcs = glob(["*.java"]),
55
deps = [
6+
"//java/client/src/org/openqa/selenium/remote/tracing:tracing",
67
"//java/server/src/org/openqa/selenium/grid/config:config",
78
"//java/server/src/org/openqa/selenium/grid/node:node",
89
"//java/server/src/org/openqa/selenium/grid/sessionmap:sessionmap",
@@ -14,4 +15,4 @@ java_library(
1415
"//java/server/src/org/openqa/selenium/grid/...",
1516
"//java/server/test/org/openqa/selenium/grid/...",
1617
],
17-
)
18+
)

‎java/server/src/org/openqa/selenium/grid/node/remote/BUCK

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ java_library(
33
name = "remote",
44
srcs = glob(["*.java"]),
55
deps = [
6+
"//java/client/src/org/openqa/selenium/remote/tracing:tracing",
67
"//java/server/src/org/openqa/selenium/grid/data:data",
78
"//java/server/src/org/openqa/selenium/grid/node:node",
89
"//java/server/src/org/openqa/selenium/grid/web:web",
@@ -12,4 +13,4 @@ java_library(
1213
"//java/server/src/org/openqa/selenium/grid/...",
1314
"//java/server/test/org/openqa/selenium/grid/...",
1415
],
15-
)
16+
)

‎java/server/src/org/openqa/selenium/grid/router/httpd/BUCK

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ java_library(
1414
'com.google.auto.service.processor.AutoServiceProcessor',
1515
],
1616
deps = [
17+
"//java/client/src/org/openqa/selenium/remote/tracing:tracing",
1718
"//java/server/src/org/openqa/selenium/cli:cli",
1819
"//java/server/src/org/openqa/selenium/grid/config:config",
1920
"//java/server/src/org/openqa/selenium/grid/distributor:distributor",
@@ -29,4 +30,4 @@ java_library(
2930
visibility = [
3031
"//java/server/src/org/openqa/selenium/grid:"
3132
],
32-
)
33+
)

‎java/server/src/org/openqa/selenium/grid/router/httpd/RouterServer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ public Executable configure(String... args) {
9898
DistributedTracer tracer = DistributedTracer.builder()
9999
.registerDetectedTracers()
100100
.build();
101+
DistributedTracer.setInstance(tracer);
101102

102103
SessionMapOptions sessionsOptions = new SessionMapOptions(config);
103104
URL sessionMapUrl = sessionsOptions.getSessionMapUri().toURL();
@@ -114,7 +115,7 @@ public Executable configure(String... args) {
114115

115116
Router router = new Router(sessions, distributor);
116117

117-
Server<?> server = new BaseServer<>(tracer, serverOptions);
118+
Server<?> server = new BaseServer<>(serverOptions);
118119
server.addRoute(Routes.matching(router).using(router).decorateWith(W3CCommandHandler.class));
119120
server.start();
120121
};

‎java/server/src/org/openqa/selenium/grid/server/BaseServer.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.openqa.selenium.net.NetworkUtils;
3333
import org.openqa.selenium.net.PortProber;
3434
import org.openqa.selenium.remote.http.HttpRequest;
35-
import org.openqa.selenium.remote.tracing.DistributedTracer;
3635
import org.seleniumhq.jetty9.security.ConstraintMapping;
3736
import org.seleniumhq.jetty9.security.ConstraintSecurityHandler;
3837
import org.seleniumhq.jetty9.server.Connector;
@@ -71,10 +70,8 @@ public class BaseServer<T extends BaseServer> implements Server<T> {
7170
private final ServletContextHandler servletContextHandler;
7271
private final Injector injector;
7372
private final URL url;
74-
private final DistributedTracer tracer;
7573

76-
public BaseServer(DistributedTracer tracer, BaseServerOptions options) {
77-
this.tracer = Objects.requireNonNull(tracer);
74+
public BaseServer(BaseServerOptions options) {
7875
int port = options.getPort() == 0 ? PortProber.findFreePort() : options.getPort();
7976

8077
String host = options.getHostname().orElseGet(() -> {
@@ -200,7 +197,7 @@ public T start() {
200197
.decorateWith(W3CCommandHandler.class)
201198
.build();
202199

203-
addServlet(new CommandHandlerServlet(tracer, routes), "/*");
200+
addServlet(new CommandHandlerServlet(routes), "/*");
204201

205202
server.start();
206203

‎java/server/src/org/openqa/selenium/grid/server/CommandHandlerServlet.java

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
import org.openqa.selenium.json.Json;
2727
import org.openqa.selenium.remote.http.HttpRequest;
2828
import org.openqa.selenium.remote.http.HttpResponse;
29-
import org.openqa.selenium.remote.tracing.DistributedTracer;
30-
import org.openqa.selenium.remote.tracing.HttpTracing;
31-
import org.openqa.selenium.remote.tracing.Span;
3229

3330
import java.io.IOException;
3431
import java.util.Objects;
@@ -42,10 +39,8 @@ class CommandHandlerServlet extends HttpServlet {
4239

4340
private final Routes routes;
4441
private final Injector injector;
45-
private final DistributedTracer tracer;
4642

47-
public CommandHandlerServlet(DistributedTracer tracer, Routes routes) {
48-
this.tracer = Objects.requireNonNull(tracer);
43+
public CommandHandlerServlet(Routes routes) {
4944
Objects.requireNonNull(routes);
5045
this.routes = combine(routes)
5146
.fallbackTo(
@@ -62,15 +57,11 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
6257
HttpRequest request = new ServletRequestWrappingHttpRequest(req);
6358
HttpResponse response = new ServletResponseWrappingHttpResponse(resp);
6459

65-
// log(String.format("(%s) %s", request.getMethod(), request.getUri()));
66-
67-
try (Span span = HttpTracing.extract(tracer, "selenium.httpservlet", request)) {
68-
Optional<CommandHandler> possibleMatch = routes.match(injector, request);
69-
if (possibleMatch.isPresent()) {
70-
possibleMatch.get().execute(request, response);
71-
} else {
72-
throw new IllegalStateException("It should not be possible to get here");
73-
}
60+
Optional<CommandHandler> possibleMatch = routes.match(injector, request);
61+
if (possibleMatch.isPresent()) {
62+
possibleMatch.get().execute(request, response);
63+
} else {
64+
throw new IllegalStateException("It should not be possible to get here");
7465
}
7566
}
7667
}

‎java/server/src/org/openqa/selenium/grid/sessionmap/BUCK

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ java_library(
33
name = "sessionmap",
44
srcs = glob(["*.java"]),
55
deps = [
6-
"//java/client/src/org/openqa/selenium/remote:remote",
6+
# "//java/client/src/org/openqa/selenium/remote:remote",
7+
"//java/client/src/org/openqa/selenium/remote/tracing:tracing",
78
"//java/server/src/org/openqa/selenium/grid/config:config",
89
"//java/server/src/org/openqa/selenium/grid/data:data",
910
"//java/server/src/org/openqa/selenium/grid/web:web",
@@ -14,4 +15,4 @@ java_library(
1415
"//java/server/src/org/openqa/selenium/grid/...",
1516
"//java/server/test/org/openqa/selenium/grid/...",
1617
]
17-
)
18+
)

‎java/server/src/org/openqa/selenium/grid/sessionmap/httpd/BUCK

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ java_library(
33
name = "httpd",
44
srcs = glob(["*.java"]),
55
deps = [
6+
"//java/client/src/org/openqa/selenium/remote/tracing:tracing",
67
"//java/server/src/org/openqa/selenium/cli:cli",
78
"//java/server/src/org/openqa/selenium/grid/config:config",
89
"//java/server/src/org/openqa/selenium/grid/server:server",
@@ -25,4 +26,4 @@ java_library(
2526
visibility = [
2627
"//java/server/src/org/openqa/selenium/grid:"
2728
],
28-
)
29+
)

0 commit comments

Comments
 (0)