Catch up with Go labels review

Author: gnurizen

.github/workflows/env/action.yml

@@ -30,6 +30,12 @@ runs:
         sudo apt-get install -y curl unzip gcc-aarch64-linux-gnu \
           libc6-arm64-cross qemu-user-binfmt libc6:arm64 \
           musl-dev:amd64 musl-dev:arm64 musl-tools binutils-aarch64-linux-gnu
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version-file: go.mod
+        cache-dependency-path: go.sum
+      id: go
     - name: Install Rust
       uses: dtolnay/rust-toolchain@stable
       with:

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

@@ -15,13 +15,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/workflows/env
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-          check-latest: true
-          cache-dependency-path: go.sum
-        id: go
       - name: Check for changes in licenses of dependencies
         run: |
           make legal
@@ -41,13 +34,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/workflows/env
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-          check-latest: true
-          cache-dependency-path: go.sum
-        id: go
       - name: Get linter version
         id: linter-version
         run: (echo -n "version="; make linter-version) >> "$GITHUB_OUTPUT"
@@ -75,13 +61,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/workflows/env
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-          check-latest: true
-          cache-dependency-path: go.sum
-        id: go
       - name: Cache coredump modules
         uses: actions/cache@v4
         with:
@@ -128,21 +107,13 @@ jobs:
           fi
 
   build-integration-test-binaries:
-    name: Build integration test binaries (${{ matrix.target_arch }}-${{ matrix.go_version}})
+    name: Build integration test binaries (${{ matrix.target_arch }})
     runs-on: ubuntu-24.04
     timeout-minutes: 10
     strategy:
       matrix:
         target_arch: [amd64, arm64]
-        go_version: [1.23, 1.24]
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ matrix.go_version }}
-          check-latest: true
-          cache-dependency-path: go.sum
-        id: go
       - name: Clone code
         uses: actions/checkout@v4
       - name: Set up environment
@@ -152,17 +123,16 @@ jobs:
       - name: Upload integration test binaries
         uses: actions/upload-artifact@v4
         with:
-          name: integration-test-binaries-${{ matrix.target_arch }}-${{ matrix.go_version}}
+          name: integration-test-binaries-${{ matrix.target_arch }}
           path: support/*.test
 
   integration-tests:
-    name: Integration tests (v${{ matrix.kernel }} ${{ matrix.target_arch }} ${{ matrix.go_version}})
+    name: Integration tests (v${{ matrix.kernel }} ${{ matrix.target_arch }})
     runs-on: ubuntu-24.04
     needs: build-integration-test-binaries
     timeout-minutes: 10
     strategy:
       matrix:
-        go_version: [1.23, 1.24]
         include:
           # List of available kernels here:
           # https://github.com/cilium/ci-kernels/pkgs/container/ci-kernels/versions?filters%5Bversion_type%5D=tagged
@@ -186,13 +156,6 @@ jobs:
     steps:
       - name: Clone code
         uses: actions/checkout@v4
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ matrix.go_version }}
-          check-latest: true
-          cache-dependency-path: go.sum
-        id: go
       - name: Install dependencies
         run: |
           sudo apt-get update -y
@@ -205,7 +168,7 @@ jobs:
           sudo mv ~/go/bin/bluebox /usr/local/bin/.
       - name: Fetch integration test binaries
         uses: actions/download-artifact@v4
-        with: { name: "integration-test-binaries-${{ matrix.target_arch }}-${{ matrix.go_version}}" }
+        with: { name: "integration-test-binaries-${{ matrix.target_arch }}" }
       - name: Fetch precompiled kernel
         run: |
           install -d ci-kernels

Makefile

@@ -117,6 +117,9 @@ vanity-import-fix: $(PORTO)
 test: generate ebpf test-deps
 	go test $(GO_FLAGS) -tags $(GO_TAGS) ./...
 
+sudo-test: integration-test-binaries
+	(cd support && sudo ./go_labels.test -test.v)
+
 TESTDATA_DIRS:= \
 	nativeunwind/elfunwindinfo/testdata \
 	libpf/pfelf/testdata \
@@ -129,9 +132,14 @@ test-deps:
 
 TEST_INTEGRATION_BINARY_DIRS := tracer processmanager/ebpf support go_labels
 
-integration-test-binaries: generate ebpf
-# 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
+# These binaries are named ".test" to get included into bluebox initramfs
+support/go_labels_canary1.23.test: ./go_labels/*.go
+	GOTOOLCHAIN=go1.23.7 go build -tags $(GO_TAGS) -o $@ ./go_labels
+
+support/go_labels_canary1.24.test: ./go_labels/*.go
+	GOTOOLCHAIN=go1.24.1 go build -tags $(GO_TAGS) -o $@ ./go_labels
+
+integration-test-binaries: generate ebpf support/go_labels_canary1.23.test support/go_labels_canary1.24.test
 	$(foreach test_name, $(TEST_INTEGRATION_BINARY_DIRS), \
 		(go test -ldflags='-extldflags=-static' -trimpath -c \
 			-tags $(GO_TAGS),static_build,integration \

go_labels/main.go

@@ -25,7 +25,10 @@ func randomString(n int) string {
 // to work with qemu/bluebox testing harness. A statically linked go test built binary doesn't
 // work with the go labels extractor ebpf program, not sure yet if this is a bug.
 func main() {
-	labels := pprof.Labels("l1", randomString(16), "l2", randomString(16), "l3", randomString(16))
+	labels := pprof.Labels(
+		"l1", "label1"+randomString(16),
+		"l2", "label2"+randomString(24),
+		"l3", "label3"+randomString(48))
 	lastUpdate := time.Now()
 	pprof.Do(context.TODO(), labels, func(context.Context) {
 		//nolint:revive

go_labels/main_test.go

@@ -6,6 +6,7 @@ import (
 	"context"
 	"os"
 	"os/exec"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -18,33 +19,47 @@ func TestGoCustomLabels(t *testing.T) {
 		t.Skip("root privileges required")
 	}
 
-	ctx, cancel := context.WithCancel(context.Background())
-
 	r := &testutils.MockReporter{}
 	enabledTracers, _ := tracertypes.Parse("")
 	enabledTracers.Enable(tracertypes.GoLabels)
-	traceCh, _ := testutils.StartTracer(ctx, t, enabledTracers, r)
-
-	// Use a separate exe for getting labels as the bpf code doesn't seem to work with
-	// go test static binaries at the moment, not clear if that's a problem with the bpf
-	// code or a bug/fact of life for static go binaries and getting g from TLS.
-	cmd := exec.Command("./go_labels_canary.test")
-	err := cmd.Start()
-	require.NoError(t, err)
+	traceCh, _ := testutils.StartTracer(context.Background(), t, enabledTracers, r)
+	for _, tc := range []string{
+		"./go_labels_canary1.23.test",
+		"./go_labels_canary1.24.test",
+	} {
+		t.Run(tc, func(t *testing.T) {
+			// Use a separate exe for getting labels as the bpf code doesn't seem to work with
+			// go test static binaries at the moment, not clear if that's a problem with the bpf
+			// code or a bug/fact of life for static go binaries and getting g from TLS.
+			cmd := exec.Command(tc)
+			err := cmd.Start()
+			require.NoError(t, err)
 
-	// Wait 1 second for traces to arrive.
-	for trace := range traceCh {
-		if trace == nil {
-			continue
-		}
-		if len(trace.CustomLabels) > 0 {
-			for k, v := range trace.CustomLabels {
-				t.Logf("Custom label: %s=%s", k, v)
+			for trace := range traceCh {
+				if trace == nil {
+					continue
+				}
+				if len(trace.CustomLabels) > 0 {
+					for k, v := range trace.CustomLabels {
+						switch k {
+						case "l1":
+							require.Len(t, v, 22)
+							require.True(t, strings.HasPrefix(v, "label1"))
+						case "l2":
+							require.Len(t, v, 30)
+							require.True(t, strings.HasPrefix(v, "label2"))
+						case "l3":
+							require.Len(t, v, 47)
+							require.True(t, strings.HasPrefix(v, "label3"))
+						default:
+							t.Fail()
+						}
+					}
+					break
+				}
 			}
-			break
-		}
+			_ = cmd.Process.Signal(os.Kill)
+			_ = cmd.Wait()
+		})
 	}
-	cancel()
-	_ = cmd.Process.Signal(os.Kill)
-	_ = cmd.Wait()
 }