Make prometheus default and can be override by annotation.

config/constants.go

@@ -66,9 +66,9 @@ const (
 	// DriverPortEnv specifies the name of the env variable that contains driver port.
 	DriverPortEnv = "DRIVER_PORT"
 
-	// EnablePrometheusEnv specifies the name of the env variable that indicates if the
-	// Prometheus data is collected.
-	EnablePrometheusEnv = "ENABLE_PROMETHEUS"
+	// DisablePrometheusEnv specifies the name of the env variable that indicates
+	// if the collection of Prometheus data is disabled.
+	DisablePrometheusEnv = "DISABLE_PROMETHEUS"
 
 	// PoolLabel is the key for a label which will have the name of a pool as
 	// the value.

config/samples/templates/psm/cxx_example_loadtest_proxied.yaml

@@ -42,14 +42,14 @@ spec:
       - containers/runtime/xds-server/bootstrap.json
       command:
       - main
-      image: ${psm_image_prefix}/xds-server:${psm_image_tag}
+      image: gcr.io/grpc-testing/e2etest/runtime/xds-server:v1.3.0
       livenessProbe:
         initialDelaySeconds: 30
         periodSeconds: 5
         tcpSocket:
           port: 10000
       name: xds-server
-    - image: ${psm_image_prefix}/sidecar:${psm_image_tag}
+    - image: gcr.io/grpc-testing/e2etest/runtime/sidecar:v1.3.0
       livenessProbe:
         initialDelaySeconds: 30
         periodSeconds: 5
@@ -59,7 +59,14 @@ spec:
   driver:
     language: cxx
     name: '0'
-    run: []
+    run: 
+    - args:
+      - -c
+      - |
+        sleep 2h
+      command:
+      - bash
+      name: main
   scenariosJSON: |
     {
       "scenarios": {

containers/runtime/driver/Dockerfile

@@ -63,6 +63,7 @@ RUN apt-get update && apt-get install -y \
   pkg-config \
   gnupg \
   apt-transport-https \
+  dnsutils \
   ca-certificates
 
 RUN apt-get update && apt-get install -y \

containers/runtime/driver/run.sh

@@ -35,7 +35,7 @@ if [ -n "${BQ_RESULT_TABLE}" ]; then
   fi
   if [ -r "${NODE_INFO_OUTPUT_FILE}" ]; then
     cp "${NODE_INFO_OUTPUT_FILE}" node_info.json
-    if [ -n "${SERVER_TARGET_OVERRIDE}" ] || [ -n "${ENABLE_PROMETHEUS}" ]; then
+    if  [ "$(dig +short -t srv prometheus.test-infra-system.svc.cluster.local)" ] && [ -z "${DISABLE_PROMETHEUS}" ]; then
       python3 /src/code/tools/run_tests/performance/prometheus.py \
         --url=http://prometheus.test-infra-system.svc.cluster.local:9090 \
         --pod_type=clients --container_name=main \

podbuilder/podbuilder.go

@@ -241,11 +241,11 @@ func (pb *PodBuilder) PodForDriver(driver *grpcv1.Driver) (*corev1.Pod, error) {
 		}
 	}
 
-	usePrometheus, ok := pb.test.Annotations["enablePrometheus"]
+	usePrometheus, ok := pb.test.Annotations["disablePrometheus"]
 	if ok && strings.ToLower(usePrometheus) == "true" {
 		runContainer.Env = append(runContainer.Env,
 			corev1.EnvVar{
-				Name:  config.EnablePrometheusEnv,
+				Name:  config.DisablePrometheusEnv,
 				Value: "true"})
 	}