From b0340db8bc14cb5b732907a9da29b252a4cd66a8 Mon Sep 17 00:00:00 2001 From: "M. Mert Yildiran" Date: Wed, 8 Jun 2022 04:29:55 +0300 Subject: [PATCH] Remove `MIZU_GLOBAL_GOLANG_PATH` environment variable --- tap/passive_tapper.go | 9 --------- tap/tlstapper/tls_tapper.go | 18 ------------------ 2 files changed, 27 deletions(-) diff --git a/tap/passive_tapper.go b/tap/passive_tapper.go index dbc1098a6..1aa7a620d 100644 --- a/tap/passive_tapper.go +++ b/tap/passive_tapper.go @@ -293,15 +293,6 @@ func startTlsTapper(extension *api.Extension, outputItems chan *api.OutputChanne } } - // A quick way to instrument Go `crypto/tls` using executable path - used for debuging and troubleshooting - // - if os.Getenv("MIZU_GLOBAL_GOLANG_PATH") != "" { - if err := tls.GlobalGolangTapPath(os.Getenv("MIZU_GLOBAL_GOLANG_PATH")); err != nil { - tlstapper.LogError(err) - return nil - } - } - var emitter api.Emitter = &api.Emitting{ AppStats: &diagnose.AppStats, OutputChannel: outputItems, diff --git a/tap/tlstapper/tls_tapper.go b/tap/tlstapper/tls_tapper.go index 7d984ea6b..12f37ddef 100644 --- a/tap/tlstapper/tls_tapper.go +++ b/tap/tlstapper/tls_tapper.go @@ -79,10 +79,6 @@ func (t *TlsTapper) GlobalGolangTap(procfs string, pid string) error { return t.tapGolangPid(procfs, uint32(_pid), api.UNKNOWN_NAMESPACE) } -func (t *TlsTapper) GlobalGolangTapPath(exePath string) error { - return t.tapGolangPath(exePath) -} - func (t *TlsTapper) AddSsllibPid(procfs string, pid uint32, namespace string) error { sslLibrary, err := findSsllib(procfs, pid) @@ -217,20 +213,6 @@ func (t *TlsTapper) tapGolangPid(procfs string, pid uint32, namespace string) er return nil } -func (t *TlsTapper) tapGolangPath(exePath string) error { - hooks := golangHooks{} - - if err := hooks.installUprobes(&t.bpfObjects, exePath); err != nil { - return err - } - - logger.Log.Infof("Tapping TLS (Golang: %v)", exePath) - - t.golangHooksStructs = append(t.golangHooksStructs, hooks) - - return nil -} - func LogError(err error) { var e *errors.Error if errors.As(err, &e) {