mirror of
https://github.com/zitadel/zitadel.git
synced 2026-07-25 18:28:00 +00:00
11dbb1b277
# Which Problems Are Solved Streams allow differentiating logs produced by different components of Zitadel. # How the Problems Are Solved The `backend/v3/instrumentation/logging` package now exposes convenience function for setting and getting a logger from the context. As well as high-level functions to emit log records at various levels. When constructing a new logger a "stream" needs to be specified: - **runtime**: General runtime logs, such as startup and shutdown messages. Default for logs that do not belong to the other categories. - **request**: Logs for incoming API and HTTP requests. - **event_handler**: Logs for event handling in projections. - **queue**: Logs for the job queue processing. - **event_pusher**: Logs for event pushing to the database. Disabled by default, contains sensitive information. Each line from the returned logger contains a `stream` field as well as a `version` field with the current Zitadel version. ## Runtime config Streams can be enabled by passing an array of stream names in the runtime config. Because some log streams may contain sensitive data (especially events), it is now also possible to mask values by their key. # Additional Changes - Wrap `slogctx` in the `logging` package. (Except API error converter packages, because of import cycle) - Add some docs to `logging` package so other devs understand how to add logging to Zitadel - Add `logging.OnError` and `logging.WithError` helper functions with `Panic()` and `Fatal()` methods, to preserve current calls in the `cmd` packages. - Add instance context extractor. - Only output request details in the request info log. Request ID remains propagated through context. - Moved middleware functionality into protocol specific packages. - Removed setting of URI to context in metric middleware. There were ony setters and no getters. (Unused value) - Reuse a single statusWriter in the middleware package for middlewares that need to know the response status. # Additional Context - Closes #11333 - Closes #11331 - Partly #11330 --------- Co-authored-by: Silvan <27845747+adlerhurst@users.noreply.github.com>
111 lines
2.8 KiB
Go
111 lines
2.8 KiB
Go
package setup
|
|
|
|
import (
|
|
"context"
|
|
_ "embed"
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"github.com/zitadel/zitadel/backend/v3/instrumentation/logging"
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/query/projection"
|
|
"github.com/zitadel/zitadel/internal/repository/instance"
|
|
"github.com/zitadel/zitadel/internal/repository/owner"
|
|
"github.com/zitadel/zitadel/internal/repository/project"
|
|
)
|
|
|
|
var (
|
|
//go:embed 45.sql
|
|
correctProjectOwnerEvents string
|
|
)
|
|
|
|
type CorrectProjectOwners struct {
|
|
eventstore *eventstore.Eventstore
|
|
}
|
|
|
|
func (mig *CorrectProjectOwners) Execute(ctx context.Context, _ eventstore.Event) error {
|
|
instances, err := mig.eventstore.InstanceIDs(
|
|
ctx,
|
|
eventstore.NewSearchQueryBuilder(eventstore.ColumnsInstanceIDs).
|
|
OrderDesc().
|
|
AddQuery().
|
|
AggregateTypes("instance").
|
|
EventTypes(instance.InstanceAddedEventType).
|
|
Builder(),
|
|
)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
ctx = authz.SetCtxData(ctx, authz.CtxData{UserID: "SETUP"})
|
|
for i, instance := range instances {
|
|
ctx = authz.WithInstanceID(ctx, instance)
|
|
logging.Info(ctx, "correct owners of projects", "instance", instance, "migration", mig.String(), "progress", fmt.Sprintf("%d/%d", i+1, len(instances)))
|
|
didCorrect, err := mig.correctInstanceProjects(ctx, instance)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !didCorrect {
|
|
continue
|
|
}
|
|
_, err = projection.ProjectGrantProjection.Trigger(ctx)
|
|
logging.OnError(ctx, err).Debug("failed triggering project grant projection to update owners")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (mig *CorrectProjectOwners) correctInstanceProjects(ctx context.Context, instance string) (didCorrect bool, err error) {
|
|
var correctedOwners []eventstore.Command
|
|
|
|
tx, err := mig.eventstore.Client().BeginTx(ctx, nil)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
defer func() {
|
|
if err != nil {
|
|
_ = tx.Rollback()
|
|
return
|
|
}
|
|
err = tx.Commit()
|
|
}()
|
|
|
|
rows, err := tx.QueryContext(ctx, correctProjectOwnerEvents, instance)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
defer rows.Close()
|
|
|
|
for rows.Next() {
|
|
aggregate := &eventstore.Aggregate{
|
|
InstanceID: instance,
|
|
Type: project.AggregateType,
|
|
Version: project.AggregateVersion,
|
|
}
|
|
var payload json.RawMessage
|
|
err := rows.Scan(
|
|
&aggregate.ID,
|
|
&aggregate.ResourceOwner,
|
|
&payload,
|
|
)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
previousOwners := make(map[uint32]string)
|
|
if err := json.Unmarshal(payload, &previousOwners); err != nil {
|
|
return false, err
|
|
}
|
|
correctedOwners = append(correctedOwners, owner.NewCorrected(ctx, aggregate, previousOwners))
|
|
}
|
|
if rows.Err() != nil {
|
|
return false, rows.Err()
|
|
}
|
|
|
|
_, err = mig.eventstore.PushWithClient(ctx, tx, correctedOwners...)
|
|
return len(correctedOwners) > 0, err
|
|
}
|
|
|
|
func (*CorrectProjectOwners) String() string {
|
|
return "43_correct_project_owners"
|
|
}
|