Skip to content

Commit 4ccb49a

Browse files
felixgaterufelixgateru
committed
refactor(logging.go): use in err.Error() in logging
Signed-off-by: Felix Gateru <[email protected]>
1 parent fa5b6b8 commit 4ccb49a

File tree

8 files changed

+65
-65
lines changed

8 files changed

+65
-65
lines changed

‎auth/api/logging.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (lm *loggingMiddleware) Issue(ctx context.Context, token string, key auth.K
3636
),
3737
}
3838
if err != nil {
39-
args = append(args, slog.Any("error", err))
39+
args = append(args, slog.String("error", err.Error()))
4040
lm.logger.Warn("Issue key failed", args...)
4141
return
4242
}
@@ -53,7 +53,7 @@ func (lm *loggingMiddleware) Revoke(ctx context.Context, token, id string) (err
5353
slog.String("key_id", id),
5454
}
5555
if err != nil {
56-
args = append(args, slog.Any("error", err))
56+
args = append(args, slog.String("error", err.Error()))
5757
lm.logger.Warn("Revoke key failed", args...)
5858
return
5959
}
@@ -70,7 +70,7 @@ func (lm *loggingMiddleware) RetrieveKey(ctx context.Context, token, id string)
7070
slog.String("key_id", id),
7171
}
7272
if err != nil {
73-
args = append(args, slog.Any("error", err))
73+
args = append(args, slog.String("error", err.Error()))
7474
lm.logger.Warn("Retrieve key failed", args...)
7575
return
7676
}
@@ -90,7 +90,7 @@ func (lm *loggingMiddleware) Identify(ctx context.Context, token string) (id aut
9090
),
9191
}
9292
if err != nil {
93-
args = append(args, slog.Any("error", err))
93+
args = append(args, slog.String("error", err.Error()))
9494
lm.logger.Warn("Identify key failed", args...)
9595
return
9696
}
@@ -116,7 +116,7 @@ func (lm *loggingMiddleware) Authorize(ctx context.Context, pr policies.Policy)
116116
slog.String("permission", pr.Permission),
117117
}
118118
if err != nil {
119-
args = append(args, slog.Any("error", err))
119+
args = append(args, slog.String("error", err.Error()))
120120
lm.logger.Warn("Authorize failed", args...)
121121
return
122122
}
@@ -134,7 +134,7 @@ func (lm *loggingMiddleware) CreatePAT(ctx context.Context, token, name, descrip
134134
slog.String("pat_duration", duration.String()),
135135
}
136136
if err != nil {
137-
args = append(args, slog.Any("error", err))
137+
args = append(args, slog.String("error", err.Error()))
138138
lm.logger.Warn("Create PAT failed", args...)
139139
return
140140
}
@@ -151,7 +151,7 @@ func (lm *loggingMiddleware) UpdatePATName(ctx context.Context, token, patID, na
151151
slog.String("name", name),
152152
}
153153
if err != nil {
154-
args = append(args, slog.Any("error", err))
154+
args = append(args, slog.String("error", err.Error()))
155155
lm.logger.Warn("Update PAT name failed", args...)
156156
return
157157
}
@@ -168,7 +168,7 @@ func (lm *loggingMiddleware) UpdatePATDescription(ctx context.Context, token, pa
168168
slog.String("description", description),
169169
}
170170
if err != nil {
171-
args = append(args, slog.Any("error", err))
171+
args = append(args, slog.String("error", err.Error()))
172172
lm.logger.Warn("Update PAT description failed", args...)
173173
return
174174
}
@@ -184,7 +184,7 @@ func (lm *loggingMiddleware) RetrievePAT(ctx context.Context, token, patID strin
184184
slog.String("pat_id", patID),
185185
}
186186
if err != nil {
187-
args = append(args, slog.Any("error", err))
187+
args = append(args, slog.String("error", err.Error()))
188188
lm.logger.Warn("Retrieve PAT failed", args...)
189189
return
190190
}
@@ -201,7 +201,7 @@ func (lm *loggingMiddleware) ListPATS(ctx context.Context, token string, pm auth
201201
slog.Uint64("offset", pm.Offset),
202202
}
203203
if err != nil {
204-
args = append(args, slog.Any("error", err))
204+
args = append(args, slog.String("error", err.Error()))
205205
lm.logger.Warn("List PATS failed", args...)
206206
return
207207
}
@@ -219,7 +219,7 @@ func (lm *loggingMiddleware) ListScopes(ctx context.Context, token string, pm au
219219
slog.String("pat_id", pm.PatID),
220220
}
221221
if err != nil {
222-
args = append(args, slog.Any("error", err))
222+
args = append(args, slog.String("error", err.Error()))
223223
lm.logger.Warn("List Scopes failed", args...)
224224
return
225225
}
@@ -235,7 +235,7 @@ func (lm *loggingMiddleware) DeletePAT(ctx context.Context, token, patID string)
235235
slog.String("pat_id", patID),
236236
}
237237
if err != nil {
238-
args = append(args, slog.Any("error", err))
238+
args = append(args, slog.String("error", err.Error()))
239239
lm.logger.Warn("Delete PAT failed", args...)
240240
return
241241
}
@@ -252,7 +252,7 @@ func (lm *loggingMiddleware) ResetPATSecret(ctx context.Context, token, patID st
252252
slog.String("pat_duration", duration.String()),
253253
}
254254
if err != nil {
255-
args = append(args, slog.Any("error", err))
255+
args = append(args, slog.String("error", err.Error()))
256256
lm.logger.Warn("Reset PAT secret failed", args...)
257257
return
258258
}
@@ -268,7 +268,7 @@ func (lm *loggingMiddleware) RevokePATSecret(ctx context.Context, token, patID s
268268
slog.String("pat_id", patID),
269269
}
270270
if err != nil {
271-
args = append(args, slog.Any("error", err))
271+
args = append(args, slog.String("error", err.Error()))
272272
lm.logger.Warn("Revoke PAT secret failed", args...)
273273
return
274274
}
@@ -283,7 +283,7 @@ func (lm *loggingMiddleware) RemoveAllPAT(ctx context.Context, token string) (er
283283
slog.String("duration", time.Since(begin).String()),
284284
}
285285
if err != nil {
286-
args = append(args, slog.Any("error", err))
286+
args = append(args, slog.String("error", err.Error()))
287287
lm.logger.Warn("Remove all PAT failed", args...)
288288
return
289289
}
@@ -308,7 +308,7 @@ func (lm *loggingMiddleware) AddScope(ctx context.Context, token, patID string,
308308
slog.Group("scope", groupArgs...),
309309
}
310310
if err != nil {
311-
args = append(args, slog.Any("error", err))
311+
args = append(args, slog.String("error", err.Error()))
312312
lm.logger.Warn("Add PAT scope failed", args...)
313313
return
314314
}
@@ -329,7 +329,7 @@ func (lm *loggingMiddleware) RemoveScope(ctx context.Context, token, patID strin
329329
slog.Group("scope", groupArgs...),
330330
}
331331
if err != nil {
332-
args = append(args, slog.Any("error", err))
332+
args = append(args, slog.String("error", err.Error()))
333333
lm.logger.Warn("Remove entry from PAT scope failed", args...)
334334
return
335335
}
@@ -345,7 +345,7 @@ func (lm *loggingMiddleware) RemovePATAllScope(ctx context.Context, token, patID
345345
slog.String("pat_id", patID),
346346
}
347347
if err != nil {
348-
args = append(args, slog.Any("error", err))
348+
args = append(args, slog.String("error", err.Error()))
349349
lm.logger.Warn("Remove all scopes from PAT failed", args...)
350350
return
351351
}
@@ -360,7 +360,7 @@ func (lm *loggingMiddleware) IdentifyPAT(ctx context.Context, paToken string) (p
360360
slog.String("duration", time.Since(begin).String()),
361361
}
362362
if err != nil {
363-
args = append(args, slog.Any("error", err))
363+
args = append(args, slog.String("error", err.Error()))
364364
lm.logger.Warn("Identify PAT failed", args...)
365365
return
366366
}
@@ -379,7 +379,7 @@ func (lm *loggingMiddleware) AuthorizePAT(ctx context.Context, userID, patID str
379379
slog.String("entities", entityID),
380380
}
381381
if err != nil {
382-
args = append(args, slog.Any("error", err))
382+
args = append(args, slog.String("error", err.Error()))
383383
lm.logger.Warn("Authorize PAT failed complete successfully", args...)
384384
return
385385
}

‎certs/api/logging.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (lm *loggingMiddleware) IssueCert(ctx context.Context, domainID, token, cli
3737
slog.String("ttl", ttl),
3838
}
3939
if err != nil {
40-
args = append(args, slog.Any("error", err))
40+
args = append(args, slog.String("error", err.Error()))
4141
lm.logger.Warn("Issue certificate failed", args...)
4242
return
4343
}
@@ -61,7 +61,7 @@ func (lm *loggingMiddleware) ListCerts(ctx context.Context, clientID string, pm
6161
),
6262
}
6363
if err != nil {
64-
args = append(args, slog.Any("error", err))
64+
args = append(args, slog.String("error", err.Error()))
6565
lm.logger.Warn("List certificates failed", args...)
6666
return
6767
}
@@ -87,7 +87,7 @@ func (lm *loggingMiddleware) ListSerials(ctx context.Context, clientID string, p
8787
),
8888
}
8989
if err != nil {
90-
args = append(args, slog.Any("error", err))
90+
args = append(args, slog.String("error", err.Error()))
9191
lm.logger.Warn("List certifcates serials failed", args...)
9292
return
9393
}
@@ -107,7 +107,7 @@ func (lm *loggingMiddleware) ViewCert(ctx context.Context, serialID string) (c c
107107
slog.String("serial_id", serialID),
108108
}
109109
if err != nil {
110-
args = append(args, slog.Any("error", err))
110+
args = append(args, slog.String("error", err.Error()))
111111
lm.logger.Warn("View certificate failed", args...)
112112
return
113113
}
@@ -127,7 +127,7 @@ func (lm *loggingMiddleware) RevokeCert(ctx context.Context, domainID, token, cl
127127
slog.String("client_id", clientID),
128128
}
129129
if err != nil {
130-
args = append(args, slog.Any("error", err))
130+
args = append(args, slog.String("error", err.Error()))
131131
lm.logger.Warn("Revoke certificate failed", args...)
132132
return
133133
}

‎coap/api/logging.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func (lm *loggingMiddleware) Publish(ctx context.Context, key string, msg *messa
3939
args = append(args, slog.String("subtopic", msg.GetSubtopic()))
4040
}
4141
if err != nil {
42-
args = append(args, slog.Any("error", err))
42+
args = append(args, slog.String("error", err.Error()))
4343
lm.logger.Warn("Publish message failed", args...)
4444
return
4545
}
@@ -62,7 +62,7 @@ func (lm *loggingMiddleware) Subscribe(ctx context.Context, key, domainID, chanI
6262
args = append(args, slog.String("subtopic", subtopic))
6363
}
6464
if err != nil {
65-
args = append(args, slog.Any("error", err))
65+
args = append(args, slog.String("error", err.Error()))
6666
lm.logger.Warn("Subscribe failed", args...)
6767
return
6868
}
@@ -85,7 +85,7 @@ func (lm *loggingMiddleware) Unsubscribe(ctx context.Context, key, domainID, cha
8585
args = append(args, slog.String("subtopic", subtopic))
8686
}
8787
if err != nil {
88-
args = append(args, slog.Any("error", err))
88+
args = append(args, slog.String("error", err.Error()))
8989
lm.logger.Warn("Unsubscribe failed", args...)
9090
return
9191
}
@@ -109,7 +109,7 @@ func (lm *loggingMiddleware) DisconnectHandler(ctx context.Context, domainID, ch
109109
args = append(args, slog.String("subtopic", subtopic))
110110
}
111111
if err != nil {
112-
args = append(args, slog.Any("error", err))
112+
args = append(args, slog.String("error", err.Error()))
113113
lm.logger.Warn("Unsubscribe failed", args...)
114114
return
115115
}

‎domains/middleware/logging.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func (lm *loggingMiddleware) SendInvitation(ctx context.Context, session authn.S
183183
slog.String("domain_id", invitation.DomainID),
184184
}
185185
if err != nil {
186-
args = append(args, slog.Any("error", err))
186+
args = append(args, slog.String("error", err.Error()))
187187
lm.logger.Warn("Send invitation failed", args...)
188188
return
189189
}
@@ -200,7 +200,7 @@ func (lm *loggingMiddleware) ViewInvitation(ctx context.Context, session authn.S
200200
slog.String("domain_id", domainID),
201201
}
202202
if err != nil {
203-
args = append(args, slog.Any("error", err))
203+
args = append(args, slog.String("error", err.Error()))
204204
lm.logger.Warn("View invitation failed", args...)
205205
return
206206
}
@@ -220,7 +220,7 @@ func (lm *loggingMiddleware) ListInvitations(ctx context.Context, session authn.
220220
),
221221
}
222222
if err != nil {
223-
args = append(args, slog.Any("error", err))
223+
args = append(args, slog.String("error", err.Error()))
224224
lm.logger.Warn("List invitations failed", args...)
225225
return
226226
}
@@ -240,7 +240,7 @@ func (lm *loggingMiddleware) ListDomainInvitations(ctx context.Context, session
240240
),
241241
}
242242
if err != nil {
243-
args = append(args, slog.Any("error", err))
243+
args = append(args, slog.String("error", err.Error()))
244244
lm.logger.Warn("List domain invitations failed", args...)
245245
return
246246
}
@@ -256,7 +256,7 @@ func (lm *loggingMiddleware) AcceptInvitation(ctx context.Context, session authn
256256
slog.String("domain_id", domainID),
257257
}
258258
if err != nil {
259-
args = append(args, slog.Any("error", err))
259+
args = append(args, slog.String("error", err.Error()))
260260
lm.logger.Warn("Accept invitation failed", args...)
261261
return
262262
}
@@ -272,7 +272,7 @@ func (lm *loggingMiddleware) RejectInvitation(ctx context.Context, session authn
272272
slog.String("domain_id", domainID),
273273
}
274274
if err != nil {
275-
args = append(args, slog.Any("error", err))
275+
args = append(args, slog.String("error", err.Error()))
276276
lm.logger.Warn("Reject invitation failed", args...)
277277
return
278278
}
@@ -289,7 +289,7 @@ func (lm *loggingMiddleware) DeleteInvitation(ctx context.Context, session authn
289289
slog.String("domain_id", domainID),
290290
}
291291
if err != nil {
292-
args = append(args, slog.Any("error", err))
292+
args = append(args, slog.String("error", err.Error()))
293293
lm.logger.Warn("Delete invitation failed", args...)
294294
return
295295
}

‎journal/middleware/logging.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func (lm *loggingMiddleware) Save(ctx context.Context, j journal.Journal) (err e
3939
),
4040
}
4141
if err != nil {
42-
args = append(args, slog.Any("error", err))
42+
args = append(args, slog.String("error", err.Error()))
4343
lm.logger.Warn("Save journal failed", args...)
4444
return
4545
}
@@ -63,7 +63,7 @@ func (lm *loggingMiddleware) RetrieveAll(ctx context.Context, session smqauthn.S
6363
),
6464
}
6565
if err != nil {
66-
args = append(args, slog.Any("error", err))
66+
args = append(args, slog.String("error", err.Error()))
6767
lm.logger.Warn("Retrieve all journals failed", args...)
6868
return
6969
}
@@ -82,7 +82,7 @@ func (lm *loggingMiddleware) RetrieveClientTelemetry(ctx context.Context, sessio
8282
slog.String("domain_id", session.DomainID),
8383
}
8484
if err != nil {
85-
args = append(args, slog.Any("error", err))
85+
args = append(args, slog.String("error", err.Error()))
8686
lm.logger.Warn("Retrieve client telemetry failed", args...)
8787
return
8888
}

‎pkg/messaging/handler/logging.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func (lm *loggingMiddleware) logAction(action string, topics *[]string, t time.T
8282
args = append(args, slog.Any("topics", *topics))
8383
}
8484
if err != nil {
85-
args = append(args, slog.Any("error", err))
85+
args = append(args, slog.String("error", err.Error()))
8686
lm.logger.Warn(action+" failed", args...)
8787
return
8888
}

0 commit comments

Comments
 (0)