[v11.0.x] IDFowrarding: ignore logging context canceled errors (#86187)
IDFowrarding: ignore logging context canceled errors (#85141)
(cherry picked from commit 2f5e3023c2)
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
This commit is contained in:
co-authored by
Karl Persson
parent
3547c55b52
commit
232798e0d0
@@ -159,8 +159,10 @@ func (s *Service) hook(ctx context.Context, identity *authn.Identity, _ *authn.R
|
||||
// FIXME(kalleep): we should probably lazy load this
|
||||
token, err := s.SignIdentity(ctx, identity)
|
||||
if err != nil {
|
||||
namespace, id := identity.GetNamespacedID()
|
||||
s.logger.FromContext(ctx).Error("Failed to sign id token", "err", err, "namespace", namespace, "id", id)
|
||||
if shouldLogErr(err) {
|
||||
namespace, id := identity.GetNamespacedID()
|
||||
s.logger.FromContext(ctx).Error("Failed to sign id token", "err", err, "namespace", namespace, "id", id)
|
||||
}
|
||||
// for now don't return error so we don't break authentication from this hook
|
||||
return nil
|
||||
}
|
||||
@@ -180,3 +182,7 @@ func getSubject(namespace, identifier string) string {
|
||||
func prefixCacheKey(key string) string {
|
||||
return fmt.Sprintf("%s-%s", cachePrefix, key)
|
||||
}
|
||||
|
||||
func shouldLogErr(err error) bool {
|
||||
return !errors.Is(err, context.Canceled)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user