Clean up

Author: jy-tan

.github/workflows/e2e.yml

@@ -13,9 +13,6 @@ on:
       - ".github/workflows/e2e.yml"
   workflow_dispatch: {}
 
-env:
-  TUSK_CLI_UNDER_TEST_REF: socket-location
-
 jobs:
   discover:
     name: Discover Tests
@@ -45,45 +42,9 @@ jobs:
           echo "e2e_matrix=$E2E_TESTS" >> $GITHUB_OUTPUT
           echo "stack_matrix=$STACK_TESTS" >> $GITHUB_OUTPUT
 
-  build-cli-under-test:
-    name: Build Tusk CLI Under Test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Tusk CLI under test
-        uses: actions/checkout@v6
-        with:
-          repository: Use-Tusk/tusk-drift-cli
-          ref: ${{ env.TUSK_CLI_UNDER_TEST_REF }}
-          path: tusk-drift-cli-src
-          fetch-depth: 1
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: tusk-drift-cli-src/go.mod
-          cache-dependency-path: tusk-drift-cli-src/go.sum
-
-      - name: Build Tusk CLI under test
-        working-directory: tusk-drift-cli-src
-        env:
-          CGO_ENABLED: "0"
-          GOOS: linux
-          GOARCH: amd64
-        run: |
-          mkdir -p "$RUNNER_TEMP/tusk-cli-under-test"
-          go build -trimpath -o "$RUNNER_TEMP/tusk-cli-under-test/tusk" .
-
-      - name: Upload Tusk CLI under test
-        uses: actions/upload-artifact@v4
-        with:
-          name: tusk-cli-under-test-linux-amd64
-          path: ${{ runner.temp }}/tusk-cli-under-test/tusk
-          if-no-files-found: error
-          retention-days: 1
-
   e2e:
     name: E2E - ${{ matrix.library }}
-    needs: [discover, build-cli-under-test]
+    needs: discover
     runs-on: ubuntu-latest
     timeout-minutes: 30
     strategy:
@@ -108,15 +69,6 @@ jobs:
         with:
           driver: docker
 
-      - name: Download Tusk CLI under test
-        uses: actions/download-artifact@v4
-        with:
-          name: tusk-cli-under-test-linux-amd64
-          path: ./.tmp/tusk-cli-under-test
-
-      - name: Make Tusk CLI under test executable
-        run: chmod +x ./.tmp/tusk-cli-under-test/tusk
-
       - name: Install SDK dependencies
         run: uv sync --all-extras
 
@@ -149,9 +101,7 @@ jobs:
 
       - name: Run E2E tests for ${{ matrix.library }}
         env:
-          COMPOSE_FILE: docker-compose.yml:${{ github.workspace }}/drift/instrumentation/e2e_common/docker-compose.cli-override.yml
           DOCKER_DEFAULT_PLATFORM: linux/amd64
-          TUSK_CLI_BIND_PATH: ${{ github.workspace }}/.tmp/tusk-cli-under-test/tusk
           TUSK_CLI_VERSION: ${{ steps.tusk-version.outputs.version }}
           TUSK_USE_RUST_CORE: "1"
         run: |
@@ -189,6 +139,7 @@ jobs:
           name: e2e-${{ matrix.library }}-replay-logs
           path: ./drift/instrumentation/${{ matrix.library }}/e2e-tests/.tusk/logs
           if-no-files-found: ignore
+          include-hidden-files: true
 
       - name: Cleanup Docker resources
         if: always()
@@ -203,7 +154,7 @@ jobs:
 
   stack:
     name: Stack - ${{ matrix.test }}
-    needs: [discover, build-cli-under-test]
+    needs: discover
     if: ${{ needs.discover.outputs.stack_matrix != '[]' && needs.discover.outputs.stack_matrix != '' }}
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -229,15 +180,6 @@ jobs:
         with:
           driver: docker
 
-      - name: Download Tusk CLI under test
-        uses: actions/download-artifact@v4
-        with:
-          name: tusk-cli-under-test-linux-amd64
-          path: ./.tmp/tusk-cli-under-test
-
-      - name: Make Tusk CLI under test executable
-        run: chmod +x ./.tmp/tusk-cli-under-test/tusk
-
       - name: Install SDK dependencies
         run: uv sync --all-extras
 
@@ -270,9 +212,7 @@ jobs:
 
       - name: Run stack tests for ${{ matrix.test }}
         env:
-          COMPOSE_FILE: docker-compose.yml:${{ github.workspace }}/drift/instrumentation/e2e_common/docker-compose.cli-override.yml
           DOCKER_DEFAULT_PLATFORM: linux/amd64
-          TUSK_CLI_BIND_PATH: ${{ github.workspace }}/.tmp/tusk-cli-under-test/tusk
           TUSK_CLI_VERSION: ${{ steps.tusk-version.outputs.version }}
           TUSK_USE_RUST_CORE: "1"
         run: |
@@ -310,6 +250,7 @@ jobs:
           name: stack-${{ matrix.test }}-replay-logs
           path: ./drift/stack-tests/${{ matrix.test }}/.tusk/logs
           if-no-files-found: ignore
+          include-hidden-files: true
 
       - name: Cleanup Docker resources
         if: always()
@@ -324,7 +265,6 @@ jobs:
 
   non-rust-smoke:
     name: E2E Non-Rust Smoke - requests
-    needs: build-cli-under-test
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -344,15 +284,6 @@ jobs:
         with:
           driver: docker
 
-      - name: Download Tusk CLI under test
-        uses: actions/download-artifact@v4
-        with:
-          name: tusk-cli-under-test-linux-amd64
-          path: ./.tmp/tusk-cli-under-test
-
-      - name: Make Tusk CLI under test executable
-        run: chmod +x ./.tmp/tusk-cli-under-test/tusk
-
       - name: Install SDK dependencies
         run: uv sync --all-extras
 
@@ -385,9 +316,7 @@ jobs:
 
       - name: Run non-rust smoke test
         env:
-          COMPOSE_FILE: docker-compose.yml:${{ github.workspace }}/drift/instrumentation/e2e_common/docker-compose.cli-override.yml
           DOCKER_DEFAULT_PLATFORM: linux/amd64
-          TUSK_CLI_BIND_PATH: ${{ github.workspace }}/.tmp/tusk-cli-under-test/tusk
           TUSK_CLI_VERSION: ${{ steps.tusk-version.outputs.version }}
           TUSK_USE_RUST_CORE: "0"
         run: |
@@ -425,6 +354,7 @@ jobs:
           name: requests-smoke-replay-logs
           path: ./drift/instrumentation/requests/e2e-tests/.tusk/logs
           if-no-files-found: ignore
+          include-hidden-files: true
 
       - name: Cleanup Docker resources
         if: always()

drift/instrumentation/e2e_common/docker-compose.cli-override.yml

@@ -1,7 +1,5 @@
 """gRPC server for e2e tests."""
 
-import os
-import stat
 import time
 from concurrent import futures
 
@@ -11,114 +9,6 @@
 import grpc
 
 
-def _log_selected_env():
-    """Print relevant environment variables for sandbox debugging."""
-    interesting_prefixes = ("TUSK_", "PYTHON", "LD_")
-    interesting = {
-        key: value
-        for key, value in os.environ.items()
-        if key.startswith(interesting_prefixes)
-    }
-    if not interesting:
-        print("[grpc probe] interesting env: <none>", flush=True)
-        return
-
-    for key in sorted(interesting):
-        print(f"[grpc probe] env {key}={interesting[key]}", flush=True)
-
-
-def _log_mountinfo(prefix: str):
-    """Print mountinfo entries rooted at a given mount prefix."""
-    try:
-        with open("/proc/self/mountinfo", encoding="utf-8") as handle:
-            found = False
-            for raw_line in handle:
-                line = raw_line.rstrip("\n")
-                left, separator, _right = line.partition(" - ")
-                if not separator:
-                    continue
-                fields = left.split()
-                if len(fields) < 5:
-                    continue
-                mount_point = fields[4]
-                if mount_point == prefix or mount_point.startswith(f"{prefix}/"):
-                    print(f"[grpc probe] mountinfo {mount_point}: {line}", flush=True)
-                    found = True
-            if not found:
-                print(f"[grpc probe] mountinfo: no entries found for {prefix}", flush=True)
-    except OSError as exc:
-        print(
-            f"[grpc probe] read(/proc/self/mountinfo) failed: errno={exc.errno} strerror={exc.strerror}",
-            flush=True,
-        )
-
-
-def _log_device_probe(path: str):
-    """Print detailed device diagnostics for sandbox debugging."""
-    try:
-        info = os.stat(path)
-        device_kind = "char" if stat.S_ISCHR(info.st_mode) else "other"
-        device_id = "-"
-        if stat.S_ISCHR(info.st_mode):
-            device_id = f"{os.major(info.st_rdev)}:{os.minor(info.st_rdev)}"
-        print(
-            f"[grpc probe] {path}: mode={oct(stat.S_IMODE(info.st_mode))} "
-            f"kind={device_kind} rdev={device_id} "
-            f"readable={os.access(path, os.R_OK)} writable={os.access(path, os.W_OK)}",
-            flush=True,
-        )
-    except OSError as exc:
-        print(
-            f"[grpc probe] stat({path}) failed: errno={exc.errno} strerror={exc.strerror}",
-            flush=True,
-        )
-        return
-
-    try:
-        fd = os.open(path, os.O_RDONLY)
-        try:
-            data = os.read(fd, 1)
-            print(f"[grpc probe] read({path}) ok: bytes={len(data)}", flush=True)
-        finally:
-            os.close(fd)
-    except OSError as exc:
-        print(
-            f"[grpc probe] open/read({path}) failed: errno={exc.errno} strerror={exc.strerror}",
-            flush=True,
-        )
-
-
-def _log_startup_probe():
-    """Emit diagnostics to pinpoint sandbox/device failures in CI."""
-    print(
-        f"[grpc probe] pid={os.getpid()} uid={os.getuid()} euid={os.geteuid()} cwd={os.getcwd()}",
-        flush=True,
-    )
-    _log_selected_env()
-    _log_mountinfo("/dev")
-    try:
-        dev_entries = ", ".join(sorted(os.listdir("/dev")))
-        print(f"[grpc probe] /dev entries: {dev_entries}", flush=True)
-    except OSError as exc:
-        print(
-            f"[grpc probe] listdir(/dev) failed: errno={exc.errno} strerror={exc.strerror}",
-            flush=True,
-        )
-
-    for device_path in ("/dev/urandom", "/dev/random", "/dev/null"):
-        _log_device_probe(device_path)
-
-    if hasattr(os, "getrandom"):
-        try:
-            sample = os.getrandom(1)
-            print(f"[grpc probe] getrandom() ok: bytes={len(sample)}", flush=True)
-        except OSError as exc:
-            print(
-                f"[grpc probe] getrandom() failed: errno={exc.errno} strerror={exc.strerror}",
-                flush=True,
-            )
-
-
 class GreeterServicer(greeter_pb2_grpc.GreeterServicer):
     """Implementation of the Greeter service."""
 
@@ -171,19 +61,11 @@ def Chat(self, request_iterator, context):
 
 def serve(port: int = 50051):
     """Start the gRPC server."""
-    print("[grpc probe] before startup probe", flush=True)
-    _log_startup_probe()
-    print("[grpc probe] before grpc.server()", flush=True)
     server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))
-    print("[grpc probe] after grpc.server()", flush=True)
     greeter_pb2_grpc.add_GreeterServicer_to_server(GreeterServicer(), server)
-    print("[grpc probe] after add_GreeterServicer_to_server()", flush=True)
-    bound_port = server.add_insecure_port(f"[::]:{port}")
-    print(f"[grpc probe] add_insecure_port returned {bound_port}", flush=True)
-    print("[grpc probe] before server.start()", flush=True)
+    server.add_insecure_port(f"[::]:{port}")
     server.start()
-    print("[grpc probe] after server.start()", flush=True)
-    print(f"gRPC server started on port {port}", flush=True)
+    print(f"gRPC server started on port {port}")
     return server