From 3cfbe17c5b3883faf946975802dc6ee2b5cd7f09 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Wed, 17 Mar 2021 10:50:46 -0400 Subject: [PATCH 1/3] Support for bbolt tracing. --- controller/persistence/testing.go | 2 +- go.mod | 4 +++- go.sum | 10 ++-------- util/debug-db/debug-db.go | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/controller/persistence/testing.go b/controller/persistence/testing.go index c7df93a35..274fd4189 100644 --- a/controller/persistence/testing.go +++ b/controller/persistence/testing.go @@ -93,7 +93,7 @@ func (ctx *TestContext) Init() { ctx.BaseTestContext.InitDbFile() var err error - ctx.db, err = db.Open(ctx.GetDbFile().Name()) + ctx.db, err = db.Open(ctx.GetDbFile().Name(), false) ctx.NoError(err) ctx.fabricStores, err = db.InitStores(ctx.GetDb()) diff --git a/go.mod b/go.mod index 11caa2924..025a2b502 100644 --- a/go.mod +++ b/go.mod @@ -4,12 +4,14 @@ go 1.16 //replace github.com/openziti/foundation => ../foundation -//replace github.com/openziti/fabric => ../fabric +replace github.com/openziti/fabric => ../fabric //replace github.com/openziti/sdk-golang => ../sdk-golang //replace github.com/kataras/go-events => ../go-events +replace go.etcd.io/bbolt => github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e + require ( github.com/AppsFlyer/go-sundheit v0.2.0 github.com/Jeffail/gabs v1.4.0 diff --git a/go.sum b/go.sum index 2f8c6b398..44c39e955 100644 --- a/go.sum +++ b/go.sum @@ -388,7 +388,6 @@ github.com/lucas-clemente/quic-go v0.18.1/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXq github.com/lucsky/cuid v1.0.2 h1:z4XlExeoderxoPj2/dxKOyPxe9RCOu7yNq9/XWxIUMQ= github.com/lucsky/cuid v1.0.2/go.mod h1:QaaJqckboimOmhRSJXSx/+IT+VTfxfPGSo/6mfgUfmE= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= -github.com/magefile/mage v1.10.0 h1:3HiXzCUY12kh9bIuyXShaVe529fJfyqoVM42o/uom2g= github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= @@ -495,9 +494,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= -github.com/openziti/fabric v0.16.27 h1:/7hzhjm5X7pWLm/2aXM9YZyU2JSRhQ0KNEVt125FArk= -github.com/openziti/fabric v0.16.27/go.mod h1:jjIq2i9XcSmaGpYAkm8lX/0JVeSycAF3Zi9SaXSEDkE= -github.com/openziti/foundation v0.15.35 h1:FYL2TNKqRzXVN70XhU15Nw2OrWnd5Lbz0hz4heVsxqg= +github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e h1:ST9+54UtCr96S5+Wa7LQtpGS6/xK7Z+KQXvOAtYgJlA= +github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= github.com/openziti/foundation v0.15.35/go.mod h1:0vyGpNqnK/WuVhUE1Kfq+UvCWIf/rUYViMrCrCZ2cTc= github.com/openziti/foundation v0.15.36 h1:3XADgT1VwDJd/R+YmTu+EuLeQEMhtWn+0RvI5d4Blgo= github.com/openziti/foundation v0.15.36/go.mod h1:wWyy60CAEKBKF354v1FpRGaMIWJIjI/i+hpwsQ5IiZo= @@ -574,7 +572,6 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.8.0 h1:nfhvjKcUMhBMVqbKHJlk5RPrrfYr/NMo3692g0dwfWU= github.com/sirupsen/logrus v1.8.0/go.mod h1:4GuYW9TZmE769R5STWrRakJc4UqQ3+QQ95fyz7ENv1A= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= @@ -635,9 +632,6 @@ github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50 h1:ASw9n1EHMftwnP3Az4XW6e308+gNsrHzmdhd0Olz9Hs= -go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.3.0/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE= diff --git a/util/debug-db/debug-db.go b/util/debug-db/debug-db.go index a2c62c840..e4e3a33ef 100644 --- a/util/debug-db/debug-db.go +++ b/util/debug-db/debug-db.go @@ -50,7 +50,7 @@ func (provider *dbProvider) GetControllers() *network.Controllers { } func run(dbFile string) { - boltDb, err := db.Open(dbFile) + boltDb, err := db.Open(dbFile, false) noError(err) fabricStores, err := db.InitStores(boltDb) From ac0373c59490d7ba75d8d53a353d5dd237961b26 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Wed, 17 Mar 2021 11:22:56 -0400 Subject: [PATCH 2/3] Fabric dependency update for bbolt tracing. --- go.mod | 4 ++-- go.sum | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 025a2b502..9f74b2f09 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.16 //replace github.com/openziti/foundation => ../foundation -replace github.com/openziti/fabric => ../fabric +//replace github.com/openziti/fabric => ../fabric //replace github.com/openziti/sdk-golang => ../sdk-golang @@ -41,7 +41,7 @@ require ( github.com/miekg/dns v1.1.40 github.com/mitchellh/mapstructure v1.4.1 github.com/netfoundry/secretstream v0.1.2 - github.com/openziti/fabric v0.16.27 + github.com/openziti/fabric v0.16.29 github.com/openziti/foundation v0.15.36 github.com/openziti/sdk-golang v0.15.24 github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231 diff --git a/go.sum b/go.sum index 44c39e955..216b5cf18 100644 --- a/go.sum +++ b/go.sum @@ -388,7 +388,6 @@ github.com/lucas-clemente/quic-go v0.18.1/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXq github.com/lucsky/cuid v1.0.2 h1:z4XlExeoderxoPj2/dxKOyPxe9RCOu7yNq9/XWxIUMQ= github.com/lucsky/cuid v1.0.2/go.mod h1:QaaJqckboimOmhRSJXSx/+IT+VTfxfPGSo/6mfgUfmE= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= -github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -496,7 +495,8 @@ 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/bbolt v1.3.6-0.20210317142109-547da822475e h1:ST9+54UtCr96S5+Wa7LQtpGS6/xK7Z+KQXvOAtYgJlA= github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -github.com/openziti/foundation v0.15.35/go.mod h1:0vyGpNqnK/WuVhUE1Kfq+UvCWIf/rUYViMrCrCZ2cTc= +github.com/openziti/fabric v0.16.29 h1:yWAsIzpnyUY8J0i+cI9twPkWfpytjVdrh3FmYO/IeWE= +github.com/openziti/fabric v0.16.29/go.mod h1:p+SwZBxWiB98i4YKwrxGtGQT280erLHYC5h0mZLv0mM= github.com/openziti/foundation v0.15.36 h1:3XADgT1VwDJd/R+YmTu+EuLeQEMhtWn+0RvI5d4Blgo= github.com/openziti/foundation v0.15.36/go.mod h1:wWyy60CAEKBKF354v1FpRGaMIWJIjI/i+hpwsQ5IiZo= github.com/openziti/sdk-golang v0.15.24 h1:qHIAi4Bdw1lCmAmlxb7AwsyHXiVdi+FMyxVVkeXI5fM= @@ -572,7 +572,6 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.8.0/go.mod h1:4GuYW9TZmE769R5STWrRakJc4UqQ3+QQ95fyz7ENv1A= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= From 6c6e38d88a5b909a4036ef937aad77795c96732f Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Wed, 17 Mar 2021 12:10:36 -0400 Subject: [PATCH 3/3] go mod tidy --- go.sum | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/go.sum b/go.sum index 3fdb8f5a2..216b5cf18 100644 --- a/go.sum +++ b/go.sum @@ -493,8 +493,10 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= -github.com/openziti/fabric v0.16.28 h1:H/0OAMwjlg9Y7/gM0MyMxTMGn+XVx9/ZH/MHGarOhww= -github.com/openziti/fabric v0.16.28/go.mod h1:iAal/QhB//MeA2z4bW2hwkfSrIXWaLAAgB974wLgqH0= +github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e h1:ST9+54UtCr96S5+Wa7LQtpGS6/xK7Z+KQXvOAtYgJlA= +github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +github.com/openziti/fabric v0.16.29 h1:yWAsIzpnyUY8J0i+cI9twPkWfpytjVdrh3FmYO/IeWE= +github.com/openziti/fabric v0.16.29/go.mod h1:p+SwZBxWiB98i4YKwrxGtGQT280erLHYC5h0mZLv0mM= github.com/openziti/foundation v0.15.36 h1:3XADgT1VwDJd/R+YmTu+EuLeQEMhtWn+0RvI5d4Blgo= github.com/openziti/foundation v0.15.36/go.mod h1:wWyy60CAEKBKF354v1FpRGaMIWJIjI/i+hpwsQ5IiZo= github.com/openziti/sdk-golang v0.15.24 h1:qHIAi4Bdw1lCmAmlxb7AwsyHXiVdi+FMyxVVkeXI5fM= @@ -629,9 +631,6 @@ github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50 h1:ASw9n1EHMftwnP3Az4XW6e308+gNsrHzmdhd0Olz9Hs= -go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.3.0/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE=