Skip to content

Commit eef7cb7

Browse files
committed
Remove the use of fixed ports
1 parent c6049e3 commit eef7cb7

File tree

3 files changed

+12
-28
lines changed

3 files changed

+12
-28
lines changed

javaagent-extensions/gcp-auth/src/test/java/com/google/cloud/opentelemetry/extension/auth/ExtensionIntegrationTest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,21 @@ public void smokeTest() throws IOException, InterruptedException {
4444
throw new RuntimeException(e);
4545
}
4646
backendServer.start();
47+
int backendServerPort = backendServer.getAddress().getPort();
48+
System.out.println("Started OTLP HTTP Endpoint on localhost:" + backendServerPort);
4749
Process p =
4850
new ProcessBuilder(
4951
"java",
5052
"-javaagent:" + javaAgentJarPath,
5153
"-Dotel.javaagent.extensions=" + authExtensionJarPath,
52-
"-Dotel.java.global-autoconfigure.enabled=true",
5354
"-Dgoogle.cloud.project=dummy-test-project",
54-
"-Dotel.exporter.otlp.endpoint=http://localhost:4318",
55+
"-Dotel.java.global-autoconfigure.enabled=true",
56+
"-Dotel.javaagent.logging=none",
57+
"-Dotel.exporter.otlp.endpoint=http://localhost:" + backendServerPort,
5558
"-Dotel.exporter.otlp.insecure=true",
56-
"-Dotel.traces.exporter=otlp,logging",
59+
"-Dotel.traces.exporter=otlp",
5760
"-Dotel.metrics.exporter=none",
61+
"-Dotel.logs.exporter=none",
5862
"-Dotel.javaagent.debug=false",
5963
"-Dotel.exporter.otlp.protocol=http/protobuf",
6064
"-jar",

javaagent-extensions/gcp-auth/src/test/java/com/google/cloud/opentelemetry/extension/auth/testapp/InstrumentedTestApp.java

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@
2828

2929
public class InstrumentedTestApp {
3030
private static final String serverUrl = "http://localhost:%d/%s";
31-
private static final int defaultPort = 8080;
3231

3332
public static void main(String[] args) throws IOException, InterruptedException {
34-
int port = parsePort(args);
35-
36-
HttpServer server = HttpServer.create(new InetSocketAddress(port), 0);
33+
int port;
34+
HttpServer server = HttpServer.create(new InetSocketAddress(0), 0);
35+
port = server.getAddress().getPort();
3736
server.createContext("/doWork", new TestHandler());
3837
server.createContext(
3938
"/stop",
@@ -48,7 +47,7 @@ public static void main(String[] args) throws IOException, InterruptedException
4847
});
4948
server.setExecutor(null); // creates a default executor
5049
server.start();
51-
System.out.println("Server ready");
50+
System.out.println("Starting Server at port " + port);
5251
System.out.println("Sending request to do work ...");
5352
makeCall(String.format(serverUrl, port, "doWork"));
5453
Thread.sleep(1000);
@@ -72,21 +71,4 @@ private static void makeCall(String url) {
7271
System.err.println("Error making request: " + e.getMessage());
7372
}
7473
}
75-
76-
private static int parsePort(String[] args) {
77-
int port;
78-
if (args.length > 0) {
79-
try {
80-
port = Integer.parseInt(args[0]);
81-
if (port < 0 || port > 65535) {
82-
throw new NumberFormatException("Port number must be between 0 and 65535");
83-
}
84-
return port;
85-
} catch (NumberFormatException e) {
86-
System.err.println("Invalid port number provided: " + args[0]);
87-
System.err.println("Using default port: " + defaultPort);
88-
}
89-
}
90-
return defaultPort;
91-
}
9274
}

javaagent-extensions/gcp-auth/src/test/java/com/google/cloud/opentelemetry/extension/auth/testbackend/DummyOTelHttpEndpoint.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ public class DummyOTelHttpEndpoint {
3232
public static Map<String, Boolean> receivedRequests = new HashMap<>();
3333

3434
public static HttpServer createTestServer() throws IOException {
35-
int port = 4318; // Use a different port than gRPC (e.g., 4318)
36-
37-
HttpServer server = HttpServer.create(new InetSocketAddress(port), 0);
35+
HttpServer server = HttpServer.create(new InetSocketAddress(0), 0);
3836
server.createContext("/v1/traces", new TraceHandler()); // Handle traces
3937
server.setExecutor(null); // Use default thread pool
4038
return server;

0 commit comments

Comments
 (0)