diff --git a/continuous_load_testing/Dockerfile b/continuous_load_testing/Dockerfile index 4f8f77c..1010243 100644 --- a/continuous_load_testing/Dockerfile +++ b/continuous_load_testing/Dockerfile @@ -1,5 +1,3 @@ FROM eclipse-temurin COPY build/install/continuous_load_testing /app -# Uncomment the line below to enable CloudPath instead of DirectPath -# ENV GOOGLE_CLOUD_DISABLE_DIRECT_PATH=true CMD /app/bin/continuous_load_testing --methods=EmptyCall --concurrency=1 diff --git a/continuous_load_testing/Dockerfile.cloudpath b/continuous_load_testing/Dockerfile.cloudpath new file mode 100644 index 0000000..b5a60cd --- /dev/null +++ b/continuous_load_testing/Dockerfile.cloudpath @@ -0,0 +1,3 @@ +FROM eclipse-temurin +COPY build/install/continuous_load_testing /app +CMD /app/bin/continuous_load_testing --methods=EmptyCall --concurrency=1 --disable_directpath=true diff --git a/continuous_load_testing/client-java-cloudpath.yaml b/continuous_load_testing/client-java-cloudpath.yaml index 6d7d53e..fe21b1e 100644 --- a/continuous_load_testing/client-java-cloudpath.yaml +++ b/continuous_load_testing/client-java-cloudpath.yaml @@ -30,8 +30,6 @@ spec: fieldPath: metadata.namespace - name: CONTAINER_NAME value: client-java-cloudpath - - name: GOOGLE_CLOUD_DISABLE_DIRECT_PATH - value: "true" - name: OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.name=$(POD_NAME),k8s.namespace.name=$(NAMESPACE_NAME),k8s.container.name=$(CONTAINER_NAME) resources: diff --git a/continuous_load_testing/src/main/java/com/google/net/grpc/testing/directpath/continuous_load_testing/Client.java b/continuous_load_testing/src/main/java/com/google/net/grpc/testing/directpath/continuous_load_testing/Client.java index 7ab9183..9f69ba0 100644 --- a/continuous_load_testing/src/main/java/com/google/net/grpc/testing/directpath/continuous_load_testing/Client.java +++ b/continuous_load_testing/src/main/java/com/google/net/grpc/testing/directpath/continuous_load_testing/Client.java @@ -45,10 +45,12 @@ private enum Method { } private static final Logger logger = Logger.getLogger(Client.class.getName()); - private static final String BACKEND = "google-c2p:///directpathgrpctesting-pa.googleapis.com"; + private static final String DIRECTPATH_BACKEND = "google-c2p:///directpathgrpctesting-pa.googleapis.com"; + private static final String CLOUDPATH_BACKEND = "dns:///directpathgrpctesting-pa.googleapis.com"; private static final Set methods = new HashSet<>(Arrays.asList(Method.values())); private static int concurrency = 1; private static int num_of_requests = 10; + private static boolean disable_directpath = false; private static final Collection METRICS = ImmutableList.of( @@ -79,7 +81,8 @@ public static void main(String[] args) { GrpcOpenTelemetry grpcOpenTelemetry = initializeOpenTelemetry(); ChannelCredentials credentials = GoogleDefaultChannelCredentials.create(); - ManagedChannelBuilder builder = Grpc.newChannelBuilder(BACKEND, credentials); + String backend = disable_directpath ? CLOUDPATH_BACKEND : DIRECTPATH_BACKEND; + ManagedChannelBuilder builder = Grpc.newChannelBuilder(backend, credentials); grpcOpenTelemetry.configureChannelBuilder(builder); TestServiceStub stub = TestServiceGrpc.newStub(builder.build()); @@ -126,10 +129,14 @@ private static void parseArgs(String[] args) { if (arg.startsWith("--num_of_requests=")) { num_of_requests = Integer.parseInt(arg.substring("--num_of_requests=".length())); } + if (arg.startsWith("--disable_directpath=")) { + disable_directpath = Boolean.parseBoolean(arg.substring("--disable_directpath=".length())); + } } logger.info("methods: " + methods); logger.info("concurrency: " + concurrency); logger.info("num_of_requests: " + num_of_requests); + logger.info("disable_directpath:" + disable_directpath); } private static GrpcOpenTelemetry initializeOpenTelemetry() {