From e2d34b6568e07c7101207ef1131ce50f2644cbfe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Apr 2022 06:12:41 +0000 Subject: [PATCH] chore(deps): bump github.com/ViBiOh/mailer from 1.28.4 to 1.28.5 Bumps [github.com/ViBiOh/mailer](https://github.com/ViBiOh/mailer) from 1.28.4 to 1.28.5. - [Release notes](https://github.com/ViBiOh/mailer/releases) - [Commits](https://github.com/ViBiOh/mailer/compare/v1.28.4...v1.28.5) --- updated-dependencies: - dependency-name: github.com/ViBiOh/mailer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: Vincent Boutour --- cmd/ketchup/api.go | 6 +++--- cmd/notifier/notifier.go | 2 +- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cmd/ketchup/api.go b/cmd/ketchup/api.go index d9a43764..7dec949d 100644 --- a/cmd/ketchup/api.go +++ b/cmd/ketchup/api.go @@ -104,11 +104,11 @@ func main() { promServer := server.New(promServerConfig) prometheusApp := prometheus.New(prometheusConfig) - ketchupDb, err := db.New(dbConfig, tracerApp) + ketchupDb, err := db.New(dbConfig, tracerApp.GetTracer("database")) logger.Fatal(err) defer ketchupDb.Close() - redisApp := redis.New(redisConfig, prometheusApp.Registerer(), tracerApp) + redisApp := redis.New(redisConfig, prometheusApp.Registerer(), tracerApp.GetTracer("redis")) healthApp := health.New(healthConfig, ketchupDb.Ping, redisApp.Ping) @@ -127,7 +127,7 @@ func main() { logger.Fatal(err) defer mailerApp.Close() - publicRendererApp, err := renderer.New(rendererConfig, content, ketchup.FuncMap, tracerApp) + publicRendererApp, err := renderer.New(rendererConfig, content, ketchup.FuncMap, tracerApp.GetTracer("renderer")) logger.Fatal(err) notifierApp := notifier.New(notifierConfig, repositoryServiceApp, ketchupServiceApp, userServiceApp, mailerApp, helmApp) diff --git a/cmd/notifier/notifier.go b/cmd/notifier/notifier.go index 69579655..1b40c915 100644 --- a/cmd/notifier/notifier.go +++ b/cmd/notifier/notifier.go @@ -45,7 +45,7 @@ func main() { logger.Global(logger.New(loggerConfig)) defer logger.Close() - ketchupDb, err := db.New(dbConfig, tracer.App{}) + ketchupDb, err := db.New(dbConfig, nil) logger.Fatal(err) defer ketchupDb.Close() diff --git a/go.mod b/go.mod index 791d564a..799aeb51 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/ViBiOh/auth/v2 v2.12.4 github.com/ViBiOh/flags v1.0.0 - github.com/ViBiOh/httputils/v4 v4.39.4 - github.com/ViBiOh/mailer v1.28.4 + github.com/ViBiOh/httputils/v4 v4.41.0 + github.com/ViBiOh/mailer v1.28.5 github.com/golang/mock v1.6.0 github.com/jackc/pgconn v1.11.0 github.com/jackc/pgproto3/v2 v2.2.0 @@ -36,8 +36,8 @@ require ( github.com/prometheus/common v0.33.0 // indirect github.com/prometheus/procfs v0.7.3 // indirect github.com/streadway/amqp v1.0.0 // indirect - github.com/tdewolff/minify/v2 v2.10.0 // indirect - github.com/tdewolff/parse/v2 v2.5.27 // indirect + github.com/tdewolff/minify/v2 v2.11.1 // indirect + github.com/tdewolff/parse/v2 v2.5.28 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0 // indirect go.opentelemetry.io/otel v1.6.3 // indirect go.opentelemetry.io/otel/exporters/jaeger v1.6.3 // indirect diff --git a/go.sum b/go.sum index f5854a05..4806e0ee 100644 --- a/go.sum +++ b/go.sum @@ -38,10 +38,10 @@ github.com/ViBiOh/auth/v2 v2.12.4 h1:Z5b475xW8G0wL41CyBsce3Jyu58wHlclaOwZdbllv6s github.com/ViBiOh/auth/v2 v2.12.4/go.mod h1:ez1CfUnxYbySs9aRsf08Ed+ysM6Slzx9tF1Po7gWPK0= github.com/ViBiOh/flags v1.0.0 h1:ECiQMH2tK04PaCkPRuziWAtxYGtx2Ej8O15ZZ2Jx4Ww= github.com/ViBiOh/flags v1.0.0/go.mod h1:W0YgB4Nqou2j/2vevgO3kyrcS2f+ci/+w+jDGzVZilk= -github.com/ViBiOh/httputils/v4 v4.39.4 h1:clRIg6zdrtk3ycxhHHNqDY3nFrbkfkeYMAbV/AWZ4+A= -github.com/ViBiOh/httputils/v4 v4.39.4/go.mod h1:glut7ePwgGFHhJ1ZePxLhfY1JW8hyd5LthZsFsCm6Fg= -github.com/ViBiOh/mailer v1.28.4 h1:0KTu4PtB2RDyMHPRpSlZEn1m0odBOCCH5RJSAQymnK4= -github.com/ViBiOh/mailer v1.28.4/go.mod h1:i+VbRpTPny1evtz7tEiPxFscrqRuOUXV2C8cPuKXh58= +github.com/ViBiOh/httputils/v4 v4.41.0 h1:BPtZJKaE/4WXqt4Sz8xON1T4QlRjpZD0RV8PPVyV4GE= +github.com/ViBiOh/httputils/v4 v4.41.0/go.mod h1:ajHAkkVQYTWhcRT4/6wL7FvXHU7GAfeJ0WZ0DpO6Yu8= +github.com/ViBiOh/mailer v1.28.5 h1:xTUkUoILOldjJOZ/xIA34+U/X8FE/V5z/IRRwsCvhWg= +github.com/ViBiOh/mailer v1.28.5/go.mod h1:j/kRFVqX1MbrZOAoj4pBvzbKN4CH/E4c8zxduV7MXsk= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -308,10 +308,10 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/tdewolff/minify/v2 v2.10.0 h1:ovVAHUcjfGrBDf1EIvsodRUVJiZK/28mMose08B7k14= -github.com/tdewolff/minify/v2 v2.10.0/go.mod h1:6XAjcHM46pFcRE0eztigFPm0Q+Cxsw8YhEWT+rDkcZM= -github.com/tdewolff/parse/v2 v2.5.27 h1:PL3LzzXaOpmdrknnOlIeO2muIBHAwiKp6TxN1RbU5gI= -github.com/tdewolff/parse/v2 v2.5.27/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho= +github.com/tdewolff/minify/v2 v2.11.1 h1:x2IAGnHs3qBjulArA7g4dYGCpcMrM8H2sywfwr436RA= +github.com/tdewolff/minify/v2 v2.11.1/go.mod h1:UkCTT2Sa8N7XNU0Z9Q+De6NvaxPlC7DGfSWDRowwXqY= +github.com/tdewolff/parse/v2 v2.5.28 h1:QziFVLe+bfFIwnCWAJzMrzwltQXPT21Evl9Z4x25D+U= +github.com/tdewolff/parse/v2 v2.5.28/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho= github.com/tdewolff/test v1.0.6 h1:76mzYJQ83Op284kMT+63iCNCI7NEERsIN8dLM+RiKr4= github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=