chore: Bumping deps

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Mar 5, 2023 · fa10729 · fa10729
1 parent ff8abd7
commit fa10729
Show file tree

Hide file tree

Showing 8 changed files with 410 additions and 23 deletions.
diff --git a/cmd/ketchup/api.go b/cmd/ketchup/api.go
@@ -114,7 +114,7 @@ func main() {
 	logger.Fatal(err)
 	defer ketchupDb.Close()
 
-	redisApp := redis.New(redisConfig, prometheusRegisterer, tracerApp.GetTracer("redis"))
+	redisApp := redis.New(redisConfig, tracerApp.GetTracer("redis"))
 
 	healthApp := health.New(healthConfig, ketchupDb.Ping, redisApp.Ping)
 

diff --git a/cmd/notifier/notifier.go b/cmd/notifier/notifier.go
@@ -71,15 +71,15 @@ func main() {
 	logger.Info("Starting notifier...")
 
 	ctx, end := tracer.StartSpan(ctx, tracerApp.GetTracer("notifier"), "notifier")
-	defer end()
+	defer end(&err)
 
 	switch *notificationType {
 	case "daily":
-		if err := notifierApp.Notify(ctx); err != nil {
+		if err = notifierApp.Notify(ctx); err != nil {
 			logger.Fatal(err)
 		}
 	case "reminder":
-		if err := notifierApp.Remind(ctx); err != nil {
+		if err = notifierApp.Remind(ctx); err != nil {
 			logger.Fatal(err)
 		}
 	default:

diff --git a/go.mod b/go.mod
@@ -3,10 +3,10 @@ module github.com/ViBiOh/ketchup
 go 1.20
 
 require (
-	github.com/ViBiOh/auth/v2 v2.14.22
+	github.com/ViBiOh/auth/v2 v2.14.23
 	github.com/ViBiOh/flags v1.2.0
-	github.com/ViBiOh/httputils/v4 v4.53.8
-	github.com/ViBiOh/mailer v1.30.19
+	github.com/ViBiOh/httputils/v4 v4.54.0
+	github.com/ViBiOh/mailer v1.30.20
 	github.com/golang/mock v1.6.0
 	github.com/jackc/pgx/v5 v5.3.1
 	github.com/prometheus/client_golang v1.14.0
@@ -16,16 +16,17 @@ require (
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
 	github.com/jackc/puddle/v2 v2.2.0 // indirect
-	github.com/kr/text v0.1.0 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.41.0 // indirect
@@ -37,13 +38,19 @@ require (
 	github.com/tdewolff/parse/v2 v2.6.4 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect
 	go.opentelemetry.io/otel v1.14.0 // indirect
-	go.opentelemetry.io/otel/exporters/jaeger v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
 	go.opentelemetry.io/otel/metric v0.37.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.14.0 // indirect
+	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
 	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/net v0.7.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/sys v0.5.0 // indirect
 	golang.org/x/term v0.5.0 // indirect
 	golang.org/x/text v0.7.0 // indirect
+	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
+	google.golang.org/grpc v1.53.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/infra/notifier.yaml b/infra/notifier.yaml
@@ -38,7 +38,7 @@ spec:
       KETCHUP_LOGGER_JSON: "true"
       KETCHUP_NOTIFIER_PUSH_URL: http://pushgateway.monitoring
       KETCHUP_DOCKER_USERNAME: vibioh
-      KETCHUP_TRACER_URL: http://jaeger.monitoring:14268/api/traces
+      KETCHUP_TRACER_URL: otel-collector.monitoring:4317
       OTEL_SERVICE_NAME: ketchup-notifier
     secrets:
       KETCHUP_DB_PASS: AgBh5qNwTuuHnGaT7fHiBk+AoON8h1MPBOJegopdGeU6TAyHjbbzo6nP6eLwILoxv/F8SVpdZV5Ne7Q+tCpWnBnMuJJ88ILNe2ty2UrtI9+g+FIGhkFLYU8cWDPK/6ITPt0I4sTD1hc/j/0NxSred60MelIM0FBd6lK5nSqxfG3bGQTYQMQgslmgzqsp7/jOfr1YkGcoHIbkEjS6K/iC55++8XLbRCCc0ZDBSYgyjZs0CbRCUbIjG8cHa+QGWy2qw6v8pENtMjLNi9/Qdy1ADVsml2NTBdJJe4CQ8ieRZ7xn/TKOTaHoqT9fRpQgHHyAn8N9duZhGA0I9MOeLN+2LUP5YU6yXMCcJFjFC+kcEKbA3dBG+hE5cERps8pTXfzsZ6PPWXdpHtyqge8d0FBGqZS1eDQEaZVDtw4yJx+LbTcNKWWxdSRjkpooKJ+ZF/wTMgExgTHgzrDWKM2Qbe+l91gXWYIHm2Mo9U0lucnrQ9qg0HrWgaprUEPuZBgLx7jAL+L2ruuPWbDbG52THqLEfPTpt/O19pJ68kh/7wznY/WilVtISu8F8cunCsEUCIVa2pf8aprri4V3ri7zOU1v2SUnUAiCCM0t9IMbt3ELTt/TPtkVQ/IOQ+cvbHmSmWCdbOpZf0WAKlWGbCS5MaPfKldPrD9yEAwnNUyKmaXR8LOIUA3QjPK17/wRY2NKXHP+ARGf8GWs1LgkQ2CbJJD/PZjoLbx7Dkw8Feuks96zxc54YiqElboJA5QxhGV+BnipgCG9c4pcAu1vNCk2MeA=

diff --git a/infra/reminder.yaml b/infra/reminder.yaml
@@ -36,7 +36,7 @@ spec:
       KETCHUP_DB_PORT: "80"
       KETCHUP_DB_USER: ketchup
       KETCHUP_LOGGER_JSON: "true"
-      KETCHUP_TRACER_URL: http://jaeger.monitoring:14268/api/traces
+      KETCHUP_TRACER_URL: otel-collector.monitoring:4317
       OTEL_SERVICE_NAME: ketchup-reminder
     secrets:
       KETCHUP_DB_PASS: AgABdcJBitM657gDVH4zhalAIXDPazxq1fILfo6rKOxivOx2zR6yKnmwJ35d5fau3jr8q7Ucsx61wWxu+d6gMOQe849WLOBN00sFku97GgGFMQKwG7ZvE/0pKCfNU56dddIxmiy7sWooeli57Q+tpcJr4OVnbPhCHpYD42a7JOoihk5J0waVn0yzc5fxcioRgwwu7w78S/Zv3F24KBTrSXY5nIHcpplruNYb4vNYt9lg+0ScdsdV2yStdqO8q55meLm6X35kJrGVcRb63sJw3NeYV5UmzQ7W59KZ7O6RHGtLqnWe8pTODJIQt3ZLBZ9SrHj7shUQfQff0jjYPDAL6FlhfGoGz4o4NmmciBShU+m2Rd1SJm4WQR1Oc/59jgGwIlPXXvun/iWUaMJrcRd7BGf9kw2g+Fo5ks/65nlD++P1d79/SSxOHNiIw7xA9pMhWFlbKX1gtuwAEV2rOZzBAjctS+aiq+jQk4kh3FR2ZzT0gxVQf2immfoOAcjLugRhTOK/0ZrEx0iHy417Kd1Uku9ieZbJ74X/dvFtv2XRLm86cggZTNBkPcdoYZdgtmse+5YOFidHoap4QPyu1zSAbqW6wllj8Ku7or2s5BPVP2ztD4vIxVtJcw1H99CFqDQdz4KVfEq29aZm9tXskWLVvtyhraOKOQ6LDRovNyGbC0C5ZEFEhGLI4pdG5OK3vm3v8LcsiccaJbyDDC3WXOI+VoAyo7DQ9eP9VX3bVdX+QWY6CZpoLobjLZQrLKLeSvX+qeMoilyQKzPWP4L53UI=

diff --git a/infra/web.yaml b/infra/web.yaml
@@ -35,7 +35,7 @@ spec:
       KETCHUP_SCHEDULER_ENABLED: "false"
       KETCHUP_REDIS_ADDRESS: redis:80
       KETCHUP_DOCKER_USERNAME: vibioh
-      KETCHUP_TRACER_URL: http://jaeger.monitoring:14268/api/traces
+      KETCHUP_TRACER_URL: otel-collector.monitoring:4317
       OTEL_SERVICE_NAME: ketchup
     secrets:
       KETCHUP_DB_PASS: AgA8XVcbAEVRIr5XWgMxBm0zBmtwQwlh26g0suNF7/udGUdmbV/KYZ7tPCzrwvKb4RwASD0M2KaqzSmQ0LuW4m5l4b8TjDIL4Bya2Airn09sUCIgREncGBdSxtx2MYCMRgacXDJdA0QKB8J6PnJ7WSPr9DMX5OhWL54B3ZiFk8+yAog0l12vMbnNHkkLsyv+kRRIGiZVDc8zJzBnDdd3ERT72XqrR/U+5i5d39OLMCxrZ6/FML3/R9ddwZT2QrcDj2ESwhcGYyEzEloP8dZwKAxPkm4P2ze0nZs76O1T5/5WSL5ujQX0H/23Z7A2ecAZb4ESi0UJ9j40G/wdIubP4sWDpizwZC1+3Jq28bnBRKvhDMRlKTTGbR+TWfo4my/x8PV5paXTG8Lm9pnzQi8ATm3caR6NCpdW/zFbZfvwODfbZGmrU7TFLKHr182jWdEv/uZ07q+7Gjr+RamIWRWZs5UGg5wPerYjBDhYlgcUngHFf+Hk1MAidNYc7/ijWllfTSsHVGpqx2KCk8lwCbu/kHgfhVFwCA4A7R9YLyCQuHejDU+87Psf3kRW126W1lj/CfDdj/ZUM/JvLNpE5E0vKTlwwf6Q8SNz7j3cgIUMB5/O02jY2goTWGw3VjPlMc0fRCL6DWBUYz6nWNc6YNA+R7+iBzxUMdO/xUiELx+k8pADFowHwqT3mh3AmE6ZnSWlZb7duek/dVlr3S3GnhJnemGlAszE63hk/64ZukJ89i9VozJGw4fc63FctGwDKoQXczc15jo4ZoJ/dkpFpC8=

diff --git a/pkg/ketchup/signup.go b/pkg/ketchup/signup.go
@@ -6,9 +6,9 @@ import (
 	"net/http"
 
 	authModel "github.com/ViBiOh/auth/v2/pkg/model"
+	"github.com/ViBiOh/httputils/v4/pkg/cntxt"
 	httpModel "github.com/ViBiOh/httputils/v4/pkg/model"
 	"github.com/ViBiOh/httputils/v4/pkg/renderer"
-	"github.com/ViBiOh/httputils/v4/pkg/tracer"
 	"github.com/ViBiOh/ketchup/pkg/model"
 )
 
@@ -41,7 +41,7 @@ func (a App) Signup() http.Handler {
 			return
 		}
 
-		go a.cleanToken(tracer.CopyToBackground(r.Context()), token)
+		go a.cleanToken(cntxt.WithoutDeadline(r.Context()), token)
 
 		a.rendererApp.Redirect(w, r, fmt.Sprintf("%s/", appPath), renderer.NewSuccessMessage("Welcome to ketchup!"))
 	})