From 663abd277d8fcff9dfc768ad20dcc0ceacca8766 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Wed, 10 Feb 2021 15:41:39 -0500 Subject: [PATCH] Update deps, changelog. add versioninfo log on startup of ctrl, router --- CHANGELOG.md | 8 +++++--- go.mod | 4 ++-- go.sum | 9 ++------- ziti-controller/subcmd/run.go | 9 +++++++++ ziti-router/subcmd/run.go | 8 ++++++++ 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c93637a94..6ffa2f57d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,11 @@ # What's New * Fix PATCH OS Posture Checks clearing data -* Fix ziti-tunnel panic when removing services. [edge#517](https://github.com/openziti/edge/issues/517 +* Fix ziti-tunnel panic when removing services. [edge#517](https://github.com/openziti/edge/issues/517) * ziti-tunnel tproxy now supports `--lanIf` option to automatically add rules to accept incoming - connections for service connections. [edge#519](https://github.com/openziti/edge/issues/519 + connections for service connections. [edge#519](https://github.com/openziti/edge/issues/519) +* Add build info output when starting router/controller +* Remove histograms from xgress dataflow path as they were causing bottlenecks # Release 0.18.8 @@ -20,7 +22,7 @@ * Fix concurrency related crash in router * Fix resource leak in fabric: forwarder tables weren't always updated after unroute * Fix issue that prevented ziti-tunnel from cleaning up on shutdown in some cases. - [edge#506](https://github.com/openziti/edge/issues/506 + [edge#506](https://github.com/openziti/edge/issues/506) ## Websocket Binding diff --git a/go.mod b/go.mod index e7ecf194d..a99b90579 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ go 1.15 //replace github.com/openziti/sdk-golang => ../sdk-golang -// replace github.com/openziti/edge => ../edge +//replace github.com/openziti/edge => ../edge require ( github.com/Jeffail/gabs v1.4.0 @@ -25,7 +25,7 @@ require ( github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.3.6 github.com/openziti/edge v0.17.66 - github.com/openziti/fabric v0.15.21 + github.com/openziti/fabric v0.15.23 github.com/openziti/foundation v0.15.12 github.com/openziti/sdk-golang v0.15.13 github.com/pborman/uuid v1.2.0 diff --git a/go.sum b/go.sum index c08f6b100..688c4f6f5 100644 --- a/go.sum +++ b/go.sum @@ -530,14 +530,14 @@ github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYr github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openziti/edge v0.17.66 h1:OH4eMtpJt4mBKAu7ekzlJJJU/LcWj2g1i09+8HkqB8k= github.com/openziti/edge v0.17.66/go.mod h1:L19G8aGgeHNjHz8vZBNgZlsmSFCSg7CGgXRneKAnDGU= -github.com/openziti/fabric v0.15.21 h1:4rrh9ovQwGW4ecEZ2ykgxkPJ3Sdtxx7FV4SzguwpuwQ= github.com/openziti/fabric v0.15.21/go.mod h1:2Q63EWL1MDcdhZYoaMQDVjbGzRgonIdgRmzxaNDHJI0= +github.com/openziti/fabric v0.15.23 h1:tYG/hQLaFRm2VIcdK4eqcDYiI3vGN8vtQ3NoS5m69ow= +github.com/openziti/fabric v0.15.23/go.mod h1:2Q63EWL1MDcdhZYoaMQDVjbGzRgonIdgRmzxaNDHJI0= github.com/openziti/foundation v0.15.9/go.mod h1:34ifQ24R2EUNjakzZBKY1M4EvnOWeIYJOrJxRGdRNh4= github.com/openziti/foundation v0.15.12 h1:fdhhEsJPfvVIdarY4fd4gPGHkOGIAuxIig2hHweZ9K0= github.com/openziti/foundation v0.15.12/go.mod h1:34ifQ24R2EUNjakzZBKY1M4EvnOWeIYJOrJxRGdRNh4= github.com/openziti/sdk-golang v0.15.13 h1:Pd5WqFcPxrM8o/VeqCoKeGCgL+pC9Y5dVb1tqMhRprI= github.com/openziti/sdk-golang v0.15.13/go.mod h1:L1UbvXUV7DV6a3pd50CAJqtt9z6nN53p2cKNJlHZXR8= -github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 h1:lNCW6THrCKBiJBpz8kbVGjC7MgdCGKwuvBgc7LoD6sw= github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231 h1:fa50YL1pzKW+1SsBnJDOHppJN9stOEwS+CRWyUtyYGU= github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= @@ -652,7 +652,6 @@ github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -781,7 +780,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201010224723-4f7140c49acb h1:mUVeFHoDKis5nxCAzoAi7E8Ghb86EXh/RK6wtvJIqRY= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -846,10 +844,8 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM= golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061 h1:DQmQoKxQWtyybCtX/3dIuDBcAhFszqq8YiNeS6sNu1c= @@ -859,7 +855,6 @@ golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fq golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= diff --git a/ziti-controller/subcmd/run.go b/ziti-controller/subcmd/run.go index c69981bae..806cc084f 100644 --- a/ziti-controller/subcmd/run.go +++ b/ziti-controller/subcmd/run.go @@ -23,6 +23,7 @@ import ( "github.com/openziti/fabric/controller" "github.com/openziti/foundation/agent" "github.com/openziti/ziti/common/version" + "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) @@ -38,6 +39,14 @@ var runCmd = &cobra.Command{ } func run(cmd *cobra.Command, args []string) { + logrus.WithField("version", version.GetVersion()). + WithField("go-version", version.GetGoVersion()). + WithField("os", version.GetOS()). + WithField("arch", version.GetArchitecture()). + WithField("build-date", version.GetBuildDate()). + WithField("revision", version.GetRevision()). + Info("starting ziti-controller") + if config, err := controller.LoadConfig(args[0]); err == nil { if cliAgentEnabled { if err := agent.Listen(agent.Options{Addr: cliAgentAddr}); err != nil { diff --git a/ziti-router/subcmd/run.go b/ziti-router/subcmd/run.go index 38b7d361f..fc09c6ca9 100644 --- a/ziti-router/subcmd/run.go +++ b/ziti-router/subcmd/run.go @@ -41,6 +41,14 @@ var runCmd = &cobra.Command{ } func run(cmd *cobra.Command, args []string) { + logrus.WithField("version", version.GetVersion()). + WithField("go-version", version.GetGoVersion()). + WithField("os", version.GetOS()). + WithField("arch", version.GetArchitecture()). + WithField("build-date", version.GetBuildDate()). + WithField("revision", version.GetRevision()). + Info("starting ziti-router") + if config, err := router.LoadConfig(args[0]); err == nil { if cliAgentEnabled { if err := agent.Listen(agent.Options{Addr: cliAgentAddr}); err != nil {