Make logger a separate module such that don't depend on shared module as a whole for logging (#1047)

* Make `logger` a separate module such that don't depend on `shared` module as a whole for logging * Update `Dockerfile`
2025-09-22 10:37:23 +00:00 · 2022-04-27 12:26:27 -07:00
parent ee8dce4466
commit e1ad302c29
96 changed files with 139 additions and 105 deletions
--- a/tap/cleaner.go
+++ b/tap/cleaner.go
@@ -5,7 +5,7 @@ import (
 	"time"

 	"github.com/google/gopacket/reassembly"
-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 	"github.com/up9inc/mizu/tap/api"
 )

--- a/tap/diagnose/diagnose.go
+++ b/tap/diagnose/diagnose.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"time"

-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 	"github.com/up9inc/mizu/tap/api"
 )

--- a/tap/diagnose/errors_map.go
+++ b/tap/diagnose/errors_map.go
@@ -5,7 +5,7 @@ import (
 	"sync"

 	"github.com/google/gopacket/examples/util"
-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 )

 var TapErrors *errorsMap
--- a/tap/diagnose/internal_stats.go
+++ b/tap/diagnose/internal_stats.go
@@ -1,6 +1,6 @@
 package diagnose

-import "github.com/up9inc/mizu/shared/logger"
+import "github.com/up9inc/mizu/logger"

 type tapperInternalStats struct {
 	Ipdefrag            int
--- a/tap/go.mod
+++ b/tap/go.mod
@@ -6,6 +6,7 @@ require (
 	github.com/cilium/ebpf v0.8.0
 	github.com/go-errors/errors v1.4.2
 	github.com/google/gopacket v1.1.19
+	github.com/up9inc/mizu/logger v0.0.0
 	github.com/up9inc/mizu/shared v0.0.0
 	github.com/up9inc/mizu/tap/api v0.0.0
 	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74
@@ -15,6 +16,7 @@ require (
 require (
 	github.com/go-logr/logr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
 	github.com/google/go-cmp v0.5.7 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/martian v2.1.0+incompatible // indirect
@@ -27,6 +29,7 @@ require (
 	golang.org/x/text v0.3.7 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 	k8s.io/apimachinery v0.23.3 // indirect
 	k8s.io/klog/v2 v2.40.1 // indirect
 	k8s.io/utils v0.0.0-20220127004650-9b3446523e65 // indirect
@@ -34,6 +37,8 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
 )

+replace github.com/up9inc/mizu/logger v0.0.0 => ../logger
+
 replace github.com/up9inc/mizu/tap/api v0.0.0 => ./api

 replace github.com/up9inc/mizu/shared v0.0.0 => ../shared
--- a/tap/go.sum
+++ b/tap/go.sum
@@ -203,6 +203,7 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU=
 github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
--- a/tap/passive_tapper.go
+++ b/tap/passive_tapper.go
@@ -17,7 +17,7 @@ import (
 	"strings"
 	"time"

-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 	"github.com/up9inc/mizu/tap/api"
 	"github.com/up9inc/mizu/tap/diagnose"
 	"github.com/up9inc/mizu/tap/source"
--- a/tap/source/discoverer_util.go
+++ b/tap/source/discoverer_util.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"strings"

-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 )

 var numberRegex = regexp.MustCompile("[0-9]+")
--- a/tap/source/envoy_discoverer.go
+++ b/tap/source/envoy_discoverer.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"

-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 	v1 "k8s.io/api/core/v1"
 )

--- a/tap/source/linkerd_discoverer.go
+++ b/tap/source/linkerd_discoverer.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"

-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 	v1 "k8s.io/api/core/v1"
 )

--- a/tap/source/netns_packet_source.go
+++ b/tap/source/netns_packet_source.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"runtime"

-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 	"github.com/up9inc/mizu/tap/api"
 	"github.com/vishvananda/netns"
 )
--- a/tap/source/packet_source_manager.go
+++ b/tap/source/packet_source_manager.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"

-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 	"github.com/up9inc/mizu/tap/api"
 	v1 "k8s.io/api/core/v1"
 )
@@ -136,9 +136,9 @@ func (m *PacketSourceManager) setBPFFilter(pods []v1.Pod) {
 		logger.Log.Info("No pods provided, skipping pcap bpf filter")
 		return
 	}
-	
+
 	var expr string
-	
+
 	if len(pods) > bpfFilterMaxPods {
 		logger.Log.Info("Too many pods for setting ebpf filter %d, setting just not 443", len(pods))
 		expr = "port not 443"
--- a/tap/source/tcp_packet_source.go
+++ b/tap/source/tcp_packet_source.go
@@ -9,7 +9,7 @@ import (
 	"github.com/google/gopacket/ip4defrag"
 	"github.com/google/gopacket/layers"
 	"github.com/google/gopacket/pcap"
-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 	"github.com/up9inc/mizu/tap/api"
 	"github.com/up9inc/mizu/tap/diagnose"
 )
--- a/tap/tcp_assembler.go
+++ b/tap/tcp_assembler.go
@@ -10,7 +10,7 @@ import (
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
 	"github.com/google/gopacket/reassembly"
-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 	"github.com/up9inc/mizu/tap/api"
 	"github.com/up9inc/mizu/tap/diagnose"
 	"github.com/up9inc/mizu/tap/source"
--- a/tap/tcp_reader.go
+++ b/tap/tcp_reader.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"

-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 	"github.com/up9inc/mizu/tap/api"
 )

--- a/tap/tcp_stream_factory.go
+++ b/tap/tcp_stream_factory.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"

-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 	"github.com/up9inc/mizu/tap/api"
 	v1 "k8s.io/api/core/v1"

--- a/tap/tcp_streams_map.go
+++ b/tap/tcp_streams_map.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"

-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 	"github.com/up9inc/mizu/tap/diagnose"
 )

--- a/tap/tlstapper/bpf_logger.go
+++ b/tap/tlstapper/bpf_logger.go
@@ -7,7 +7,7 @@ import (

 	"github.com/cilium/ebpf/perf"
 	"github.com/go-errors/errors"
-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 )

 const logPrefix = "[bpf] "
--- a/tap/tlstapper/ssllib_finder.go
+++ b/tap/tlstapper/ssllib_finder.go
@@ -7,7 +7,7 @@ import (
 	"strings"

 	"github.com/go-errors/errors"
-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 )

 func findSsllib(procfs string, pid uint32) (string, error) {
--- a/tap/tlstapper/ssllib_offsets.go
+++ b/tap/tlstapper/ssllib_offsets.go
@@ -4,7 +4,7 @@ import (
 	"debug/elf"

 	"github.com/go-errors/errors"
-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 )

 type sslOffsets struct {
--- a/tap/tlstapper/tls_poller.go
+++ b/tap/tlstapper/tls_poller.go
@@ -16,7 +16,7 @@ import (

 	"github.com/cilium/ebpf/perf"
 	"github.com/go-errors/errors"
-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 	"github.com/up9inc/mizu/tap/api"
 )

--- a/tap/tlstapper/tls_process_discoverer.go
+++ b/tap/tlstapper/tls_process_discoverer.go
@@ -11,7 +11,7 @@ import (
 	"strings"

 	"github.com/go-errors/errors"
-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 	v1 "k8s.io/api/core/v1"
 )

--- a/tap/tlstapper/tls_tapper.go
+++ b/tap/tlstapper/tls_tapper.go
@@ -5,7 +5,7 @@ import (

 	"github.com/cilium/ebpf/rlimit"
 	"github.com/go-errors/errors"
-	"github.com/up9inc/mizu/shared/logger"
+	"github.com/up9inc/mizu/logger"
 	"github.com/up9inc/mizu/tap/api"
 )