Skip to content

Send and receive SMS messages using your Android phone programmatically via a simple HTTP API

Remove excessive logging

Acho Arnolde99d1f130c92
diff --git a/api/pkg/middlewares/api_key_auth_middleware.go b/api/pkg/middlewares/api_key_auth_middleware.go
index 17ac4335..d971c94a 100644
--- a/api/pkg/middlewares/api_key_auth_middleware.go
+++ b/api/pkg/middlewares/api_key_auth_middleware.go
@@ -33,7 +33,6 @@ func APIKeyAuth(logger telemetry.Logger, tracer telemetry.Tracer, userRepository
}
c.Locals(ContextKeyAuthUserID, authUser)
- ctxLogger.Info(fmt.Sprintf("[%T] set successfully for user with ID [%s]", authUser, authUser.ID))
return c.Next()
}
}
diff --git a/api/pkg/middlewares/bearer_api_key_auth_middleware.go b/api/pkg/middlewares/bearer_api_key_auth_middleware.go
index 2b1dc1c2..1babbd25 100644
--- a/api/pkg/middlewares/bearer_api_key_auth_middleware.go
+++ b/api/pkg/middlewares/bearer_api_key_auth_middleware.go
@@ -15,11 +15,9 @@ func BearerAPIKeyAuth(logger telemetry.Logger, tracer telemetry.Tracer, userRepo
logger = logger.WithService("middlewares.APIKeyAuth")
return func(c *fiber.Ctx) error {
- ctx, span := tracer.StartFromFiberCtx(c, "middlewares.APIKeyAuth")
+ ctx, span, _ := tracer.StartFromFiberCtxWithLogger(c, logger, "middlewares.APIKeyAuth")
defer span.End()
- ctxLogger := tracer.CtxLogger(logger, span)
-
apiKey := strings.TrimSpace(strings.Replace(c.Get(authHeaderBearer), bearerScheme, "", 1))
if len(apiKey) == 0 {
span.AddEvent(fmt.Sprintf("the request header has no [%s] api key", authHeaderAPIKey))
@@ -33,9 +31,6 @@ func BearerAPIKeyAuth(logger telemetry.Logger, tracer telemetry.Tracer, userRepo
}
c.Locals(ContextKeyAuthUserID, authUser)
-
- ctxLogger.Info(fmt.Sprintf("[%T] set successfully for user with ID [%s]", authUser, authUser.ID))
-
return c.Next()
}
}
diff --git a/api/pkg/middlewares/bearer_auth_middleware.go b/api/pkg/middlewares/bearer_auth_middleware.go
index 7df1ca3a..ffd29f0d 100644
--- a/api/pkg/middlewares/bearer_auth_middleware.go
+++ b/api/pkg/middlewares/bearer_auth_middleware.go
@@ -46,8 +46,6 @@ func BearerAuth(logger telemetry.Logger, tracer telemetry.Tracer, authClient *au
}
c.Locals(ContextKeyAuthUserID, authUser)
-
- ctxLogger.Info(fmt.Sprintf("[%T] set successfully for user with ID [%s]", authUser, authUser.ID))
return c.Next()
}
}
diff --git a/api/pkg/middlewares/http_request_logger_middleware.go b/api/pkg/middlewares/http_request_logger_middleware.go
index bc0146f0..522f0c91 100644
--- a/api/pkg/middlewares/http_request_logger_middleware.go
+++ b/api/pkg/middlewares/http_request_logger_middleware.go
@@ -18,11 +18,6 @@ func HTTPRequestLogger(tracer telemetry.Tracer, logger telemetry.Logger) fiber.H
_, span, ctxLogger := tracer.StartFromFiberCtxWithLogger(c, logger)
defer span.End()
- ctxLogger.WithString("http.method", c.Method()).
- WithString("http.path", c.Path()).
- WithString("client.version", c.Get(clientVersionHeader)).
- Trace(fmt.Sprintf("%s %s", c.Method(), c.OriginalURL()))
-
response := c.Next()
statusCode := c.Response().StatusCode()
diff --git a/api/pkg/middlewares/phone_api_key_auth_middleware.go b/api/pkg/middlewares/phone_api_key_auth_middleware.go
index dc19c3b8..72bc75ae 100644
--- a/api/pkg/middlewares/phone_api_key_auth_middleware.go
+++ b/api/pkg/middlewares/phone_api_key_auth_middleware.go
@@ -31,7 +31,6 @@ func PhoneAPIKeyAuth(logger telemetry.Logger, tracer telemetry.Tracer, repositor
}
c.Locals(ContextKeyAuthUserID, authUser)
- ctxLogger.Info(fmt.Sprintf("[%T] set successfully for user with ID [%s]", authUser, authUser.ID))
return c.Next()
}
}
diff --git a/api/pkg/repositories/gorm_phone_api_key_repository.go b/api/pkg/repositories/gorm_phone_api_key_repository.go
index 3b1bb306..3c306f5a 100644
--- a/api/pkg/repositories/gorm_phone_api_key_repository.go
+++ b/api/pkg/repositories/gorm_phone_api_key_repository.go
@@ -98,7 +98,6 @@ func (repository *gormPhoneAPIKeyRepository) LoadAuthContext(ctx context.Context
defer span.End()
if authContext, found := repository.cache.Get(apiKey); found {
- ctxLogger.Info(fmt.Sprintf("cache hit for user with ID [%s] and phone API Key ID [%s]", authContext.ID, *authContext.PhoneAPIKeyID))
return authContext, nil
}
diff --git a/api/pkg/repositories/gorm_phone_repository.go b/api/pkg/repositories/gorm_phone_repository.go
index 40c29d30..55b6fb3f 100644
--- a/api/pkg/repositories/gorm_phone_repository.go
+++ b/api/pkg/repositories/gorm_phone_repository.go
@@ -123,7 +123,6 @@ func (repository *gormPhoneRepository) Load(ctx context.Context, userID entities
defer span.End()
if phone, found := repository.cache.Get(repository.getCacheKey(userID, phoneNumber)); found {
- ctxLogger.Info(fmt.Sprintf("cache hit for [%T] with ID [%s]", phone, userID))
return phone, nil
}
diff --git a/api/pkg/repositories/gorm_user_repository.go b/api/pkg/repositories/gorm_user_repository.go
index 39cda887..572548c3 100644
--- a/api/pkg/repositories/gorm_user_repository.go
+++ b/api/pkg/repositories/gorm_user_repository.go
@@ -154,7 +154,6 @@ func (repository *gormUserRepository) LoadAuthContext(ctx context.Context, apiKe
defer span.End()
if authUser, found := repository.cache.Get(apiKey); found {
- ctxLogger.Info(fmt.Sprintf("cache hit for user with ID [%s]", authUser.ID))
return authUser, nil
}