From b45a442447bb77e9f86e85b4ed04a3355438b003 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sat, 19 Mar 2022 18:28:27 +0100 Subject: [PATCH] outposts/ldap: fix contexts Signed-off-by: Jens Langhammer --- internal/outpost/ldap/search/direct/direct.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/outpost/ldap/search/direct/direct.go b/internal/outpost/ldap/search/direct/direct.go index a7be9b2f5..5895ee288 100644 --- a/internal/outpost/ldap/search/direct/direct.go +++ b/internal/outpost/ldap/search/direct/direct.go @@ -116,12 +116,12 @@ func (ds *DirectSearcher) Search(req *search.Request) (ldap.ServerSearchResult, var users *[]api.User var groups *[]api.Group - errs, _ := errgroup.WithContext(req.Context()) + errs, errCtx := errgroup.WithContext(req.Context()) if needUsers { errs.Go(func() error { if flags.CanSearch { - uapisp := sentry.StartSpan(req.Context(), "authentik.providers.ldap.search.api_user") + uapisp := sentry.StartSpan(errCtx, "authentik.providers.ldap.search.api_user") searchReq, skip := utils.ParseFilterForUser(c.CoreApi.CoreUsersList(uapisp.Context()), parsedFilter, false) if skip { @@ -140,8 +140,8 @@ func (ds *DirectSearcher) Search(req *search.Request) (ldap.ServerSearchResult, users = &u.Results } else { if flags.UserInfo == nil { - uapisp := sentry.StartSpan(req.Context(), "authentik.providers.ldap.search.api_user") - u, _, err := c.CoreApi.CoreUsersRetrieve(req.Context(), flags.UserPk).Execute() + uapisp := sentry.StartSpan(errCtx, "authentik.providers.ldap.search.api_user") + u, _, err := c.CoreApi.CoreUsersRetrieve(uapisp.Context(), flags.UserPk).Execute() uapisp.Finish() if err != nil { @@ -164,7 +164,7 @@ func (ds *DirectSearcher) Search(req *search.Request) (ldap.ServerSearchResult, if needGroups { errs.Go(func() error { - gapisp := sentry.StartSpan(req.Context(), "authentik.providers.ldap.search.api_group") + gapisp := sentry.StartSpan(errCtx, "authentik.providers.ldap.search.api_group") searchReq, skip := utils.ParseFilterForGroup(c.CoreApi.CoreGroupsList(gapisp.Context()), parsedFilter, false) if skip { req.Log().Trace("Skip backend request")