Backport grafana#451. Fix for skip go tracers.

grcevski · Nov 20, 2023 · eb48c85 · eb48c85
1 parent 18dcad4
commit eb48c85
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
diff --git a/pkg/internal/discover/attacher.go b/pkg/internal/discover/attacher.go
@@ -80,7 +80,11 @@ func (ta *TraceAttacher) getTracer(ie *Instrumentable) (*ebpf.ProcessTracer, boo
 	case svc.InstrumentableGolang:
 		// gets all the possible supported tracers for a go program, and filters out
 		// those whose symbols are not present in the ELF functions list
-		programs = filterNotFoundPrograms(newGoTracersGroup(ta.Cfg, ta.Metrics), ie.Offsets)
+		if ta.Cfg.Discovery.SkipGoSpecificTracers {
+			programs = newNonGoTracersGroup(ta.Cfg, ta.Metrics)
+		} else {
+			programs = filterNotFoundPrograms(newGoTracersGroup(ta.Cfg, ta.Metrics), ie.Offsets)
+		}
 	case svc.InstrumentableJava, svc.InstrumentableNodejs, svc.InstrumentableRuby, svc.InstrumentablePython, svc.InstrumentableDotnet, svc.InstrumentableGeneric, svc.InstrumentableRust:
 		// We are not instrumenting a Go application, we override the programs
 		// list with the generic kernel/socket space filters

diff --git a/test/integration/docker-compose.yml b/test/integration/docker-compose.yml
@@ -36,6 +36,7 @@ services:
       BEYLA_OPEN_PORT: "${BEYLA_OPEN_PORT}"
       BEYLA_DISCOVERY_POLL_INTERVAL: 500ms
       BEYLA_EXECUTABLE_NAME: "${BEYLA_EXECUTABLE_NAME}"
+      BEYLA_SKIP_GO_SPECIFIC_TRACERS: "${BEYLA_SKIP_GO_SPECIFIC_TRACERS}"
       BEYLA_SERVICE_NAMESPACE: "integration-test"
       BEYLA_METRICS_INTERVAL: "10ms"
       BEYLA_BPF_BATCH_TIMEOUT: "10ms"

diff --git a/test/integration/red_test.go b/test/integration/red_test.go
@@ -67,6 +67,19 @@ func testREDMetricsOldHTTP(t *testing.T) {
 		})
 	}
 }
+
+// this needs to be removed once we figure out why Gorilla async didn't work.
+func testREDMetricsShortHTTP(t *testing.T) {
+	for _, testCaseURL := range []string{
+		instrumentedServiceStdURL,
+	} {
+		t.Run(testCaseURL, func(t *testing.T) {
+			waitForTestComponents(t, testCaseURL)
+			testREDMetricsForHTTPLibrary(t, testCaseURL, "testserver", "integration-test")
+		})
+	}
+}
+
 func testREDMetricsForHTTPLibrary(t *testing.T, url, svcName, svcNs string) {
 	path := "/basic/" + rndStr()
 

diff --git a/test/integration/suites_test.go b/test/integration/suites_test.go
@@ -88,6 +88,17 @@ func TestSuite_OldestGoVersion(t *testing.T) {
 	t.Run("BPF pinning folder unmounted", testBPFPinningUnmounted)
 }
 
+func TestSuite_SkipGoTracers(t *testing.T) {
+	compose, err := docker.ComposeSuite("docker-compose.yml", path.Join(pathOutput, "test-suite-skip-go-tracers.log"))
+	compose.Env = append(compose.Env, `BEYLA_SKIP_GO_SPECIFIC_TRACERS=1`)
+	require.NoError(t, err)
+	require.NoError(t, compose.Up())
+	t.Run("RED metrics", testREDMetricsShortHTTP)
+	t.Run("BPF pinning folder mounted", testBPFPinningMounted)
+	require.NoError(t, compose.Close())
+	t.Run("BPF pinning folder unmounted", testBPFPinningUnmounted)
+}
+
 func TestSuite_GRPCExport(t *testing.T) {
 	compose, err := docker.ComposeSuite("docker-compose.yml", path.Join(pathOutput, "test-suite-grpc-export.log"))
 	compose.Env = append(compose.Env, "INSTRUMENTER_CONFIG_SUFFIX=-grpc-export")