Skip to content

Commit

Permalink
chore(deps): Bumping httputils to fix propgator
Browse files Browse the repository at this point in the history
Signed-off-by: Vincent Boutour <[email protected]>
  • Loading branch information
ViBiOh committed Feb 20, 2022
1 parent 591440d commit 9e44216
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 21 deletions.
4 changes: 2 additions & 2 deletions cmd/ketchup/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,14 @@ func main() {
logger.Fatal(err)
defer ketchupDb.Close()

redisApp := redis.New(redisConfig, prometheusApp.Registerer())
redisApp := redis.New(redisConfig, prometheusApp.Registerer(), tracerApp)

healthApp := health.New(healthConfig, ketchupDb.Ping, redisApp.Ping)

authServiceApp, authMiddlewareApp := initAuth(ketchupDb, tracerApp)

userServiceApp := userService.New(userStore.New(ketchupDb), &authServiceApp)
githubApp := github.New(githubConfig, redisApp)
githubApp := github.New(githubConfig, redisApp, tracerApp)
dockerApp := docker.New(dockerConfig)
helmApp := helm.New()
npmApp := npm.New()
Expand Down
2 changes: 1 addition & 1 deletion cmd/notifier/notifier.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func main() {
helmApp := helm.New()
npmApp := npm.New()
pypiApp := pypi.New()
repositoryServiceApp := repositoryService.New(repositoryStore.New(ketchupDb), github.New(githubConfig, nil), helmApp, docker.New(dockerConfig), npmApp, pypiApp)
repositoryServiceApp := repositoryService.New(repositoryStore.New(ketchupDb), github.New(githubConfig, nil, tracerApp), helmApp, docker.New(dockerConfig), npmApp, pypiApp)
ketchupServiceApp := ketchupService.New(ketchupStore.New(ketchupDb), repositoryServiceApp)
userServiceApp := userService.New(userStore.New(ketchupDb), nil)

Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/ViBiOh/ketchup
go 1.17

require (
github.com/ViBiOh/auth/v2 v2.11.40
github.com/ViBiOh/auth/v2 v2.11.42
github.com/ViBiOh/flags v0.0.1
github.com/ViBiOh/httputils/v4 v4.36.1
github.com/ViBiOh/httputils/v4 v4.37.1
github.com/ViBiOh/mailer v1.27.15
github.com/golang/mock v1.6.0
github.com/jackc/pgconn v1.11.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
github.com/ViBiOh/auth/v2 v2.11.40 h1:m/+uaixYoMSE7Fd0bU1sKfYAJy02okikNKiBM55xmJc=
github.com/ViBiOh/auth/v2 v2.11.40/go.mod h1:cq7pLycIet45oRTgNLEheVN8fwLK2sXze3bFsbLv4TU=
github.com/ViBiOh/auth/v2 v2.11.42 h1:qQfYvb8OJY8Fk1R4e9Rsj5I720JDet7ANXmledxxHP0=
github.com/ViBiOh/auth/v2 v2.11.42/go.mod h1:Wdxv86yNqbinXA/YWkObuT6LDjTOvH7/7ZMkxc4p7Hc=
github.com/ViBiOh/flags v0.0.1 h1:S6oBYVimXiUSXBc5NlgvXUcfcr8u5sJSaoxYnEbm7RM=
github.com/ViBiOh/flags v0.0.1/go.mod h1:3b6jZJblDDYDXKgGdsIT6ogEVKU8+7DDUBq08CLI5Ws=
github.com/ViBiOh/httputils/v4 v4.36.1 h1:bvjIy414MlPHbX8RbF9EVtG/LdZYNUXfPUabI67spEQ=
github.com/ViBiOh/httputils/v4 v4.36.1/go.mod h1:wTRfaC1WiZRKK9kaki9noouw4UOjoAiv2ryRX27Ln+0=
github.com/ViBiOh/httputils/v4 v4.37.1 h1:obuMoP9uwtIaWAR9+1CO6psb4V6X6WuRm47Nrm4YB6M=
github.com/ViBiOh/httputils/v4 v4.37.1/go.mod h1:wTRfaC1WiZRKK9kaki9noouw4UOjoAiv2ryRX27Ln+0=
github.com/ViBiOh/mailer v1.27.15 h1:s1C/fRFZB/kavmHLmAA45cbjrMZmcgFwM4T5perNWvw=
github.com/ViBiOh/mailer v1.27.15/go.mod h1:+PqYSf2aGm4Aa8d+SvGO3/vHwwwSuVRLc/bASTZe2CI=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
Expand Down
24 changes: 13 additions & 11 deletions infra/web.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
chart:
spec:
chart: app
version: "0.0.80"
version: "0.0.81"
sourceRef:
kind: HelmRepository
name: vibioh
Expand Down Expand Up @@ -46,19 +46,21 @@ spec:
enabled: true
compress: true
hosts:
- ketchup.vibioh.fr
- ketchup.vibioh.fr
canary:
enabled: true
url: https://ketchup.vibioh.fr
affinity:
podAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/instance
operator: In
values:
- ketchup-db
topologyKey: "kubernetes.io/hostname"
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/instance
operator: In
values:
- ketchup-db
topologyKey: "kubernetes.io/hostname"
pprof:
enabled: true
5 changes: 4 additions & 1 deletion pkg/provider/github/github.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/ViBiOh/httputils/v4/pkg/httpjson"
"github.com/ViBiOh/httputils/v4/pkg/logger"
"github.com/ViBiOh/httputils/v4/pkg/request"
"github.com/ViBiOh/httputils/v4/pkg/tracer"
"github.com/ViBiOh/ketchup/pkg/model"
"github.com/ViBiOh/ketchup/pkg/semver"
"github.com/prometheus/client_golang/prometheus"
Expand Down Expand Up @@ -71,7 +72,9 @@ func Flags(fs *flag.FlagSet, prefix string) Config {
}

// New creates new App from Config
func New(config Config, redisApp redis) App {
func New(config Config, redisApp redis, tracerApp tracer.App) App {
httpClient = tracer.AddTracerToClient(httpClient, tracerApp.GetProvider())

return app{
token: strings.TrimSpace(*config.token),
redisApp: redisApp,
Expand Down

0 comments on commit 9e44216

Please sign in to comment.