diff --git a/pkg/clients/middleware/logging_middleware.go b/pkg/clients/middleware/logging_middleware.go index 8a9abafa0a30ba831d37d1b795f321310fe9af92..8cc5e384fa8fcadee5dc86c84444dead233bcb81 100644 --- a/pkg/clients/middleware/logging_middleware.go +++ b/pkg/clients/middleware/logging_middleware.go @@ -25,18 +25,17 @@ func LoggingMiddleware(logger *zap.Logger) Middleware { func (m *loggingMiddleware) Create(ctx context.Context, client *clients.Client) (created *clients.Client, err error) { logger := m.logger.With( - logzap.Caller(ctx), + logzap.Caller(ctx, logzap.WithSpace(client.SpaceID)), logzap.Event(clients.EventCreate), - logzap.Object(client), ) created, err = m.next.Create(ctx, client) if err != nil { - logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(client)) return } - logger.Info("Client created", logzap.Channels(logzap.Userlog)) + logger.Info("Client created", logzap.Channels(logzap.Userlog), logzap.Object(created)) return created, err } diff --git a/pkg/environments/middleware/logging_middleware.go b/pkg/environments/middleware/logging_middleware.go index 940d29535e4eb9e6133b01748a434cd029397190..71d2e5c6adf712752c0c0ae33973303f67603473 100644 --- a/pkg/environments/middleware/logging_middleware.go +++ b/pkg/environments/middleware/logging_middleware.go @@ -29,16 +29,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, env *environments.Enviro logger := m.logger.With( logzap.Caller(ctx), logzap.Event(environments.EventCreate), - logzap.Object(env), ) created, err = m.next.Create(ctx, env) if err != nil { - logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(env)) return } - logger.Info("Environment created", logzap.Channels(logzap.Userlog)) + logger.Info("Environment created", logzap.Channels(logzap.Userlog), logzap.Object(created)) return created, err } diff --git a/pkg/organizations/middleware/logging_middleware.go b/pkg/organizations/middleware/logging_middleware.go index c88108e93a98466a1f5ddf84b645b93f31caedf9..bda7f54fb101777758978a393bf43b52b1532b28 100644 --- a/pkg/organizations/middleware/logging_middleware.go +++ b/pkg/organizations/middleware/logging_middleware.go @@ -2,6 +2,7 @@ package middleware import ( "context" + "git.perx.ru/perxis/perxis-go/id" "git.perx.ru/perxis/perxis-go/pkg/organizations" @@ -28,16 +29,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, org *organizations.Organ logger := m.logger.With( logzap.Caller(ctx), logzap.Event(organizations.EventCreate), - logzap.Object(org), ) created, err = m.next.Create(ctx, org) if err != nil { - logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(org)) return } - logger.Info("Organization created", logzap.Channels(logzap.Userlog)) + logger.Info("Organization created", logzap.Channels(logzap.Userlog), logzap.Object(created)) return created, err } diff --git a/pkg/roles/middleware/logging_middleware.go b/pkg/roles/middleware/logging_middleware.go index 5f564bff8bfcf66d6bd7247a4903228d0ec1aea6..9221265df1603f93be2c344c8c559eb8811e60de 100644 --- a/pkg/roles/middleware/logging_middleware.go +++ b/pkg/roles/middleware/logging_middleware.go @@ -27,16 +27,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, role *roles.Role) (creat logger := m.logger.With( logzap.Caller(ctx), logzap.Event(roles.EventCreate), - logzap.Object(role), ) created, err = m.next.Create(ctx, role) if err != nil { - logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(role)) return } - logger.Info("Role created", logzap.Channels(logzap.Userlog)) + logger.Info("Role created", logzap.Channels(logzap.Userlog), logzap.Object(created)) return created, err } diff --git a/pkg/spaces/middleware/logging_middleware.go b/pkg/spaces/middleware/logging_middleware.go index 5a7ef7c183dcdb60f64af49ec626c6ef5c7a9987..d2afd8010fed5f667914a058de4c72259e0d4e17 100644 --- a/pkg/spaces/middleware/logging_middleware.go +++ b/pkg/spaces/middleware/logging_middleware.go @@ -2,6 +2,7 @@ package middleware import ( "context" + "git.perx.ru/perxis/perxis-go/id" "git.perx.ru/perxis/perxis-go/pkg/spaces" @@ -45,16 +46,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, space *spaces.Space) (cr logger := m.logger.With( logzap.Caller(ctx), logzap.Event(spaces.EventCreate), - logzap.Object(space), ) created, err = m.next.Create(ctx, space) if err != nil { - logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(space)) return } - logger.Info("Space created", logzap.Channels(logzap.Userlog)) + logger.Info("Space created", logzap.Channels(logzap.Userlog), logzap.Object(created)) return created, err } diff --git a/pkg/users/middleware/logging_middleware.go b/pkg/users/middleware/logging_middleware.go index 5fb8f82aad74e0d3c38d1e2a53c1abbd8809e5ad..3350d36d87b5715c043455428cc6e4aa0c0f981d 100644 --- a/pkg/users/middleware/logging_middleware.go +++ b/pkg/users/middleware/logging_middleware.go @@ -28,16 +28,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, create *users.User) (use logger := m.logger.With( logzap.Caller(ctx), logzap.Event(users.EventCreate), - logzap.Object(user), ) user, err = m.next.Create(ctx, create) if err != nil { - logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(user)) return } - logger.Info("User created", logzap.Channels(logzap.Userlog)) + logger.Info("User created", logzap.Channels(logzap.Userlog), logzap.Object(user)) return user, err }