Fix Node custom labels for v26 nightly; add test for nightly

interpreter/customlabels/integrationtests/node_test.go

@@ -13,6 +13,7 @@ package customlabels_test
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -29,6 +30,7 @@ import (
 
 	"time"
 
+	"github.com/docker/go-connections/nat"
 	"github.com/stretchr/testify/require"
 	testcontainers "github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
@@ -50,6 +52,113 @@ var files = []string{
 	"broken.md",
 }
 
+func runTest(t *testing.T, ctx context.Context, host string, port nat.Port) {
+	enabledTracers, err := tracertypes.Parse("labels,v8")
+	require.NoError(t, err)
+
+	r := &testutils.MockReporter{}
+	traceCh, trc := testutils.StartTracer(ctx, t, enabledTracers, r, false)
+
+	testHTTPEndpoint(ctx, t, host, port)
+	framesPerWorkerId := make(map[int]int)
+	framesPerFileName := make(map[string]int)
+
+	totalWorkloadFrames := 0
+	unlabeledWorkloadFrames := 0
+
+	timer := time.NewTimer(3 * time.Second)
+	defer timer.Stop()
+
+	for {
+		select {
+		case <-timer.C:
+			goto done
+		case trace := <-traceCh:
+			if trace == nil {
+				continue
+			}
+			ct, err := trc.TraceProcessor().ConvertTrace(trace)
+			require.NotNil(t, ct)
+			require.NoError(t, err)
+			workerId, okWid := trace.CustomLabels["workerId"]
+			filePath, okFname := trace.CustomLabels["filePath"]
+			var fileName string
+			if okFname {
+				fileName = path.Base(filePath)
+			}
+			knownWorkloadFrames := []string{
+				"lex",
+				"parse",
+				"blockTokens",
+				"readFile",
+				"readFileHandle",
+			}
+			hasWorkloadFrame := false
+
+			for i := range ct.Frames {
+				if ct.Frames[i].Value().Type == libpf.V8Frame {
+					name := ct.Frames[i].Value().FunctionName.String()
+					if slices.Contains(knownWorkloadFrames, name) {
+						hasWorkloadFrame = true
+					}
+				}
+			}
+
+			if hasWorkloadFrame {
+				totalWorkloadFrames++
+				if !(okWid && okFname) {
+					unlabeledWorkloadFrames++
+				}
+			}
+
+			if okWid {
+				val, err := strconv.Atoi(workerId)
+				require.NoError(t, err)
+
+				require.GreaterOrEqual(t, val, 0)
+				require.Less(t, val, N_WORKERS)
+
+				framesPerWorkerId[val]++
+			}
+
+			if okFname {
+				require.Contains(t, files, fileName)
+				framesPerFileName[fileName]++
+			}
+		}
+	}
+done:
+	totalWidFrames := 0
+	// for 8 workers, each should have roughly 1/8
+	// of the labeled frames. There will be a bit of skew,
+	// so accept anything above 60% of that.
+	for i := 0; i < N_WORKERS; i++ {
+		totalWidFrames += framesPerWorkerId[i]
+	}
+	expectedWorkerAvg := float64(totalWidFrames) / float64(N_WORKERS)
+	for i := 0; i < N_WORKERS; i++ {
+		require.Less(t, expectedWorkerAvg*0.60, float64(framesPerWorkerId[i]))
+	}
+	// Each of the documents should account for some nontrivial amount of time,
+	// but since they aren't all the same length, we are less strict.
+	totalFnameFrames := 0
+	for _, v := range framesPerFileName {
+		totalFnameFrames += v
+	}
+	expectedFnameAvg := float64(totalFnameFrames) / float64(len(framesPerFileName))
+	for _, v := range framesPerFileName {
+		require.Less(t, expectedFnameAvg*0.2, float64(v))
+	}
+
+	// Really, there should be zero frames in the
+	// `marked` workload that aren't under labels,
+	// but accept a 5% slop because the unwinder
+	// isn't perfect (e.g. it might interrupt the
+	// process when the Node environment is in an
+	// undefined state)
+	require.Less(t, 20*unlabeledWorkloadFrames, totalWorkloadFrames)
+}
+
 func TestIntegration(t *testing.T) {
 	if !testutils.IsRoot() {
 		t.Skip("root privileges required")
@@ -74,112 +183,67 @@ func TestIntegration(t *testing.T) {
 
 			cont := startContainer(ctx, t, nodeVersion)
 
-			enabledTracers, err := tracertypes.Parse("labels,v8")
+			host, err := cont.Host(ctx)
+			require.NoError(t, err)
+			port, err := cont.MappedPort(ctx, "80")
 			require.NoError(t, err)
 
-			r := &testutils.MockReporter{}
-			traceCh, trc := testutils.StartTracer(ctx, t, enabledTracers, r, false)
-
-			testHTTPEndpoint(ctx, t, cont)
-			framesPerWorkerId := make(map[int]int)
-			framesPerFileName := make(map[string]int)
-
-			totalWorkloadFrames := 0
-			unlabeledWorkloadFrames := 0
-
-			timer := time.NewTimer(3 * time.Second)
-			defer timer.Stop()
-
-			for {
-				select {
-				case <-timer.C:
-					goto done
-				case trace := <-traceCh:
-					if trace == nil {
-						continue
-					}
-					ct, err := trc.TraceProcessor().ConvertTrace(trace)
-					require.NotNil(t, ct)
-					require.NoError(t, err)
-					workerId, okWid := trace.CustomLabels["workerId"]
-					filePath, okFname := trace.CustomLabels["filePath"]
-					var fileName string
-					if okFname {
-						fileName = path.Base(filePath)
-					}
-					knownWorkloadFrames := []string{
-						"lex",
-						"parse",
-						"blockTokens",
-						"readFile",
-						"readFileHandle",
-					}
-					hasWorkloadFrame := false
-
-					for i := range ct.Frames {
-						if ct.Frames[i].Value().Type == libpf.V8Frame {
-							name := ct.Frames[i].Value().FunctionName.String()
-							if slices.Contains(knownWorkloadFrames, name) {
-								hasWorkloadFrame = true
-							}
-						}
-					}
+			runTest(t, ctx, host, port)
+		})
+	}
+	t.Run("node-local-nightly", func(t *testing.T) {
+		type NodejsNightly struct {
+			Version string   `json:"version"`
+			Files   []string `json:"files"`
+		}
+
+		resp, err := http.Get("https://nodejs.org/download/nightly/index.json")
+		require.NoError(t, err)
+		defer resp.Body.Close()
+
+		var nightlies []NodejsNightly
+		err = json.NewDecoder(resp.Body).Decode(&nightlies)
+		require.NoError(t, err)
+		require.NotEmpty(t, nightlies)
+
+		latest := nightlies[0]
+
+		var nodeArch string
+		switch runtime.GOARCH {
+		case "arm64":
+			nodeArch = "linux-arm64"
+		case "amd64":
+			nodeArch = "linux-x64"
+		default:
+			t.Fatalf("Unsupported GOARCH: %s", runtime.GOARCH)
+		}
+
+		tarballName := fmt.Sprintf("node-%s-%s", latest.Version, nodeArch)
+
+		var tarballURL string
+		for _, file := range latest.Files {
+			if file == nodeArch {
+				tarballURL = fmt.Sprintf("https://nodejs.org/download/nightly/%s/%s.tar.gz", latest.Version, tarballName)
+				break
+			}
+		}
+		require.NotEmpty(t, tarballURL, "No tarball found for latest nightly")
 
-					if hasWorkloadFrame {
-						totalWorkloadFrames++
-						if !(okWid && okFname) {
-							unlabeledWorkloadFrames++
-						}
-					}
+		ctx, cancel := context.WithCancel(t.Context())
+		t.Cleanup(cancel)
 
-					if okWid {
-						val, err := strconv.Atoi(workerId)
-						require.NoError(t, err)
+		defer cancel()
 
-						require.GreaterOrEqual(t, val, 0)
-						require.Less(t, val, N_WORKERS)
+		cont := startNightlyContainer(ctx, t, tarballURL)
 
-						framesPerWorkerId[val]++
-					}
+		host, err := cont.Host(ctx)
+		require.NoError(t, err)
+		port, err := cont.MappedPort(ctx, "80")
+		require.NoError(t, err)
 
-					if okFname {
-						require.Contains(t, files, fileName)
-						framesPerFileName[fileName]++
-					}
-				}
-			}
-		done:
-			totalWidFrames := 0
-			// for 8 workers, each should have roughly 1/8
-			// of the labeled frames. There will be a bit of skew,
-			// so accept anything above 60% of that.
-			for i := 0; i < N_WORKERS; i++ {
-				totalWidFrames += framesPerWorkerId[i]
-			}
-			expectedWorkerAvg := float64(totalWidFrames) / float64(N_WORKERS)
-			for i := 0; i < N_WORKERS; i++ {
-				require.Less(t, expectedWorkerAvg*0.60, float64(framesPerWorkerId[i]))
-			}
-			// Each of the documents should account for some nontrivial amount of time,
-			// but since they aren't all the same length, we are less strict.
-			totalFnameFrames := 0
-			for _, v := range framesPerFileName {
-				totalFnameFrames += v
-			}
-			expectedFnameAvg := float64(totalFnameFrames) / float64(len(framesPerFileName))
-			for _, v := range framesPerFileName {
-				require.Less(t, expectedFnameAvg*0.2, float64(v))
-			}
+		runTest(t, ctx, host, port)
 
-			// Really, there should be zero frames in the
-			// `marked` workload that aren't under labels,
-			// but accept a 5% slop because the unwinder
-			// isn't perfect (e.g. it might interrupt the
-			// process when the Node environment is in an
-			// undefined state)
-			require.Less(t, 20*unlabeledWorkloadFrames, totalWorkloadFrames)
-		})
-	}
+	})
 }
 
 func startContainer(ctx context.Context, t *testing.T,
@@ -204,15 +268,32 @@ func startContainer(ctx context.Context, t *testing.T,
 	return cont
 }
 
-func testHTTPEndpoint(ctx context.Context, t *testing.T, cont testcontainers.Container) {
-	const numGoroutines = 10
-	const requestsPerGoroutine = 10000
+func startNightlyContainer(ctx context.Context, t *testing.T, nodeURL string) testcontainers.Container {
+	t.Log("starting container for node nightly at URL", nodeURL)
+	//nolint:dogsled
 
-	host, err := cont.Host(ctx)
+	_, path, _, _ := runtime.Caller(0)
+	cont, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
+		ContainerRequest: testcontainers.ContainerRequest{
+			FromDockerfile: testcontainers.FromDockerfile{
+				Dockerfile: "Dockerfile.nightly",
+				Context:    filepath.Dir(path) + "/testdata/node-md-render/",
+				BuildArgs: map[string]*string{
+					"NODE_URL": &nodeURL,
+				},
+			},
+			ExposedPorts: []string{"80/tcp"},
+			WaitingFor:   wait.ForHTTP("/docs/AUTHORS.md"),
+		},
+		Started: true,
+	})
 	require.NoError(t, err)
+	return cont
+}
 
-	port, err := cont.MappedPort(ctx, "80")
-	require.NoError(t, err)
+func testHTTPEndpoint(ctx context.Context, t *testing.T, host string, port nat.Port) {
+	const numGoroutines = 10
+	const requestsPerGoroutine = 10000
 
 	baseURL := "http://" + net.JoinHostPort(host, port.Port())
 

interpreter/customlabels/integrationtests/testdata/node-md-render/Dockerfile.nightly

@@ -0,0 +1,25 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && apt-get install -y git python3 make g++ libatomic1 curl
+
+
+WORKDIR /app
+ENV PATH /app/node/bin:$PATH
+
+COPY package.json ./
+
+RUN git clone https://github.com/markedjs/marked.git /tmp/marked && \
+    cd /tmp/marked && \
+    git checkout 0a0da515346d2b3dd1662531043fa6925cb73fe3 && \
+    cp -r docs /app/docs && \
+    rm -rf /tmp/marked
+
+COPY *.js ./
+
+ARG NODE_URL
+
+RUN curl $NODE_URL | tar zxf - && mv node* node && npm install
+
+EXPOSE 80
+
+CMD node index.js