Skip to content

Commit 29ca1cc

Browse files
AchoArnoldAchoArnold
committed
undoing changes
1 parent 0dbd513 commit 29ca1cc

7 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎api/pkg/listeners/heartbeat_listener.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (listener *HeartbeatListener) onMessagePhoneSending(ctx context.Context, ev
5454
}
5555

5656
if _, err := listener.service.Store(ctx, storeParams); err != nil {
57-
msg := fmt.Sprintf("cannot store heartbeat with params [%+#v] for event with MessageID [%s]", storeParams, event.ID())
57+
msg := fmt.Sprintf("cannot store heartbeat with params [%+#v] for event with ID [%s]", storeParams, event.ID())
5858
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
5959
}
6060

‎api/pkg/listeners/message_listener.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func (listener *MessageListener) OnMessageAPISent(ctx context.Context, event clo
7272
}
7373

7474
if _, err := listener.service.StoreSentMessage(ctx, storeParams); err != nil {
75-
msg := fmt.Sprintf("cannot store message with ID [%s] for event with MessageID [%s]", storeParams.ID, event.ID())
75+
msg := fmt.Sprintf("cannot store message with ID [%s] for event with ID [%s]", storeParams.ID, event.ID())
7676
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
7777
}
7878

@@ -110,7 +110,7 @@ func (listener *MessageListener) OnMessagePhoneSending(ctx context.Context, even
110110
}
111111

112112
if err = listener.service.HandleMessageSending(ctx, handleParams); err != nil {
113-
msg := fmt.Sprintf("cannot handle sending for message with ID [%s] for event with MessageID [%s]", handleParams.ID, event.ID())
113+
msg := fmt.Sprintf("cannot handle sending for message with ID [%s] for event with ID [%s]", handleParams.ID, event.ID())
114114
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
115115
}
116116

@@ -148,7 +148,7 @@ func (listener *MessageListener) OnMessagePhoneSent(ctx context.Context, event c
148148
}
149149

150150
if err = listener.service.HandleMessageSent(ctx, handleParams); err != nil {
151-
msg := fmt.Sprintf("cannot handle [%s] for message with ID [%s] for event with MessageID [%s]", event.Type(), handleParams.ID, event.ID())
151+
msg := fmt.Sprintf("cannot handle [%s] for message with ID [%s] for event with ID [%s]", event.Type(), handleParams.ID, event.ID())
152152
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
153153
}
154154

@@ -186,7 +186,7 @@ func (listener *MessageListener) OnMessagePhoneDelivered(ctx context.Context, ev
186186
}
187187

188188
if err = listener.service.HandleMessageDelivered(ctx, handleParams); err != nil {
189-
msg := fmt.Sprintf("cannot handle [%s] for message with ID [%s] for event with MessageID [%s]", event.Type(), handleParams.ID, event.ID())
189+
msg := fmt.Sprintf("cannot handle [%s] for message with ID [%s] for event with ID [%s]", event.Type(), handleParams.ID, event.ID())
190190
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
191191
}
192192

@@ -225,7 +225,7 @@ func (listener *MessageListener) OnMessagePhoneFailed(ctx context.Context, event
225225
}
226226

227227
if err = listener.service.HandleMessageFailed(ctx, handleParams); err != nil {
228-
msg := fmt.Sprintf("cannot handle [%s] for message with ID [%s] for event with MessageID [%s]", event.Type(), handleParams.ID, event.ID())
228+
msg := fmt.Sprintf("cannot handle [%s] for message with ID [%s] for event with ID [%s]", event.Type(), handleParams.ID, event.ID())
229229
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
230230
}
231231

@@ -266,7 +266,7 @@ func (listener *MessageListener) OnMessagePhoneReceived(ctx context.Context, eve
266266
}
267267

268268
if _, err = listener.service.StoreReceivedMessage(ctx, storeParams); err != nil {
269-
msg := fmt.Sprintf("cannot store message with ID [%s] for event with MessageID [%s]", storeParams.ID, event.ID())
269+
msg := fmt.Sprintf("cannot store message with ID [%s] for event with ID [%s]", storeParams.ID, event.ID())
270270
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
271271
}
272272

‎api/pkg/listeners/message_thread_listener.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (listener *MessageThreadListener) OnMessageAPISent(ctx context.Context, eve
6767
}
6868

6969
if err := listener.service.UpdateThread(ctx, updateParams); err != nil {
70-
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
70+
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with ID [%s]", updateParams.MessageID, event.ID())
7171
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
7272
}
7373

@@ -95,7 +95,7 @@ func (listener *MessageThreadListener) OnMessagePhoneSending(ctx context.Context
9595
}
9696

9797
if err := listener.service.UpdateThread(ctx, updateParams); err != nil {
98-
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
98+
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with ID [%s]", updateParams.MessageID, event.ID())
9999
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
100100
}
101101

@@ -123,7 +123,7 @@ func (listener *MessageThreadListener) OnMessagePhoneSent(ctx context.Context, e
123123
}
124124

125125
if err := listener.service.UpdateThread(ctx, updateParams); err != nil {
126-
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
126+
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with ID [%s]", updateParams.MessageID, event.ID())
127127
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
128128
}
129129

@@ -151,7 +151,7 @@ func (listener *MessageThreadListener) OnMessagePhoneDelivered(ctx context.Conte
151151
}
152152

153153
if err := listener.service.UpdateThread(ctx, updateParams); err != nil {
154-
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
154+
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with ID [%s]", updateParams.MessageID, event.ID())
155155
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
156156
}
157157

@@ -179,7 +179,7 @@ func (listener *MessageThreadListener) OnMessagePhoneFailed(ctx context.Context,
179179
}
180180

181181
if err := listener.service.UpdateThread(ctx, updateParams); err != nil {
182-
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
182+
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with ID [%s]", updateParams.MessageID, event.ID())
183183
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
184184
}
185185

@@ -207,7 +207,7 @@ func (listener *MessageThreadListener) OnMessagePhoneReceived(ctx context.Contex
207207
}
208208

209209
if err := listener.service.UpdateThread(ctx, updateParams); err != nil {
210-
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
210+
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with ID [%s]", updateParams.MessageID, event.ID())
211211
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
212212
}
213213

‎api/pkg/listeners/notification_listener.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (listener *NotificationListener) onMessageAPISent(ctx context.Context, even
5757
}
5858

5959
if err := listener.service.Schedule(ctx, sendParams); err != nil {
60-
msg := fmt.Sprintf("cannot send notification with params [%s] for event with MessageID [%s]", spew.Sdump(sendParams), event.ID())
60+
msg := fmt.Sprintf("cannot send notification with params [%s] for event with ID [%s]", spew.Sdump(sendParams), event.ID())
6161
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
6262
}
6363

@@ -85,7 +85,7 @@ func (listener *NotificationListener) onMessageNotificationScheduled(ctx context
8585
}
8686

8787
if err := listener.service.Send(ctx, scheduleParams); err != nil {
88-
msg := fmt.Sprintf("cannot schedule notification with params [%s] for event with MessageID [%s]", spew.Sdump(scheduleParams), event.ID())
88+
msg := fmt.Sprintf("cannot schedule notification with params [%s] for event with ID [%s]", spew.Sdump(scheduleParams), event.ID())
8989
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
9090
}
9191

‎api/pkg/middlewares/api_key_auth_middleware.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func APIKeyAuth(logger telemetry.Logger, tracer telemetry.Tracer, userRepository
3333

3434
c.Locals(ContextKeyAuthUserID, authUser)
3535

36-
ctxLogger.Info(fmt.Sprintf("[%T] set successfully for user with MessageID [%s]", authUser, authUser.ID))
36+
ctxLogger.Info(fmt.Sprintf("[%T] set successfully for user with ID [%s]", authUser, authUser.ID))
3737

3838
return c.Next()
3939
}

‎api/pkg/middlewares/bearer_auth_middleware.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func BearerAuth(logger telemetry.Logger, tracer telemetry.Tracer, authClient *au
4747

4848
c.Locals(ContextKeyAuthUserID, authUser)
4949

50-
ctxLogger.Info(fmt.Sprintf("[%T] set successfully for user with MessageID [%s]", authUser, authUser.ID))
50+
ctxLogger.Info(fmt.Sprintf("[%T] set successfully for user with ID [%s]", authUser, authUser.ID))
5151
return c.Next()
5252
}
5353
}

‎api/pkg/services/event_dispatcher_service.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func (dispatcher *EventDispatcher) Dispatch(ctx context.Context, event cloudeven
4949
defer span.End()
5050

5151
if err := dispatcher.repository.Save(ctx, event); err != nil {
52-
msg := fmt.Sprintf("cannot save event with MessageID [%s] and type [%s]", event.ID(), event.Type())
52+
msg := fmt.Sprintf("cannot save event with ID [%s] and type [%s]", event.ID(), event.Type())
5353
return dispatcher.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
5454
}
5555

@@ -69,7 +69,7 @@ func (dispatcher *EventDispatcher) DispatchWithTimeout(ctx context.Context, even
6969
}
7070

7171
if err = dispatcher.queue.Enqueue(ctx, task, timeout); err != nil {
72-
msg := fmt.Sprintf("cannot enqueue event with MessageID [%s] and type [%s]", event.ID(), event.Type())
72+
msg := fmt.Sprintf("cannot enqueue event with ID [%s] and type [%s]", event.ID(), event.Type())
7373
return dispatcher.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
7474
}
7575

0 commit comments

Comments
 (0)