Skip to content

Commit f79ed96

Browse files
authored
continuous-load-testing: Fix Issues with CloudPath Enablement (#207)
* Add cloudpath selection to the java client. * Clean code. * Clean code. * Update the deploy file. * Fix CloudPath Enablement. * Use FLAG instead of ENV to enable cloudpath. * Fix the string name.
1 parent de884ae commit f79ed96

4 files changed

Lines changed: 12 additions & 6 deletions

File tree

continuous_load_testing/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
FROM eclipse-temurin
22
COPY build/install/continuous_load_testing /app
3-
# Uncomment the line below to enable CloudPath instead of DirectPath
4-
# ENV GOOGLE_CLOUD_DISABLE_DIRECT_PATH=true
53
CMD /app/bin/continuous_load_testing --methods=EmptyCall --concurrency=1
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM eclipse-temurin
2+
COPY build/install/continuous_load_testing /app
3+
CMD /app/bin/continuous_load_testing --methods=EmptyCall --concurrency=1 --disable_directpath=true

continuous_load_testing/client-java-cloudpath.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ spec:
3030
fieldPath: metadata.namespace
3131
- name: CONTAINER_NAME
3232
value: client-java-cloudpath
33-
- name: GOOGLE_CLOUD_DISABLE_DIRECT_PATH
34-
value: "true"
3533
- name: OTEL_RESOURCE_ATTRIBUTES
3634
value: k8s.pod.name=$(POD_NAME),k8s.namespace.name=$(NAMESPACE_NAME),k8s.container.name=$(CONTAINER_NAME)
3735
resources:

continuous_load_testing/src/main/java/com/google/net/grpc/testing/directpath/continuous_load_testing/Client.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,12 @@ private enum Method {
4545
}
4646

4747
private static final Logger logger = Logger.getLogger(Client.class.getName());
48-
private static final String BACKEND = "google-c2p:///directpathgrpctesting-pa.googleapis.com";
48+
private static final String DIRECTPATH_BACKEND = "google-c2p:///directpathgrpctesting-pa.googleapis.com";
49+
private static final String CLOUDPATH_BACKEND = "dns:///directpathgrpctesting-pa.googleapis.com";
4950
private static final Set<Method> methods = new HashSet<>(Arrays.asList(Method.values()));
5051
private static int concurrency = 1;
5152
private static int num_of_requests = 10;
53+
private static boolean disable_directpath = false;
5254

5355
private static final Collection<String> METRICS =
5456
ImmutableList.of(
@@ -79,7 +81,8 @@ public static void main(String[] args) {
7981
GrpcOpenTelemetry grpcOpenTelemetry = initializeOpenTelemetry();
8082

8183
ChannelCredentials credentials = GoogleDefaultChannelCredentials.create();
82-
ManagedChannelBuilder<?> builder = Grpc.newChannelBuilder(BACKEND, credentials);
84+
String backend = disable_directpath ? CLOUDPATH_BACKEND : DIRECTPATH_BACKEND;
85+
ManagedChannelBuilder<?> builder = Grpc.newChannelBuilder(backend, credentials);
8386
grpcOpenTelemetry.configureChannelBuilder(builder);
8487
TestServiceStub stub = TestServiceGrpc.newStub(builder.build());
8588

@@ -126,10 +129,14 @@ private static void parseArgs(String[] args) {
126129
if (arg.startsWith("--num_of_requests=")) {
127130
num_of_requests = Integer.parseInt(arg.substring("--num_of_requests=".length()));
128131
}
132+
if (arg.startsWith("--disable_directpath=")) {
133+
disable_directpath = Boolean.parseBoolean(arg.substring("--disable_directpath=".length()));
134+
}
129135
}
130136
logger.info("methods: " + methods);
131137
logger.info("concurrency: " + concurrency);
132138
logger.info("num_of_requests: " + num_of_requests);
139+
logger.info("disable_directpath:" + disable_directpath);
133140
}
134141

135142
private static GrpcOpenTelemetry initializeOpenTelemetry() {

0 commit comments

Comments
 (0)