diff --git a/Dockerfile b/Dockerfile index 672e68074..d6070781a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,6 +58,7 @@ WORKDIR /app/agent-build COPY agent/go.mod agent/go.sum ./ COPY shared/go.mod shared/go.mod ../shared/ +COPY logger/go.mod logger/go.mod ../logger/ COPY tap/go.mod tap/go.mod ../tap/ COPY tap/api/go.mod ../tap/api/ COPY tap/extensions/amqp/go.mod ../tap/extensions/amqp/ @@ -70,6 +71,7 @@ RUN go list -f '{{.Path}}@{{.Version}}' -m all | sed 1d | grep -e 'go-cache' | x # Copy and build agent code COPY shared ../shared +COPY logger ../logger COPY tap ../tap COPY agent . diff --git a/agent/go.mod b/agent/go.mod index b3dd9e6ce..f104a4221 100644 --- a/agent/go.mod +++ b/agent/go.mod @@ -22,6 +22,7 @@ require ( github.com/patrickmn/go-cache v2.1.0+incompatible github.com/stretchr/testify v1.7.0 github.com/up9inc/basenine/client/go v0.0.0-20220419100955-e2ca51087607 + github.com/up9inc/mizu/logger v0.0.0 github.com/up9inc/mizu/shared v0.0.0 github.com/up9inc/mizu/tap v0.0.0 github.com/up9inc/mizu/tap/api v0.0.0 @@ -135,6 +136,8 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) +replace github.com/up9inc/mizu/logger v0.0.0 => ../logger + replace github.com/up9inc/mizu/shared v0.0.0 => ../shared replace github.com/up9inc/mizu/tap v0.0.0 => ../tap diff --git a/agent/go.sum b/agent/go.sum index b38aa4b6d..6b5bcb87b 100644 --- a/agent/go.sum +++ b/agent/go.sum @@ -554,8 +554,6 @@ github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HD github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= -github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= diff --git a/agent/main.go b/agent/main.go index 0bd951c39..07b7bd16a 100644 --- a/agent/main.go +++ b/agent/main.go @@ -33,8 +33,8 @@ import ( "github.com/gorilla/websocket" "github.com/op/go-logging" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" "github.com/up9inc/mizu/tap" tapApi "github.com/up9inc/mizu/tap/api" ) diff --git a/agent/pkg/api/entry_streamer_socket_connector.go b/agent/pkg/api/entry_streamer_socket_connector.go index c5e2e7d0d..a40438739 100644 --- a/agent/pkg/api/entry_streamer_socket_connector.go +++ b/agent/pkg/api/entry_streamer_socket_connector.go @@ -5,7 +5,7 @@ import ( basenine "github.com/up9inc/basenine/client/go" "github.com/up9inc/mizu/agent/pkg/models" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" tapApi "github.com/up9inc/mizu/tap/api" ) diff --git a/agent/pkg/api/main.go b/agent/pkg/api/main.go index b756bd143..ad15f54e2 100644 --- a/agent/pkg/api/main.go +++ b/agent/pkg/api/main.go @@ -24,8 +24,8 @@ import ( "github.com/up9inc/mizu/agent/pkg/resolver" "github.com/up9inc/mizu/agent/pkg/utils" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" tapApi "github.com/up9inc/mizu/tap/api" basenine "github.com/up9inc/basenine/client/go" @@ -128,11 +128,11 @@ BasenineReconnect: for item := range outputItems { extension := extensionsMap[item.Protocol.Name] resolvedSource, resolvedDestionation, namespace := resolveIP(item.ConnectionInfo) - + if namespace == "" && item.Namespace != tapApi.UNKNOWN_NAMESPACE { namespace = item.Namespace } - + mizuEntry := extension.Dissector.Analyze(item, resolvedSource, resolvedDestionation, namespace) if extension.Protocol.Name == "http" { if !disableOASValidation { diff --git a/agent/pkg/api/socket_data_streamer.go b/agent/pkg/api/socket_data_streamer.go index e958dcaf0..42094875d 100644 --- a/agent/pkg/api/socket_data_streamer.go +++ b/agent/pkg/api/socket_data_streamer.go @@ -6,8 +6,8 @@ import ( basenine "github.com/up9inc/basenine/client/go" "github.com/up9inc/mizu/agent/pkg/dependency" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" tapApi "github.com/up9inc/mizu/tap/api" ) diff --git a/agent/pkg/api/socket_routes.go b/agent/pkg/api/socket_routes.go index 085617bcc..33d428fa0 100644 --- a/agent/pkg/api/socket_routes.go +++ b/agent/pkg/api/socket_routes.go @@ -10,7 +10,7 @@ import ( "github.com/gorilla/websocket" "github.com/up9inc/mizu/agent/pkg/models" "github.com/up9inc/mizu/agent/pkg/utils" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" tapApi "github.com/up9inc/mizu/tap/api" ) diff --git a/agent/pkg/api/socket_server_handlers.go b/agent/pkg/api/socket_server_handlers.go index a3d5808db..4fc82d8fe 100644 --- a/agent/pkg/api/socket_server_handlers.go +++ b/agent/pkg/api/socket_server_handlers.go @@ -14,8 +14,8 @@ import ( tapApi "github.com/up9inc/mizu/tap/api" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" ) type BrowserClient struct { diff --git a/agent/pkg/api/utils.go b/agent/pkg/api/utils.go index 3d3696107..625f246f6 100644 --- a/agent/pkg/api/utils.go +++ b/agent/pkg/api/utils.go @@ -4,8 +4,8 @@ import ( "encoding/json" "github.com/up9inc/mizu/agent/pkg/providers/tappedPods" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" ) func BroadcastTappedPodsStatus() { diff --git a/agent/pkg/app/main.go b/agent/pkg/app/main.go index f7cbea9b4..65b7cb41d 100644 --- a/agent/pkg/app/main.go +++ b/agent/pkg/app/main.go @@ -10,7 +10,7 @@ import ( basenine "github.com/up9inc/basenine/client/go" "github.com/up9inc/mizu/agent/pkg/api" "github.com/up9inc/mizu/agent/pkg/utils" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" tapApi "github.com/up9inc/mizu/tap/api" amqpExt "github.com/up9inc/mizu/tap/extensions/amqp" httpExt "github.com/up9inc/mizu/tap/extensions/http" diff --git a/agent/pkg/controllers/entries_controller.go b/agent/pkg/controllers/entries_controller.go index ec41f18d2..ca21c2249 100644 --- a/agent/pkg/controllers/entries_controller.go +++ b/agent/pkg/controllers/entries_controller.go @@ -10,7 +10,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) func HandleEntriesError(c *gin.Context, err error) bool { diff --git a/agent/pkg/controllers/oas_controller.go b/agent/pkg/controllers/oas_controller.go index 16fde8d74..9b8814ec6 100644 --- a/agent/pkg/controllers/oas_controller.go +++ b/agent/pkg/controllers/oas_controller.go @@ -7,7 +7,7 @@ import ( "github.com/gin-gonic/gin" "github.com/up9inc/mizu/agent/pkg/dependency" "github.com/up9inc/mizu/agent/pkg/oas" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) func GetOASServers(c *gin.Context) { diff --git a/agent/pkg/controllers/status_controller.go b/agent/pkg/controllers/status_controller.go index 20330d78d..215b9a9cf 100644 --- a/agent/pkg/controllers/status_controller.go +++ b/agent/pkg/controllers/status_controller.go @@ -13,9 +13,9 @@ import ( "github.com/up9inc/mizu/agent/pkg/providers/tappers" "github.com/up9inc/mizu/agent/pkg/up9" "github.com/up9inc/mizu/agent/pkg/validation" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/shared/kubernetes" - "github.com/up9inc/mizu/shared/logger" ) func HealthCheck(c *gin.Context) { diff --git a/agent/pkg/elastic/esClient.go b/agent/pkg/elastic/esClient.go index 296f8bcd6..33a1775d6 100644 --- a/agent/pkg/elastic/esClient.go +++ b/agent/pkg/elastic/esClient.go @@ -9,8 +9,8 @@ import ( "time" "github.com/elastic/go-elasticsearch/v7" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" "github.com/up9inc/mizu/tap/api" ) diff --git a/agent/pkg/entries/entries_provider.go b/agent/pkg/entries/entries_provider.go index b6e01f4d6..ceb8c34a7 100644 --- a/agent/pkg/entries/entries_provider.go +++ b/agent/pkg/entries/entries_provider.go @@ -9,8 +9,8 @@ import ( "github.com/up9inc/mizu/agent/pkg/app" "github.com/up9inc/mizu/agent/pkg/har" "github.com/up9inc/mizu/agent/pkg/models" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" tapApi "github.com/up9inc/mizu/tap/api" ) diff --git a/agent/pkg/har/types.go b/agent/pkg/har/types.go index 901560906..a2333c78e 100644 --- a/agent/pkg/har/types.go +++ b/agent/pkg/har/types.go @@ -2,9 +2,10 @@ package har import ( "encoding/base64" - "github.com/up9inc/mizu/shared/logger" "time" "unicode/utf8" + + "github.com/up9inc/mizu/logger" ) /* diff --git a/agent/pkg/har/utils.go b/agent/pkg/har/utils.go index 5578d4cdb..24e04e853 100644 --- a/agent/pkg/har/utils.go +++ b/agent/pkg/har/utils.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) // Keep it because we might want cookies in the future diff --git a/agent/pkg/oas/feeder_test.go b/agent/pkg/oas/feeder_test.go index 616e1e1d1..e12e557d3 100644 --- a/agent/pkg/oas/feeder_test.go +++ b/agent/pkg/oas/feeder_test.go @@ -16,7 +16,7 @@ import ( "github.com/up9inc/mizu/agent/pkg/har" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) func getFiles(baseDir string) (result []string, err error) { diff --git a/agent/pkg/oas/oas_generator.go b/agent/pkg/oas/oas_generator.go index bfcaca712..5ca61a9dc 100644 --- a/agent/pkg/oas/oas_generator.go +++ b/agent/pkg/oas/oas_generator.go @@ -11,7 +11,7 @@ import ( "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/tap/api" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) var ( diff --git a/agent/pkg/oas/specgen.go b/agent/pkg/oas/specgen.go index b86561e2c..2b39e2b03 100644 --- a/agent/pkg/oas/specgen.go +++ b/agent/pkg/oas/specgen.go @@ -17,7 +17,7 @@ import ( "github.com/chanced/openapi" "github.com/google/uuid" "github.com/nav-inc/datetime" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/agent/pkg/har" diff --git a/agent/pkg/oas/specgen_test.go b/agent/pkg/oas/specgen_test.go index 0eca3ab49..cc7b609ee 100644 --- a/agent/pkg/oas/specgen_test.go +++ b/agent/pkg/oas/specgen_test.go @@ -13,7 +13,7 @@ import ( "time" "github.com/chanced/openapi" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" "github.com/wI2L/jsondiff" basenine "github.com/up9inc/basenine/client/go" diff --git a/agent/pkg/oas/tree.go b/agent/pkg/oas/tree.go index 03d21c907..532a8d9c2 100644 --- a/agent/pkg/oas/tree.go +++ b/agent/pkg/oas/tree.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/chanced/openapi" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) type NodePath = []string diff --git a/agent/pkg/oas/utils.go b/agent/pkg/oas/utils.go index e7312949d..89b7639cc 100644 --- a/agent/pkg/oas/utils.go +++ b/agent/pkg/oas/utils.go @@ -9,7 +9,7 @@ import ( "github.com/up9inc/mizu/agent/pkg/har" "github.com/chanced/openapi" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) func exampleResolver(ref string) (*openapi.ExampleObj, error) { diff --git a/agent/pkg/providers/tappedPods/tapped_pods_provider.go b/agent/pkg/providers/tappedPods/tapped_pods_provider.go index ddec3735d..cc2dd11c4 100644 --- a/agent/pkg/providers/tappedPods/tapped_pods_provider.go +++ b/agent/pkg/providers/tappedPods/tapped_pods_provider.go @@ -7,8 +7,8 @@ import ( "github.com/up9inc/mizu/agent/pkg/providers/tappers" "github.com/up9inc/mizu/agent/pkg/utils" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" ) const FilePath = shared.DataDirPath + "tapped-pods.json" diff --git a/agent/pkg/providers/tappers/tappers_provider.go b/agent/pkg/providers/tappers/tappers_provider.go index 604857355..9bdc63939 100644 --- a/agent/pkg/providers/tappers/tappers_provider.go +++ b/agent/pkg/providers/tappers/tappers_provider.go @@ -5,8 +5,8 @@ import ( "sync" "github.com/up9inc/mizu/agent/pkg/utils" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" ) const FilePath = shared.DataDirPath + "tappers-status.json" diff --git a/agent/pkg/resolver/resolver.go b/agent/pkg/resolver/resolver.go index c8e2ac79f..6b461d28d 100644 --- a/agent/pkg/resolver/resolver.go +++ b/agent/pkg/resolver/resolver.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" k8serrors "k8s.io/apimachinery/pkg/api/errors" cmap "github.com/orcaman/concurrent-map" diff --git a/agent/pkg/rules/rulesHTTP.go b/agent/pkg/rules/rulesHTTP.go index 8b3cd7135..529f2f75f 100644 --- a/agent/pkg/rules/rulesHTTP.go +++ b/agent/pkg/rules/rulesHTTP.go @@ -10,7 +10,7 @@ import ( "github.com/up9inc/mizu/agent/pkg/har" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" "github.com/yalp/jsonpath" diff --git a/agent/pkg/servicemap/servicemap.go b/agent/pkg/servicemap/servicemap.go index 337e8e1e3..b186fedf0 100644 --- a/agent/pkg/servicemap/servicemap.go +++ b/agent/pkg/servicemap/servicemap.go @@ -1,10 +1,11 @@ package servicemap import ( - "github.com/jinzhu/copier" "sync" - "github.com/up9inc/mizu/shared/logger" + "github.com/jinzhu/copier" + + "github.com/up9inc/mizu/logger" tapApi "github.com/up9inc/mizu/tap/api" ) diff --git a/agent/pkg/up9/main.go b/agent/pkg/up9/main.go index 7fe8bb7e5..513ed8216 100644 --- a/agent/pkg/up9/main.go +++ b/agent/pkg/up9/main.go @@ -17,8 +17,8 @@ import ( "github.com/up9inc/mizu/agent/pkg/utils" basenine "github.com/up9inc/basenine/client/go" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" tapApi "github.com/up9inc/mizu/tap/api" ) diff --git a/agent/pkg/utils/utils.go b/agent/pkg/utils/utils.go index 034ee08f3..83f26bec7 100644 --- a/agent/pkg/utils/utils.go +++ b/agent/pkg/utils/utils.go @@ -13,8 +13,8 @@ import ( "time" "github.com/gin-gonic/gin" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" ) var ( diff --git a/cli/apiserver/provider.go b/cli/apiserver/provider.go index 082ee194c..af1fae796 100644 --- a/cli/apiserver/provider.go +++ b/cli/apiserver/provider.go @@ -4,15 +4,16 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/up9inc/mizu/cli/utils" "io/ioutil" "net/http" "net/url" "time" + "github.com/up9inc/mizu/cli/utils" + "github.com/up9inc/mizu/cli/config" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" core "k8s.io/api/core/v1" ) diff --git a/cli/auth/authProvider.go b/cli/auth/authProvider.go index 6a45625d7..92f1eda30 100644 --- a/cli/auth/authProvider.go +++ b/cli/auth/authProvider.go @@ -12,7 +12,7 @@ import ( "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/config/configStructs" "github.com/up9inc/mizu/cli/uiUtils" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" "golang.org/x/oauth2" ) diff --git a/cli/cmd/check.go b/cli/cmd/check.go index a2822e59a..792bbbd05 100644 --- a/cli/cmd/check.go +++ b/cli/cmd/check.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" "github.com/up9inc/mizu/cli/config/configStructs" "github.com/up9inc/mizu/cli/telemetry" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) var checkCmd = &cobra.Command{ diff --git a/cli/cmd/check/imagePullInCluster.go b/cli/cmd/check/imagePullInCluster.go index 825435ee4..4a23869c8 100644 --- a/cli/cmd/check/imagePullInCluster.go +++ b/cli/cmd/check/imagePullInCluster.go @@ -3,13 +3,14 @@ package check import ( "context" "fmt" - "github.com/up9inc/mizu/cli/uiUtils" - "github.com/up9inc/mizu/shared/kubernetes" - "github.com/up9inc/mizu/shared/logger" - core "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "regexp" "time" + + "github.com/up9inc/mizu/cli/uiUtils" + "github.com/up9inc/mizu/logger" + "github.com/up9inc/mizu/shared/kubernetes" + core "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func ImagePullInCluster(ctx context.Context, kubernetesProvider *kubernetes.Provider) bool { diff --git a/cli/cmd/check/kubernetesApi.go b/cli/cmd/check/kubernetesApi.go index 510ba97d4..9b8fa6080 100644 --- a/cli/cmd/check/kubernetesApi.go +++ b/cli/cmd/check/kubernetesApi.go @@ -2,14 +2,14 @@ package check import ( "fmt" + "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/uiUtils" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared/kubernetes" - "github.com/up9inc/mizu/shared/logger" "github.com/up9inc/mizu/shared/semver" ) - func KubernetesApi() (*kubernetes.Provider, *semver.SemVersion, bool) { logger.Log.Infof("\nkubernetes-api\n--------------------") diff --git a/cli/cmd/check/kubernetesPermissions.go b/cli/cmd/check/kubernetesPermissions.go index 408e0f23e..df807b652 100644 --- a/cli/cmd/check/kubernetesPermissions.go +++ b/cli/cmd/check/kubernetesPermissions.go @@ -4,15 +4,16 @@ import ( "context" "embed" "fmt" + "strings" + "github.com/up9inc/mizu/cli/bucket" "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/uiUtils" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared/kubernetes" - "github.com/up9inc/mizu/shared/logger" rbac "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/scheme" - "strings" ) func TapKubernetesPermissions(ctx context.Context, embedFS embed.FS, kubernetesProvider *kubernetes.Provider) bool { diff --git a/cli/cmd/check/kubernetesResources.go b/cli/cmd/check/kubernetesResources.go index 6e4264203..87bdd87cd 100644 --- a/cli/cmd/check/kubernetesResources.go +++ b/cli/cmd/check/kubernetesResources.go @@ -3,10 +3,11 @@ package check import ( "context" "fmt" + "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/uiUtils" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared/kubernetes" - "github.com/up9inc/mizu/shared/logger" ) func KubernetesResources(ctx context.Context, kubernetesProvider *kubernetes.Provider) bool { diff --git a/cli/cmd/check/kubernetesVersion.go b/cli/cmd/check/kubernetesVersion.go index 6543edfd4..6e346e423 100644 --- a/cli/cmd/check/kubernetesVersion.go +++ b/cli/cmd/check/kubernetesVersion.go @@ -2,9 +2,10 @@ package check import ( "fmt" + "github.com/up9inc/mizu/cli/uiUtils" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared/kubernetes" - "github.com/up9inc/mizu/shared/logger" "github.com/up9inc/mizu/shared/semver" ) diff --git a/cli/cmd/check/serverConnection.go b/cli/cmd/check/serverConnection.go index 289d17393..7190a5d79 100644 --- a/cli/cmd/check/serverConnection.go +++ b/cli/cmd/check/serverConnection.go @@ -3,12 +3,13 @@ package check import ( "context" "fmt" + "regexp" + "github.com/up9inc/mizu/cli/apiserver" "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/uiUtils" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared/kubernetes" - "github.com/up9inc/mizu/shared/logger" - "regexp" ) func ServerConnection(kubernetesProvider *kubernetes.Provider) bool { diff --git a/cli/cmd/checkRunner.go b/cli/cmd/checkRunner.go index 1cc01976d..33879ac7d 100644 --- a/cli/cmd/checkRunner.go +++ b/cli/cmd/checkRunner.go @@ -4,10 +4,11 @@ import ( "context" "embed" "fmt" + "github.com/up9inc/mizu/cli/cmd/check" "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/uiUtils" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) var ( diff --git a/cli/cmd/common.go b/cli/cmd/common.go index efbab94f1..0c35e372b 100644 --- a/cli/cmd/common.go +++ b/cli/cmd/common.go @@ -19,8 +19,8 @@ import ( "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/cli/config" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared/kubernetes" - "github.com/up9inc/mizu/shared/logger" ) func GetApiServerUrl(port uint16) string { diff --git a/cli/cmd/config.go b/cli/cmd/config.go index 9c92a9e32..393330627 100644 --- a/cli/cmd/config.go +++ b/cli/cmd/config.go @@ -9,7 +9,7 @@ import ( "github.com/up9inc/mizu/cli/config/configStructs" "github.com/up9inc/mizu/cli/telemetry" "github.com/up9inc/mizu/cli/uiUtils" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) var configCmd = &cobra.Command{ diff --git a/cli/cmd/goUtils/funcWrappers.go b/cli/cmd/goUtils/funcWrappers.go index 92d646bb2..16eb2c6c9 100644 --- a/cli/cmd/goUtils/funcWrappers.go +++ b/cli/cmd/goUtils/funcWrappers.go @@ -4,7 +4,7 @@ import ( "reflect" "runtime/debug" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) func HandleExcWrapper(fn interface{}, params ...interface{}) (result []reflect.Value) { diff --git a/cli/cmd/installRunner.go b/cli/cmd/installRunner.go index 4d3877cb2..8262dc3b9 100644 --- a/cli/cmd/installRunner.go +++ b/cli/cmd/installRunner.go @@ -2,9 +2,10 @@ package cmd import ( "fmt" + "github.com/up9inc/mizu/cli/bucket" "github.com/up9inc/mizu/cli/config" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) func runMizuInstall() { diff --git a/cli/cmd/logs.go b/cli/cmd/logs.go index 8eaf738a4..4a0cb2f04 100644 --- a/cli/cmd/logs.go +++ b/cli/cmd/logs.go @@ -10,7 +10,7 @@ import ( "github.com/up9inc/mizu/cli/errormessage" "github.com/up9inc/mizu/cli/mizu/fsUtils" "github.com/up9inc/mizu/cli/telemetry" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) var logsCmd = &cobra.Command{ diff --git a/cli/cmd/root.go b/cli/cmd/root.go index d1e6cdb3b..5e5ff1582 100644 --- a/cli/cmd/root.go +++ b/cli/cmd/root.go @@ -11,7 +11,7 @@ import ( "github.com/up9inc/mizu/cli/mizu/fsUtils" "github.com/up9inc/mizu/cli/mizu/version" "github.com/up9inc/mizu/cli/uiUtils" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) var rootCmd = &cobra.Command{ diff --git a/cli/cmd/tap.go b/cli/cmd/tap.go index ea618ddcd..3399fc24a 100644 --- a/cli/cmd/tap.go +++ b/cli/cmd/tap.go @@ -14,8 +14,8 @@ import ( "github.com/up9inc/mizu/cli/config/configStructs" "github.com/up9inc/mizu/cli/errormessage" "github.com/up9inc/mizu/cli/uiUtils" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" ) const uploadTrafficMessageToConfirm = `NOTE: running mizu with --%s flag will upload recorded traffic for further analysis and enriched presentation options.` diff --git a/cli/cmd/tapRunner.go b/cli/cmd/tapRunner.go index 824e7e74b..5f8ecbaee 100644 --- a/cli/cmd/tapRunner.go +++ b/cli/cmd/tapRunner.go @@ -25,9 +25,9 @@ import ( "github.com/up9inc/mizu/cli/config/configStructs" "github.com/up9inc/mizu/cli/errormessage" "github.com/up9inc/mizu/cli/uiUtils" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/shared/kubernetes" - "github.com/up9inc/mizu/shared/logger" "github.com/up9inc/mizu/tap/api" ) diff --git a/cli/cmd/version.go b/cli/cmd/version.go index a3a1e3ccf..5163636e1 100644 --- a/cli/cmd/version.go +++ b/cli/cmd/version.go @@ -7,7 +7,7 @@ import ( "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/config/configStructs" "github.com/up9inc/mizu/cli/telemetry" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" "github.com/creasty/defaults" "github.com/spf13/cobra" diff --git a/cli/cmd/view.go b/cli/cmd/view.go index befb83616..e8884fe95 100644 --- a/cli/cmd/view.go +++ b/cli/cmd/view.go @@ -6,7 +6,7 @@ import ( "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/config/configStructs" "github.com/up9inc/mizu/cli/telemetry" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) var viewCmd = &cobra.Command{ diff --git a/cli/cmd/viewRunner.go b/cli/cmd/viewRunner.go index ebcddc67e..dab9309cc 100644 --- a/cli/cmd/viewRunner.go +++ b/cli/cmd/viewRunner.go @@ -11,8 +11,8 @@ import ( "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/mizu/fsUtils" "github.com/up9inc/mizu/cli/uiUtils" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared/kubernetes" - "github.com/up9inc/mizu/shared/logger" ) func runMizuView() { diff --git a/cli/config/config.go b/cli/config/config.go index f00cc6f09..6e33485d8 100644 --- a/cli/config/config.go +++ b/cli/config/config.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" "github.com/creasty/defaults" "github.com/spf13/cobra" diff --git a/cli/config/configStructs/tapConfig.go b/cli/config/configStructs/tapConfig.go index f2cdd612a..c3c4a8b35 100644 --- a/cli/config/configStructs/tapConfig.go +++ b/cli/config/configStructs/tapConfig.go @@ -11,7 +11,7 @@ import ( "github.com/up9inc/mizu/cli/uiUtils" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared/units" ) diff --git a/cli/go.mod b/cli/go.mod index b2e6b30a9..a703190c2 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -11,6 +11,7 @@ require ( github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 github.com/spf13/cobra v1.3.0 github.com/spf13/pflag v1.0.5 + 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 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 @@ -98,6 +99,8 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) +replace github.com/up9inc/mizu/logger v0.0.0 => ../logger + replace github.com/up9inc/mizu/shared v0.0.0 => ../shared replace github.com/up9inc/mizu/tap/api v0.0.0 => ../tap/api diff --git a/cli/mizu/fsUtils/mizuLogsUtils.go b/cli/mizu/fsUtils/mizuLogsUtils.go index d43cfe5b6..f9da22ddf 100644 --- a/cli/mizu/fsUtils/mizuLogsUtils.go +++ b/cli/mizu/fsUtils/mizuLogsUtils.go @@ -10,8 +10,8 @@ import ( "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/mizu" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared/kubernetes" - "github.com/up9inc/mizu/shared/logger" ) func GetLogFilePath() string { diff --git a/cli/mizu/fsUtils/zipUtils.go b/cli/mizu/fsUtils/zipUtils.go index 51f0e5eba..a91a2f529 100644 --- a/cli/mizu/fsUtils/zipUtils.go +++ b/cli/mizu/fsUtils/zipUtils.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) func AddFileToZip(zipWriter *zip.Writer, filename string) error { diff --git a/cli/mizu/version/versionCheck.go b/cli/mizu/version/versionCheck.go index a084621a3..4411f5a79 100644 --- a/cli/mizu/version/versionCheck.go +++ b/cli/mizu/version/versionCheck.go @@ -13,7 +13,7 @@ import ( "github.com/up9inc/mizu/cli/apiserver" "github.com/up9inc/mizu/cli/mizu" "github.com/up9inc/mizu/cli/pkg/version" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" "github.com/google/go-github/v37/github" "github.com/up9inc/mizu/cli/uiUtils" diff --git a/cli/resources/cleanResources.go b/cli/resources/cleanResources.go index 30935b442..d83325960 100644 --- a/cli/resources/cleanResources.go +++ b/cli/resources/cleanResources.go @@ -3,12 +3,13 @@ package resources import ( "context" "fmt" + "github.com/up9inc/mizu/cli/errormessage" "github.com/up9inc/mizu/cli/mizu/fsUtils" "github.com/up9inc/mizu/cli/uiUtils" "github.com/up9inc/mizu/cli/utils" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared/kubernetes" - "github.com/up9inc/mizu/shared/logger" "k8s.io/apimachinery/pkg/util/wait" ) @@ -54,7 +55,6 @@ func cleanUpNonRestrictedMode(ctx context.Context, cancel context.CancelFunc, ku } } - if resources, err := kubernetesProvider.ListManagedClusterRoleBindings(ctx); err != nil { resourceDesc := "ClusterRoleBindings" handleDeletionError(err, resourceDesc, &leftoverResources) diff --git a/cli/resources/createResources.go b/cli/resources/createResources.go index 5ba9dcf62..ee2f2a46b 100644 --- a/cli/resources/createResources.go +++ b/cli/resources/createResources.go @@ -8,9 +8,9 @@ import ( "github.com/up9inc/mizu/cli/errormessage" "github.com/up9inc/mizu/cli/mizu" "github.com/up9inc/mizu/cli/uiUtils" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/shared/kubernetes" - "github.com/up9inc/mizu/shared/logger" core "k8s.io/api/core/v1" ) diff --git a/cli/telemetry/telemetry.go b/cli/telemetry/telemetry.go index cc7e68202..db5e113d0 100644 --- a/cli/telemetry/telemetry.go +++ b/cli/telemetry/telemetry.go @@ -4,14 +4,15 @@ import ( "bytes" "encoding/json" "fmt" + "net/http" + "os" + "time" + "github.com/denisbrodbeck/machineid" "github.com/up9inc/mizu/cli/apiserver" "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/mizu" - "github.com/up9inc/mizu/shared/logger" - "net/http" - "os" - "time" + "github.com/up9inc/mizu/logger" ) const telemetryUrl = "https://us-east4-up9-prod.cloudfunctions.net/mizu-telemetry" diff --git a/cli/uiUtils/confirmation.go b/cli/uiUtils/confirmation.go index 9a28da26f..313183132 100644 --- a/cli/uiUtils/confirmation.go +++ b/cli/uiUtils/confirmation.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) func AskForConfirmation(s string) bool { diff --git a/cli/uiUtils/openBrowser.go b/cli/uiUtils/openBrowser.go index b8c58b7e3..9274ce63b 100644 --- a/cli/uiUtils/openBrowser.go +++ b/cli/uiUtils/openBrowser.go @@ -5,7 +5,7 @@ import ( "os/exec" "runtime" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" ) func OpenBrowser(url string) { diff --git a/cli/utils/waitUtils.go b/cli/utils/waitUtils.go index 75a5e83ff..162ea9377 100644 --- a/cli/utils/waitUtils.go +++ b/cli/utils/waitUtils.go @@ -2,10 +2,11 @@ package utils import ( "context" - "github.com/up9inc/mizu/shared/logger" "os" "os/signal" "syscall" + + "github.com/up9inc/mizu/logger" ) func WaitForFinish(ctx context.Context, cancel context.CancelFunc) { diff --git a/logger/go.mod b/logger/go.mod new file mode 100644 index 000000000..e549fe70e --- /dev/null +++ b/logger/go.mod @@ -0,0 +1,5 @@ +module github.com/up9inc/mizu/logger + +go 1.17 + +require github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 diff --git a/logger/go.sum b/logger/go.sum new file mode 100644 index 000000000..83a27dcf7 --- /dev/null +++ b/logger/go.sum @@ -0,0 +1,2 @@ +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= diff --git a/shared/logger/logger.go b/logger/logger.go similarity index 100% rename from shared/logger/logger.go rename to logger/logger.go diff --git a/shared/go.mod b/shared/go.mod index 104eabd14..142ecf7d0 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -6,6 +6,7 @@ require ( github.com/docker/go-units v0.4.0 github.com/golang-jwt/jwt/v4 v4.2.0 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 + github.com/up9inc/mizu/logger v0.0.0 github.com/up9inc/mizu/tap/api v0.0.0 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b k8s.io/api v0.23.3 @@ -91,4 +92,6 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) +replace github.com/up9inc/mizu/logger v0.0.0 => ../logger + replace github.com/up9inc/mizu/tap/api v0.0.0 => ../tap/api diff --git a/shared/kubernetes/mizuTapperSyncer.go b/shared/kubernetes/mizuTapperSyncer.go index 68996ee30..7e412842d 100644 --- a/shared/kubernetes/mizuTapperSyncer.go +++ b/shared/kubernetes/mizuTapperSyncer.go @@ -7,9 +7,9 @@ import ( "time" "github.com/op/go-logging" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/shared/debounce" - "github.com/up9inc/mizu/shared/logger" "github.com/up9inc/mizu/tap/api" core "k8s.io/api/core/v1" ) diff --git a/shared/kubernetes/provider.go b/shared/kubernetes/provider.go index 67b9e5186..70a34778c 100644 --- a/shared/kubernetes/provider.go +++ b/shared/kubernetes/provider.go @@ -12,8 +12,8 @@ import ( "regexp" "github.com/op/go-logging" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" "github.com/up9inc/mizu/shared/semver" "github.com/up9inc/mizu/tap/api" auth "k8s.io/api/authorization/v1" diff --git a/shared/kubernetes/proxy.go b/shared/kubernetes/proxy.go index 521a90b57..b01dea59a 100644 --- a/shared/kubernetes/proxy.go +++ b/shared/kubernetes/proxy.go @@ -16,7 +16,7 @@ import ( "k8s.io/client-go/tools/portforward" "k8s.io/client-go/transport/spdy" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" "k8s.io/kubectl/pkg/proxy" ) diff --git a/shared/kubernetes/watch.go b/shared/kubernetes/watch.go index 6c5ef4b6f..09004e2b5 100644 --- a/shared/kubernetes/watch.go +++ b/shared/kubernetes/watch.go @@ -7,8 +7,8 @@ import ( "sync" "time" + "github.com/up9inc/mizu/logger" "github.com/up9inc/mizu/shared/debounce" - "github.com/up9inc/mizu/shared/logger" "k8s.io/apimachinery/pkg/watch" ) diff --git a/shared/models.go b/shared/models.go index d2b2e24a4..9fefe9453 100644 --- a/shared/models.go +++ b/shared/models.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/op/go-logging" - "github.com/up9inc/mizu/shared/logger" + "github.com/up9inc/mizu/logger" "gopkg.in/yaml.v3" v1 "k8s.io/api/core/v1" diff --git a/tap/cleaner.go b/tap/cleaner.go index cdf2acf20..bc441df4c 100644 --- 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" ) diff --git a/tap/diagnose/diagnose.go b/tap/diagnose/diagnose.go index f40fd5e27..e2264af6f 100644 --- 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" ) diff --git a/tap/diagnose/errors_map.go b/tap/diagnose/errors_map.go index 9bc4b8a46..47b291926 100644 --- 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 diff --git a/tap/diagnose/internal_stats.go b/tap/diagnose/internal_stats.go index e37379cb3..155f18884 100644 --- 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 diff --git a/tap/go.mod b/tap/go.mod index 0c99577a0..9b2713ff6 100644 --- 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 diff --git a/tap/go.sum b/tap/go.sum index 8963a9190..fd2986f93 100644 --- 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= diff --git a/tap/passive_tapper.go b/tap/passive_tapper.go index 86c2cb512..2e4743648 100644 --- 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" diff --git a/tap/source/discoverer_util.go b/tap/source/discoverer_util.go index 7c9640d4f..04f757ffe 100644 --- 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]+") diff --git a/tap/source/envoy_discoverer.go b/tap/source/envoy_discoverer.go index d90f96943..17a452b0b 100644 --- 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" ) diff --git a/tap/source/linkerd_discoverer.go b/tap/source/linkerd_discoverer.go index 808fc8036..cd9e55a29 100644 --- 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" ) diff --git a/tap/source/netns_packet_source.go b/tap/source/netns_packet_source.go index a8183ff0f..41f9968d0 100644 --- 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" ) diff --git a/tap/source/packet_source_manager.go b/tap/source/packet_source_manager.go index bbedb5d39..9dcb60a27 100644 --- 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" diff --git a/tap/source/tcp_packet_source.go b/tap/source/tcp_packet_source.go index f71ee3a62..315b69d54 100644 --- 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" ) diff --git a/tap/tcp_assembler.go b/tap/tcp_assembler.go index 0751ac78d..6a3151dc2 100644 --- 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" diff --git a/tap/tcp_reader.go b/tap/tcp_reader.go index ee0f05f38..17f031522 100644 --- 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" ) diff --git a/tap/tcp_stream_factory.go b/tap/tcp_stream_factory.go index 06ec19f2b..60aa19107 100644 --- 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" diff --git a/tap/tcp_streams_map.go b/tap/tcp_streams_map.go index 9a94f41ce..9d65b4a10 100644 --- 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" ) diff --git a/tap/tlstapper/bpf_logger.go b/tap/tlstapper/bpf_logger.go index ec794e66f..1cb1da48a 100644 --- 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] " diff --git a/tap/tlstapper/ssllib_finder.go b/tap/tlstapper/ssllib_finder.go index bdeccd961..596772be7 100644 --- 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) { diff --git a/tap/tlstapper/ssllib_offsets.go b/tap/tlstapper/ssllib_offsets.go index a156166b9..cae8b4734 100644 --- 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 { diff --git a/tap/tlstapper/tls_poller.go b/tap/tlstapper/tls_poller.go index dc8d103d3..a753f8789 100644 --- 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" ) diff --git a/tap/tlstapper/tls_process_discoverer.go b/tap/tlstapper/tls_process_discoverer.go index 5322cb9b1..f4b604399 100644 --- 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" ) diff --git a/tap/tlstapper/tls_tapper.go b/tap/tlstapper/tls_tapper.go index efdcbb423..c7fbc8110 100644 --- 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" )