opensource/magistrala
1
0
Fork 0
mirror of https://github.com/absmach/magistrala.git synced 2026-06-23 04:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SMQ-2260 - Log full errors in logging middleware (#3003)

Browse Source 
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
This commit is contained in:
Felix Gateru
2025-07-09 16:21:16 +03:00
committed by GitHub
parent fa5b6b86c6
commit 1c0400d3a5
8 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
auth/api/logging.go
+20 -20
View File
@@ -36,7 +36,7 @@ func (lm *loggingMiddleware) Issue(ctx context.Context, token string, key auth.K
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Issue key failed", args...)
return
}
@@ -53,7 +53,7 @@ func (lm *loggingMiddleware) Revoke(ctx context.Context, token, id string) (err
slog.String("key_id", id),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Revoke key failed", args...)
return
}
@@ -70,7 +70,7 @@ func (lm *loggingMiddleware) RetrieveKey(ctx context.Context, token, id string)
slog.String("key_id", id),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Retrieve key failed", args...)
return
}
@@ -90,7 +90,7 @@ func (lm *loggingMiddleware) Identify(ctx context.Context, token string) (id aut
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Identify key failed", args...)
return
}
@@ -116,7 +116,7 @@ func (lm *loggingMiddleware) Authorize(ctx context.Context, pr policies.Policy)
slog.String("permission", pr.Permission),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Authorize failed", args...)
return
}
@@ -134,7 +134,7 @@ func (lm *loggingMiddleware) CreatePAT(ctx context.Context, token, name, descrip
slog.String("pat_duration", duration.String()),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Create PAT failed", args...)
return
}
@@ -151,7 +151,7 @@ func (lm *loggingMiddleware) UpdatePATName(ctx context.Context, token, patID, na
slog.String("name", name),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Update PAT name failed", args...)
return
}
@@ -168,7 +168,7 @@ func (lm *loggingMiddleware) UpdatePATDescription(ctx context.Context, token, pa
slog.String("description", description),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Update PAT description failed", args...)
return
}
@@ -184,7 +184,7 @@ func (lm *loggingMiddleware) RetrievePAT(ctx context.Context, token, patID strin
slog.String("pat_id", patID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Retrieve PAT failed", args...)
return
}
@@ -201,7 +201,7 @@ func (lm *loggingMiddleware) ListPATS(ctx context.Context, token string, pm auth
slog.Uint64("offset", pm.Offset),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("List PATS failed", args...)
return
}
@@ -219,7 +219,7 @@ func (lm *loggingMiddleware) ListScopes(ctx context.Context, token string, pm au
slog.String("pat_id", pm.PatID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("List Scopes failed", args...)
return
}
@@ -235,7 +235,7 @@ func (lm *loggingMiddleware) DeletePAT(ctx context.Context, token, patID string)
slog.String("pat_id", patID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Delete PAT failed", args...)
return
}
@@ -252,7 +252,7 @@ func (lm *loggingMiddleware) ResetPATSecret(ctx context.Context, token, patID st
slog.String("pat_duration", duration.String()),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Reset PAT secret failed", args...)
return
}
@@ -268,7 +268,7 @@ func (lm *loggingMiddleware) RevokePATSecret(ctx context.Context, token, patID s
slog.String("pat_id", patID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Revoke PAT secret failed", args...)
return
}
@@ -283,7 +283,7 @@ func (lm *loggingMiddleware) RemoveAllPAT(ctx context.Context, token string) (er
slog.String("duration", time.Since(begin).String()),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Remove all PAT failed", args...)
return
}
@@ -308,7 +308,7 @@ func (lm *loggingMiddleware) AddScope(ctx context.Context, token, patID string,
slog.Group("scope", groupArgs...),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Add PAT scope failed", args...)
return
}
@@ -329,7 +329,7 @@ func (lm *loggingMiddleware) RemoveScope(ctx context.Context, token, patID strin
slog.Group("scope", groupArgs...),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Remove entry from PAT scope failed", args...)
return
}
@@ -345,7 +345,7 @@ func (lm *loggingMiddleware) RemovePATAllScope(ctx context.Context, token, patID
slog.String("pat_id", patID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Remove all scopes from PAT failed", args...)
return
}
@@ -360,7 +360,7 @@ func (lm *loggingMiddleware) IdentifyPAT(ctx context.Context, paToken string) (p
slog.String("duration", time.Since(begin).String()),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Identify PAT failed", args...)
return
}
@@ -379,7 +379,7 @@ func (lm *loggingMiddleware) AuthorizePAT(ctx context.Context, userID, patID str
slog.String("entities", entityID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Authorize PAT failed complete successfully", args...)
return
}
certs/api/logging.go
+5 -5
View File
@@ -37,7 +37,7 @@ func (lm *loggingMiddleware) IssueCert(ctx context.Context, domainID, token, cli
slog.String("ttl", ttl),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Issue certificate failed", args...)
return
}
@@ -61,7 +61,7 @@ func (lm *loggingMiddleware) ListCerts(ctx context.Context, clientID string, pm
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("List certificates failed", args...)
return
}
@@ -87,7 +87,7 @@ func (lm *loggingMiddleware) ListSerials(ctx context.Context, clientID string, p
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("List certifcates serials failed", args...)
return
}
@@ -107,7 +107,7 @@ func (lm *loggingMiddleware) ViewCert(ctx context.Context, serialID string) (c c
slog.String("serial_id", serialID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("View certificate failed", args...)
return
}
@@ -127,7 +127,7 @@ func (lm *loggingMiddleware) RevokeCert(ctx context.Context, domainID, token, cl
slog.String("client_id", clientID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Revoke certificate failed", args...)
return
}
coap/api/logging.go
+4 -4
View File
@@ -39,7 +39,7 @@ func (lm *loggingMiddleware) Publish(ctx context.Context, key string, msg *messa
args = append(args, slog.String("subtopic", msg.GetSubtopic()))
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Publish message failed", args...)
return
}
@@ -62,7 +62,7 @@ func (lm *loggingMiddleware) Subscribe(ctx context.Context, key, domainID, chanI
args = append(args, slog.String("subtopic", subtopic))
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Subscribe failed", args...)
return
}
@@ -85,7 +85,7 @@ func (lm *loggingMiddleware) Unsubscribe(ctx context.Context, key, domainID, cha
args = append(args, slog.String("subtopic", subtopic))
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Unsubscribe failed", args...)
return
}
@@ -109,7 +109,7 @@ func (lm *loggingMiddleware) DisconnectHandler(ctx context.Context, domainID, ch
args = append(args, slog.String("subtopic", subtopic))
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Unsubscribe failed", args...)
return
}
domains/middleware/logging.go
+7 -7
View File
@@ -183,7 +183,7 @@ func (lm *loggingMiddleware) SendInvitation(ctx context.Context, session authn.S
slog.String("domain_id", invitation.DomainID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Send invitation failed", args...)
return
}
@@ -200,7 +200,7 @@ func (lm *loggingMiddleware) ViewInvitation(ctx context.Context, session authn.S
slog.String("domain_id", domainID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("View invitation failed", args...)
return
}
@@ -220,7 +220,7 @@ func (lm *loggingMiddleware) ListInvitations(ctx context.Context, session authn.
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("List invitations failed", args...)
return
}
@@ -240,7 +240,7 @@ func (lm *loggingMiddleware) ListDomainInvitations(ctx context.Context, session
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("List domain invitations failed", args...)
return
}
@@ -256,7 +256,7 @@ func (lm *loggingMiddleware) AcceptInvitation(ctx context.Context, session authn
slog.String("domain_id", domainID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Accept invitation failed", args...)
return
}
@@ -272,7 +272,7 @@ func (lm *loggingMiddleware) RejectInvitation(ctx context.Context, session authn
slog.String("domain_id", domainID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Reject invitation failed", args...)
return
}
@@ -289,7 +289,7 @@ func (lm *loggingMiddleware) DeleteInvitation(ctx context.Context, session authn
slog.String("domain_id", domainID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Delete invitation failed", args...)
return
}
journal/middleware/logging.go
+3 -3
View File
@@ -39,7 +39,7 @@ func (lm *loggingMiddleware) Save(ctx context.Context, j journal.Journal) (err e
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Save journal failed", args...)
return
}
@@ -63,7 +63,7 @@ func (lm *loggingMiddleware) RetrieveAll(ctx context.Context, session smqauthn.S
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Retrieve all journals failed", args...)
return
}
@@ -82,7 +82,7 @@ func (lm *loggingMiddleware) RetrieveClientTelemetry(ctx context.Context, sessio
slog.String("domain_id", session.DomainID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Retrieve client telemetry failed", args...)
return
}
pkg/messaging/handler/logging.go
+1 -1
View File
@@ -82,7 +82,7 @@ func (lm *loggingMiddleware) logAction(action string, topics *[]string, t time.T
args = append(args, slog.Any("topics", *topics))
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn(action+" failed", args...)
return
}
users/middleware/logging.go
+23 -23
View File
@@ -40,7 +40,7 @@ func (lm *loggingMiddleware) Register(ctx context.Context, session authn.Session
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Register user failed", args...)
return
}
@@ -62,7 +62,7 @@ func (lm *loggingMiddleware) IssueToken(ctx context.Context, username, secret st
args = append(args, slog.String("access_type", t.AccessType))
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Issue token failed", args...)
return
}
@@ -83,7 +83,7 @@ func (lm *loggingMiddleware) RefreshToken(ctx context.Context, session authn.Ses
args = append(args, slog.String("access_type", t.AccessType))
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Refresh token failed", args...)
return
}
@@ -104,7 +104,7 @@ func (lm *loggingMiddleware) View(ctx context.Context, session authn.Session, id
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("View user failed", args...)
return
}
@@ -126,7 +126,7 @@ func (lm *loggingMiddleware) ViewProfile(ctx context.Context, session authn.Sess
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("View profile failed", args...)
return
}
@@ -149,7 +149,7 @@ func (lm *loggingMiddleware) ListUsers(ctx context.Context, session authn.Sessio
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("List users failed", args...)
return
}
@@ -171,7 +171,7 @@ func (lm *loggingMiddleware) SearchUsers(ctx context.Context, cp users.Page) (mp
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Search users failed to complete successfully", args...)
return
}
@@ -196,7 +196,7 @@ func (lm *loggingMiddleware) Update(ctx context.Context, session authn.Session,
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Update user failed", args...)
return
}
@@ -218,7 +218,7 @@ func (lm *loggingMiddleware) UpdateTags(ctx context.Context, session authn.Sessi
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Update user tags failed", args...)
return
}
@@ -240,7 +240,7 @@ func (lm *loggingMiddleware) UpdateEmail(ctx context.Context, session authn.Sess
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Update user email failed", args...)
return
}
@@ -261,7 +261,7 @@ func (lm *loggingMiddleware) UpdateSecret(ctx context.Context, session authn.Ses
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Update user secret failed", args...)
return
}
@@ -283,7 +283,7 @@ func (lm *loggingMiddleware) UpdateUsername(ctx context.Context, session authn.S
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Update user names failed", args...)
return
}
@@ -305,7 +305,7 @@ func (lm *loggingMiddleware) UpdateProfilePicture(ctx context.Context, session a
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Update profile picture failed", args...)
return
}
@@ -324,7 +324,7 @@ func (lm *loggingMiddleware) GenerateResetToken(ctx context.Context, email, host
slog.String("host", host),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Generate reset token failed", args...)
return
}
@@ -342,7 +342,7 @@ func (lm *loggingMiddleware) ResetSecret(ctx context.Context, session authn.Sess
slog.String("request_id", middleware.GetReqID(ctx)),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Reset secret failed", args...)
return
}
@@ -361,7 +361,7 @@ func (lm *loggingMiddleware) SendPasswordReset(ctx context.Context, host, email,
slog.String("host", host),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Send password reset failed", args...)
return
}
@@ -383,7 +383,7 @@ func (lm *loggingMiddleware) UpdateRole(ctx context.Context, session authn.Sessi
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Update user role failed", args...)
return
}
@@ -404,7 +404,7 @@ func (lm *loggingMiddleware) Enable(ctx context.Context, session authn.Session,
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Enable user failed", args...)
return
}
@@ -425,7 +425,7 @@ func (lm *loggingMiddleware) Disable(ctx context.Context, session authn.Session,
),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Disable user failed", args...)
return
}
@@ -443,7 +443,7 @@ func (lm *loggingMiddleware) Identify(ctx context.Context, session authn.Session
slog.String("user_id", id),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Identify user failed", args...)
return
}
@@ -460,7 +460,7 @@ func (lm *loggingMiddleware) OAuthCallback(ctx context.Context, user users.User)
slog.String("user_id", user.ID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("OAuth callback failed", args...)
return
}
@@ -478,7 +478,7 @@ func (lm *loggingMiddleware) Delete(ctx context.Context, session authn.Session,
slog.String("user_id", id),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Delete user failed to complete successfully", args...)
return
}
@@ -496,7 +496,7 @@ func (lm *loggingMiddleware) OAuthAddUserPolicy(ctx context.Context, user users.
slog.String("user_id", user.ID),
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Add user policy failed", args...)
return
}
ws/api/logging.go
+2 -2
View File
@@ -37,7 +37,7 @@ func (lm *loggingMiddleware) Subscribe(ctx context.Context, sessionID, clientKey
args = append(args, "subtopic", subtopic)
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Subscribe failed", args...)
return
}
@@ -59,7 +59,7 @@ func (lm *loggingMiddleware) Unsubscribe(ctx context.Context, sessionID, domainI
args = append(args, "subtopic", subtopic)
}
if err != nil {
args = append(args, slog.Any("error", err))
args = append(args, slog.String("error", err.Error()))
lm.logger.Warn("Unsubscribe failed", args...)
return
}