Make native custom labels test run in CI

Author: gnurizen

.github/workflows/unit-test-on-pull-request.yml

@@ -154,6 +154,8 @@ jobs:
         uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/workflows/env
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
       - name: Prepare integration test binaries for qemu tests
         run: make integration-test-binaries TARGET_ARCH=${{ matrix.target_arch }}
       - name: Upload integration test binaries

Cargo.lock

@@ -6,6 +6,7 @@
 members = [
     "rust-crates/symblib",
     "rust-crates/symblib-capi",
+    "rust-crates/custom-labels-example"
 ]
 resolver = "2"
 

Cargo.toml

@@ -111,9 +111,11 @@ test-deps:
 		($(MAKE) -C "$(testdata_dir)") || exit ; \
 	)
 
-TEST_INTEGRATION_BINARY_DIRS := tracer processmanager/ebpf support go_labels
+TEST_INTEGRATION_BINARY_DIRS := tracer processmanager/ebpf support go_labels customlabelstest
 
 integration-test-binaries: generate ebpf
+	cargo build --release --bin custom-labels-example
+	ln -sf ../target/release/custom-labels-example ./support/custom-labels-example.test
 # Call it a ".test" even though it isn't to get included into bluebox initramfs
 	go build -o ./support/go_labels_canary.test ./go_labels
 	$(foreach test_name, $(TEST_INTEGRATION_BINARY_DIRS), \

Makefile

@@ -23,18 +23,10 @@ func TestNativeCustomLabels(t *testing.T) {
 	defer cancel()
 
 	traceCh, _ := testutils.StartTracer(ctx, t, enabledTracers, r)
-	// TODO - change this to `cargo build --release --bin custom-labels-example`
-	// once we have the Rust workspace from upstream.
-	cmd := exec.Command("cargo", "build", "--release",
-		"--manifest-path", "./rust-crates/custom-labels-example/Cargo.toml")
-	out, err := cmd.CombinedOutput()
-	require.NoError(t, err, string(out))
-
 	errCh := make(chan error, 1)
 
-	cmd = exec.CommandContext(ctx,
-		"./rust-crates/custom-labels-example/target/release/custom-labels-example")
-	err = cmd.Start()
+	cmd := exec.CommandContext(ctx, "./custom-labels-example.test")
+	err := cmd.Start()
 	require.NoError(t, err)
 
 	go func() {
@@ -53,6 +45,9 @@ Loop:
 			if !ok {
 				break Loop
 			}
+			if trace == nil {
+				continue
+			}
 			t.Logf("got a trace %s", trace.Comm)
 			if len(trace.CustomLabels) > 0 {
 				var gotL1, gotL2 bool