From 249f90fa3d64ca360bca6e72c7aadb7f5f4da59c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 13 Jun 2022 11:03:23 +0000 Subject: [PATCH 1/5] actually pass tracing config to service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- extensions/ocdav/pkg/command/server.go | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/ocdav/pkg/command/server.go b/extensions/ocdav/pkg/command/server.go index decc187d073..6e045a21aa6 100644 --- a/extensions/ocdav/pkg/command/server.go +++ b/extensions/ocdav/pkg/command/server.go @@ -47,6 +47,7 @@ func Server(cfg *config.Config) *cli.Command { ocdav.Version(version.GetString()), ocdav.Context(ctx), ocdav.Logger(logger.Logger), + ocdav.Tracing(cfg.Tracing.Endpoint, cfg.Tracing.Collector), ocdav.Address(cfg.HTTP.Addr), ocdav.FilesNamespace(cfg.FilesNamespace), ocdav.WebdavNamespace(cfg.WebdavNamespace), From 176b560274726438622020ab7a0469d4ce738c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 13 Jun 2022 11:04:06 +0000 Subject: [PATCH 2/5] properly shut down service on kill signal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- extensions/ocdav/pkg/command/server.go | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/ocdav/pkg/command/server.go b/extensions/ocdav/pkg/command/server.go index 6e045a21aa6..a3936dd42d0 100644 --- a/extensions/ocdav/pkg/command/server.go +++ b/extensions/ocdav/pkg/command/server.go @@ -90,6 +90,7 @@ func Server(cfg *config.Config) *cli.Command { } gr.Add(debugServer.ListenAndServe, func(_ error) { + _ = debugServer.Shutdown(ctx) cancel() }) From f3b53bf6d3e76bf89919b4b6822ea4e5519ca2a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 13 Jun 2022 11:04:31 +0000 Subject: [PATCH 3/5] link issue for FIXME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- extensions/ocdav/pkg/command/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/ocdav/pkg/command/server.go b/extensions/ocdav/pkg/command/server.go index a3936dd42d0..89eda157a4d 100644 --- a/extensions/ocdav/pkg/command/server.go +++ b/extensions/ocdav/pkg/command/server.go @@ -64,7 +64,7 @@ func Server(cfg *config.Config) *cli.Command { ocdav.Version(cfg.Status.Version), ocdav.VersionString(cfg.Status.VersionString), ocdav.Edition(cfg.Status.Edition), - // ocdav.FavoriteManager() // FIXME needs a proper persistence implementation + // ocdav.FavoriteManager() // FIXME needs a proper persistence implementation https://github.com/owncloud/ocis/issues/1228 // ocdav.LockSystem(), // will default to the CS3 lock system // ocdav.TLSConfig() // tls config for the http server ) From 6d809f5a21ed4ef98705ebb26e80fc2395d46663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 13 Jun 2022 11:07:26 +0000 Subject: [PATCH 4/5] add changelog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- changelog/unreleased/make-ocdav-service-behave.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/unreleased/make-ocdav-service-behave.md diff --git a/changelog/unreleased/make-ocdav-service-behave.md b/changelog/unreleased/make-ocdav-service-behave.md new file mode 100644 index 00000000000..760b8e5b18f --- /dev/null +++ b/changelog/unreleased/make-ocdav-service-behave.md @@ -0,0 +1,5 @@ +Bugfix: make ocdav service behave properly + +The ocdav service now properly passes the tracing config and shuts down when receiving a kill signal. + +https://github.com/owncloud/ocis/pull/3957 From 61257ef2918468d4518132f49325b56581bba450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 13 Jun 2022 13:24:27 +0000 Subject: [PATCH 5/5] pass tracing config only when enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- extensions/ocdav/pkg/command/server.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/extensions/ocdav/pkg/command/server.go b/extensions/ocdav/pkg/command/server.go index 89eda157a4d..2109e63039d 100644 --- a/extensions/ocdav/pkg/command/server.go +++ b/extensions/ocdav/pkg/command/server.go @@ -42,12 +42,12 @@ func Server(cfg *config.Config) *cli.Command { defer cancel() gr.Add(func() error { - s, err := ocdav.Service( - ocdav.Name(cfg.HTTP.Namespace+"."+cfg.Service.Name), + + opts := []ocdav.Option{ + ocdav.Name(cfg.HTTP.Namespace + "." + cfg.Service.Name), ocdav.Version(version.GetString()), ocdav.Context(ctx), ocdav.Logger(logger.Logger), - ocdav.Tracing(cfg.Tracing.Endpoint, cfg.Tracing.Collector), ocdav.Address(cfg.HTTP.Addr), ocdav.FilesNamespace(cfg.FilesNamespace), ocdav.WebdavNamespace(cfg.WebdavNamespace), @@ -67,7 +67,13 @@ func Server(cfg *config.Config) *cli.Command { // ocdav.FavoriteManager() // FIXME needs a proper persistence implementation https://github.com/owncloud/ocis/issues/1228 // ocdav.LockSystem(), // will default to the CS3 lock system // ocdav.TLSConfig() // tls config for the http server - ) + } + + if cfg.Tracing.Enabled { + opts = append(opts, ocdav.Tracing(cfg.Tracing.Endpoint, cfg.Tracing.Collector)) + } + + s, err := ocdav.Service(opts...) if err != nil { return err }