fix: integration tests telemetry env (#8705)

risingwavelabs · Mar 23, 2023 · 837d43a · 837d43a
1 parent 3e8ce31
commit 837d43a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -28,6 +28,8 @@ services:
       - "./risingwave.toml:/risingwave.toml"
     environment:
       RUST_BACKTRACE: "1"
+      # If ENABLE_TELEMETRY is not set, telemetry will start by default
+      ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
     container_name: compactor-0
     healthcheck:
       test:
@@ -67,6 +69,8 @@ services:
       - "./risingwave.toml:/risingwave.toml"
     environment:
       RUST_BACKTRACE: "1"
+      # If ENABLE_TELEMETRY is not set, telemetry will start by default
+      ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
     container_name: compute-node-0
     healthcheck:
       test:
@@ -146,6 +150,8 @@ services:
       - "./risingwave.toml:/risingwave.toml"
     environment:
       RUST_BACKTRACE: "1"
+      # If ENABLE_TELEMETRY is not set, telemetry will start by default
+      ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
     container_name: frontend-node-0
     healthcheck:
       test:
@@ -216,6 +222,8 @@ services:
       - "./risingwave.toml:/risingwave.toml"
     environment:
       RUST_BACKTRACE: "1"
+      # If ENABLE_TELEMETRY is not set, telemetry will start by default
+      ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
     container_name: meta-node-0
     healthcheck:
       test:
@@ -244,7 +252,17 @@ services:
     depends_on: []
     volumes:
       - "minio-0:/data"
-    entrypoint: "\n/bin/sh -c '\nset -e\nmkdir -p \"/data/hummock001\"\n/usr/bin/docker-entrypoint.sh \"$$0\" \"$$@\"\n'"
+    entrypoint: "
+
+      /bin/sh -c '
+
+      set -e
+
+      mkdir -p \"/data/hummock001\"
+
+      /usr/bin/docker-entrypoint.sh \"$$0\" \"$$@\"
+
+      '"
     environment:
       MINIO_CI_CD: "1"
       MINIO_PROMETHEUS_AUTH_TYPE: public

diff --git a/integration_tests/scripts/run_demos.py b/integration_tests/scripts/run_demos.py
@@ -42,6 +42,7 @@ def run_demo(demo: str, format: str):
         run_sql_file(sql_file, demo_dir)
         sleep(10)
 
+
 def run_iceberg_demo():
     demo = "iceberg-sink"
     file_dir = dirname(abspath(__file__))
@@ -69,7 +70,7 @@ def run_iceberg_demo():
 
     query_sql = open(os.path.join(demo_dir, "iceberg-query.sql")).read()
 
-    print("querying iceberg with presto sql: %s"%query_sql)
+    print("querying iceberg with presto sql: %s" % query_sql)
 
     query_output_file_name = "query_outout.txt"
 
@@ -86,8 +87,6 @@ def run_iceberg_demo():
     assert len(output_content.strip()) > 0
 
 
-
-
 arg_parser = argparse.ArgumentParser(description='Run the demo')
 arg_parser.add_argument('--format',
                         metavar='format',
@@ -100,6 +99,9 @@ def run_iceberg_demo():
                         help='the test case')
 args = arg_parser.parse_args()
 
+# disable telemetry in env
+os.environ['ENABLE_TELEMETRY'] = "false"
+
 if args.case == "iceberg-sink":
     if args.format == "protobuf":
         print("skip protobuf test for iceberg-sink")