mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-21 06:54:25 +00:00
# Which Problems Are Solved
In the "new" structured logging, request details were added in different
middlewares, such as request, instance and user IDs. This meant the the
upstream request logging middleware did not have access to metadata that
got added later, resulting in incomplete logs. Furthermore it was not
possible to correlate an API error response to log output.
# How the Problems Are Solved
A mutable request details object is added to the context early on. When
the api authz function run, the instance and user IDs are added to this
object as they become available. Every logline emitted after this
(time-wise) will then all contain these details under the `request` log
group.
<details>
<summary>example output in JSON</summary>
```json
{
"time": "2026-03-13T19:21:20.890428806Z",
"level": "INFO",
"source": {
"function": "github.com/zitadel/zitadel/internal/api/grpc/server/connect_middleware.LogHandler.func1.1",
"file": "/workspaces/zitadel/internal/api/grpc/server/connect_middleware/log_interceptor.go",
"line": 34
},
"msg": "request served",
"request": {
"id": "d6q67c04vtjmi77cbbpg",
"instance_host": "localhost:8080",
"instance_id": "362349751439458307",
"user_id": "362349751440048131"
},
"TraceID": "a9e0fee3522224f3583bbdcda737f4b4",
"SpanID": "a563056eee36920a",
"stream": "request",
"version": "2026-03-13T19:20:59Z",
"protocol": "connect",
"service": "zitadel.user.v2.UserService",
"http_method": "POST",
"path": "/zitadel.user.v2.UserService/ListUsers",
"code": "code_0",
"duration": 12254350
}
```
</details>
Request IDs are now also returned with a response header or metadata.
Depending on the protocol:
- HTTP calls always return the request ID as header, regardless of
status
- gRPC calls always return the request ID as header, even if there was
an error
- connect RPC calls returns the request ID as header on success, trailer
in case of error. This is because header must be set on the response
object, which is nil in case of error. When there is an error, metadata
can be added which are then sent as trailers.
# Additional Changes
- Use the existing call duration middleware for both request ID and
logging for a consistent request start timestamp in all layers.
- Upgrade sloggcp for some fixes (notably TraceID)
- Modify the NoCache middleware so it uses `SetHeaders` instead of
`SendHeaders`. The latter prevented any other handler from setting
headers, including the new request ID middleware.
# Additional Context
Follow up on demo of:
- https://github.com/zitadel/zitadel/pull/11159
- https://github.com/zitadel/zitadel/pull/11435
- backport to v4
---------
Co-authored-by: Copilot <[email protected]>
Co-authored-by: muhlemmer <[email protected]>
Co-authored-by: Copilot Autofix powered by AI <[email protected]>
Co-authored-by: Marco A. <[email protected]>
111 lines
3.1 KiB
Go
111 lines
3.1 KiB
Go
package instrumentation
|
|
|
|
import (
|
|
"context"
|
|
"log/slog"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/rs/xid"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/call"
|
|
)
|
|
|
|
// allow injection for testing
|
|
var xidWithTime = xid.NewWithTime
|
|
|
|
// WithRequestDetails creates a new context with request details, including a unique request ID.
|
|
// The request ID is generated using the call timestamp as returned by [call.FromContext].
|
|
//
|
|
// Note: The returned context carries a mutable pointer to requestDetails.
|
|
// This allows subsequent calls to SetInstanceID/SetUserID to update the details
|
|
// visible to the logger, even if the logger holds the original context created here.
|
|
func WithRequestDetails(ctx context.Context, instanceHost, publicHost string) context.Context {
|
|
details := &requestDetails{
|
|
id: xidWithTime(call.FromContext(ctx)),
|
|
instanceHost: instanceHost,
|
|
publicHost: publicHost,
|
|
}
|
|
return context.WithValue(ctx, ctxKey{}, details)
|
|
}
|
|
|
|
func getRequestDetails(ctx context.Context) (*requestDetails, bool) {
|
|
details, ok := ctx.Value(ctxKey{}).(*requestDetails)
|
|
return details, ok
|
|
}
|
|
|
|
// SetInstanceID sets the instance ID in the request details stored in the context.
|
|
// It uses a mutex to update the shared state safely, ensuring upstream loggers see the change.
|
|
func SetInstanceID(ctx context.Context, instanceID string) {
|
|
if details, ok := getRequestDetails(ctx); ok {
|
|
details.mtx.Lock()
|
|
details.instanceID = instanceID
|
|
details.mtx.Unlock()
|
|
}
|
|
}
|
|
|
|
// SetUserID sets the user ID in the request details stored in the context.
|
|
// It uses a mutex to update the shared state safely, ensuring upstream loggers see the change.
|
|
func SetUserID(ctx context.Context, userID string) {
|
|
if details, ok := getRequestDetails(ctx); ok {
|
|
details.mtx.Lock()
|
|
details.userID = userID
|
|
details.mtx.Unlock()
|
|
}
|
|
}
|
|
|
|
// GetRequestID retrieves the request ID from the context.
|
|
// [xid.NilID] is returned if no request details are found in the context.
|
|
func GetRequestID(ctx context.Context) xid.ID {
|
|
d, ok := getRequestDetails(ctx)
|
|
if !ok {
|
|
return xid.NilID()
|
|
}
|
|
d.mtx.Lock()
|
|
defer d.mtx.Unlock()
|
|
return d.id
|
|
}
|
|
|
|
type ctxKey struct{}
|
|
|
|
type requestDetails struct {
|
|
mtx sync.Mutex
|
|
id xid.ID
|
|
instanceHost string
|
|
publicHost string // may optionally be set through header (login v2)
|
|
instanceID string
|
|
userID string
|
|
}
|
|
|
|
func (d *requestDetails) slogAttributes() []any {
|
|
attributes := make([]any, 0, 5)
|
|
|
|
d.mtx.Lock()
|
|
defer d.mtx.Unlock()
|
|
|
|
attributes = append(attributes,
|
|
slog.String("id", d.id.String()),
|
|
slog.String("instance_host", d.instanceHost),
|
|
)
|
|
if d.publicHost != "" {
|
|
attributes = append(attributes, slog.String("public_host", d.publicHost))
|
|
}
|
|
if d.instanceID != "" {
|
|
attributes = append(attributes, slog.String("instance_id", d.instanceID))
|
|
}
|
|
if d.userID != "" {
|
|
attributes = append(attributes, slog.String("user_id", d.userID))
|
|
}
|
|
|
|
return attributes
|
|
}
|
|
|
|
func requestDetailsExtractor(ctx context.Context, _ time.Time, _ slog.Level, _ string) []slog.Attr {
|
|
if d, ok := getRequestDetails(ctx); ok {
|
|
return []slog.Attr{
|
|
slog.Group("request", d.slogAttributes()...),
|
|
}
|
|
}
|
|
return nil
|
|
}
|