tests: enable distributed tracing tests on 5.15 ci tests

Author: mmat11

bpf/common/trace_common.h

@@ -96,7 +96,7 @@ static __always_inline unsigned char *bpf_strstr_tp_loop__legacy(unsigned char *
         return NULL;
     }
 
-    const u16 k_besteffort_max_loops = 450; // Limited best-effort search to stay within insns limit
+    const u16 k_besteffort_max_loops = 400; // Limited best-effort search to stay within insns limit
     for (u16 i = 0; i + TRACE_PARENT_HEADER_LEN < k_besteffort_max_loops; i++) {
         if (i != 0 && buf[i - 1] != '\n') {
             continue;

test/integration/multiprocess_test.go

@@ -99,15 +99,13 @@ func TestMultiProcess(t *testing.T) {
 		assert.Empty(t, results)
 	})
 
-	if kprobeTracesEnabled() {
-		t.Run("Nested traces with kprobes: rust -> java -> node -> go -> go jsonrpc -> python -> rails", func(t *testing.T) {
-			testNestedHTTPTracesKProbes(t)
-		})
-
-		t.Run("Nested traces with kprobes: SSL node python rails", func(t *testing.T) {
-			testNestedHTTPSTracesKProbes(t)
-		})
-	}
+	t.Run("Nested traces with kprobes: rust -> java -> node -> go -> go jsonrpc -> python -> rails", func(t *testing.T) {
+		testNestedHTTPTracesKProbes(t)
+	})
+
+	t.Run("Nested traces with kprobes: SSL node python rails", func(t *testing.T) {
+		testNestedHTTPSTracesKProbes(t)
+	})
 
 	t.Run("Instrumented processes metric", func(t *testing.T) {
 		checkInstrumentedProcessesMetric(t)
@@ -124,11 +122,9 @@ func TestMultiProcessAppCP(t *testing.T) {
 	compose.Env = append(compose.Env, `OTEL_EBPF_BPF_DISABLE_BLACK_BOX_CP=1`, `OTEL_EBPF_BPF_CONTEXT_PROPAGATION=all`, `OTEL_EBPF_BPF_TRACK_REQUEST_HEADERS=1`)
 	require.NoError(t, compose.Up())
 
-	if kprobeTracesEnabled() {
-		t.Run("Nested traces with kprobes: rust -> java -> node -> go -> go jsonrpc -> python -> rails", func(t *testing.T) {
-			testNestedHTTPTracesKProbes(t)
-		})
-	}
+	t.Run("Nested traces with kprobes: rust -> java -> node -> go -> go jsonrpc -> python -> rails", func(t *testing.T) {
+		testNestedHTTPTracesKProbes(t)
+	})
 	require.NoError(t, compose.Close())
 }
 
@@ -141,11 +137,10 @@ func TestMultiProcessAppCPNoIP(t *testing.T) {
 
 	require.NoError(t, compose.Up())
 
-	if kprobeTracesEnabled() {
-		t.Run("Nested traces with kprobes: rust -> java -> node -> go -> go jsonrpc -> python -> rails", func(t *testing.T) {
-			testNestedHTTPTracesKProbes(t)
-		})
-	}
+	t.Run("Nested traces with kprobes: rust -> java -> node -> go -> go jsonrpc -> python -> rails", func(t *testing.T) {
+		testNestedHTTPTracesKProbes(t)
+	})
+
 	require.NoError(t, compose.Close())
 }
 

test/integration/red_test_nodeclient.go

@@ -100,9 +100,7 @@ func testNodeClientWithMethodAndStatusCode(t *testing.T, method string, statusCo
 	 We check that the traceID has that 16 character 0 suffix and then we
 	 use the first 16 characters for looking up by Parent span.
 	*/
-	if kprobeTracesEnabled() {
-		assert.NotEmpty(t, span.TraceID)
-		assert.Truef(t, strings.HasSuffix(span.TraceID, traceIDLookup),
-			"string %q should have suffix %q", span.TraceID, traceIDLookup)
-	}
+	assert.NotEmpty(t, span.TraceID)
+	assert.Truef(t, strings.HasSuffix(span.TraceID, traceIDLookup),
+		"string %q should have suffix %q", span.TraceID, traceIDLookup)
 }

test/integration/red_test_rust.go

@@ -87,12 +87,12 @@ func testREDMetricsForRustHTTPLibrary(t *testing.T, url, comm, namespace string,
 	require.Len(t, res, 1)
 	parent := res[0]
 	require.NotEmpty(t, parent.TraceID)
-	if kprobeTracesEnabled() {
-		require.Equal(t, traceID, parent.TraceID)
-		// Validate that "parent" is a CHILD_OF the traceparent's "parent-id"
-		childOfPID := trace.ChildrenOf(parentID)
-		require.Len(t, childOfPID, 1)
-	}
+	require.Equal(t, traceID, parent.TraceID)
+
+	// Validate that "parent" is a CHILD_OF the traceparent's "parent-id"
+	childOfPID := trace.ChildrenOf(parentID)
+	require.Len(t, childOfPID, 1)
+
 	require.NotEmpty(t, parent.SpanID)
 	// check duration is at least 2us
 	assert.Less(t, (2 * time.Microsecond).Microseconds(), parent.Duration)

test/integration/suites_test.go

@@ -14,16 +14,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"go.opentelemetry.io/obi/pkg/obi"
 	"go.opentelemetry.io/obi/test/integration/components/docker"
 )
 
-func kprobeTracesEnabled() bool {
-	major, minor := obi.KernelVersion()
-
-	return major > 5 || (major == 5 && minor >= 17)
-}
-
 func TestSuite(t *testing.T) {
 	compose, err := docker.ComposeSuite("docker-compose.yml", path.Join(pathOutput, "test-suite.log"))
 	require.NoError(t, err)
@@ -507,11 +500,6 @@ func TestSuite_OverrideServiceName(t *testing.T) {
 }
 
 func TestSuiteNodeClient(t *testing.T) {
-	if !kprobeTracesEnabled() {
-		t.Skip("distributed traces not supported")
-		return
-	}
-
 	compose, err := docker.ComposeSuite("docker-compose-nodeclient.yml", path.Join(pathOutput, "test-suite-nodeclient.log"))
 	require.NoError(t, err)
 
@@ -524,11 +512,6 @@ func TestSuiteNodeClient(t *testing.T) {
 }
 
 func TestSuiteNodeClientTLS(t *testing.T) {
-	if !kprobeTracesEnabled() {
-		t.Skip("distributed traces not supported")
-		return
-	}
-
 	compose, err := docker.ComposeSuite("docker-compose-nodeclient.yml", path.Join(pathOutput, "test-suite-nodeclient-tls.log"))
 	require.NoError(t, err)
 

test/integration/traces_test.go

@@ -333,12 +333,12 @@ func testHTTPTracesKProbes(t *testing.T) {
 	require.Len(t, res, 1)
 	parent := res[0]
 	require.NotEmpty(t, parent.TraceID)
-	if kprobeTracesEnabled() {
-		require.Equal(t, traceID, parent.TraceID)
-		// Validate that "parent" is a CHILD_OF the traceparent's "parent-id"
-		childOfPID := trace.ChildrenOf(parentID)
-		require.Len(t, childOfPID, 1)
-	}
+	require.Equal(t, traceID, parent.TraceID)
+
+	// Validate that "parent" is a CHILD_OF the traceparent's "parent-id"
+	childOfPID := trace.ChildrenOf(parentID)
+	require.Len(t, childOfPID, 1)
+
 	require.NotEmpty(t, parent.SpanID)
 	// check duration is at least 2us
 	assert.Less(t, (2 * time.Microsecond).Microseconds(), parent.Duration)