* feat(observability): OpenTelemetry logs+traces with secret redaction Part of #265. Adds opt-in OpenTelemetry (logs + traces) alongside the existing stderr + opslog pipeline, plus secret redaction on all sinks. Default-off: with no OTEL_* / SILO_OTEL_ENABLED config, behavior is unchanged. Bootstrap (internal/telemetry): - Setup() builds one shared resource, a TracerProvider (parent-based trace-id ratio sampler), a LoggerProvider, and the W3C TraceContext+Baggage propagator from env. It installs NO MeterProvider — metrics stay on Prometheus, and the built-in no-op global MeterProvider keeps the trace instrumentation libs from double-emitting. Shutdown is deferred with a flush timeout. - Logs are bridged via otelslog fan-out (slog.MultiHandler), level-gated by the shared LevelVar and best-effort so a failing collector can't break the console or DB branches. stderr + opslog stay untouched. Secret redaction (internal/logredact): - A slog.Handler masks secret-keyed attributes (password, token, api_key, authorization, cookie, ...) — including .With-bound attrs, nested groups, secret-keyed group subtrees, and values behind a LogValuer — on the console and OTLP sinks, with a no-op fast path when a record has no secret keys. opslog.shouldRedact delegates to logredact.SecretKey so all sinks share one marker list. Rotation is infra-managed (no custom file sink): container runtime for stderr, collector/backend for OTLP, opslog partition-pruning for the DB. Documented in docs/architecture/observability.md. Verification: go build ./..., go vet, gofmt -l — clean; go test ./internal/telemetry/ ./internal/logredact/ -race pass. AI-use disclosure: implemented with AI assistance (Claude Code), including adversarial reviews that hardened the bootstrap and fixed two redaction leak paths; reviewed by the author. * refactor(observability): slog context+component sweep, sloglint gate (phase 3) Part of #265. Builds on the OTel bootstrap + redaction commit. Standardizes every log call site onto the context-carrying slog variants so records correlate with the active OpenTelemetry trace, and locks the standard in with a machine gate so future code (human- or AI-authored) can't drift back. - Call-site sweep: converted the remaining slog.<Level>(...) calls to the slog.<Level>Context(ctx, ...) form wherever a context.Context is in scope (background/init calls with no ctx are left as-is), across 183 files. Applied via a type-aware AST codemod. Log levels and message strings are preserved verbatim; a component attr (canonical per-package name) is added to direct package-level slog calls. Bound-logger calls keep their existing .With bindings. The main.go and telemetry package conversions rode with their file in the previous commit to keep each file within a single commit. - Enforcement (.golangci.yml): enable sloglint with context=scope, static-msg, key-naming-case=snake, no-mixed-args. After the sweep all four report zero violations repo-wide (tests included), so make lint / CI now blocks any regression to the non-context form. The gate ships with the sweep because it cannot be green until the legacy sites are converted. Metrics remain on Prometheus; no behavior change to /metrics or Grafana. Verification: go build ./..., go vet ./..., gofmt -l — clean; sloglint (all 4 rules) 0 violations repo-wide; log levels verified unchanged. AI-use disclosure: implemented with AI assistance (Claude Code), including the codemod; reviewed by the author. * fix(observability): honor per-signal OTLP protocol and secret WithGroup names Two Codex review findings on PR #290: - telemetry: OTEL_EXPORTER_OTLP_{TRACES,LOGS}_PROTOCOL now override the generic OTEL_EXPORTER_OTLP_PROTOCOL per signal, so mixed collector setups (e.g. HTTP logs + gRPC traces) build the right exporter. - logredact: entering a group whose name is secret-bearing (e.g. WithGroup("authorization")) now masks every leaf in that subtree, matching how slog.Group("authorization", ...) is masked as a whole. * fix(observability): address review feedback on telemetry bootstrap - Telemetry setup failure no longer kills boot: Setup returns usable no-op providers alongside the error and main logs and continues with telemetry disabled, honoring the best-effort contract. - Honor OTEL_TRACES_SAMPLER (always_on/off, traceidratio, parentbased_* variants); unsupported values fall back to parentbased_traceidratio. - Attach node identity as semconv service.instance.id instead of the non-semconv node.name. - Rename opslog retention-scope log attrs to target_component/target_level so they no longer collide with the canonical component routing key, and tag those lines with component=opslog. - Fix stale levelGated comment casing; use WarnContext in the telemetry shutdown defer; document the LogValuer double-resolve on the redaction slow path. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Quick <31828688+Quick104@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
110 lines
3.8 KiB
Go
110 lines
3.8 KiB
Go
package notifications
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/oklog/ulid/v2"
|
|
)
|
|
|
|
// OperationalDispatch describes how one operational delivery (a non-fanout
|
|
// notice such as webhook.auto_disabled or request.fulfilled) reaches the
|
|
// per-target channels. WebhookFilter selects which of the profile's enabled
|
|
// webhooks receive it; nil means the type must not reach webhooks at all
|
|
// (e.g. the auto-disable notice's loop guard). Web push has no per-type
|
|
// filter: profile-level gating happens before dispatch.
|
|
type OperationalDispatch struct {
|
|
WebhookFilter func(Webhook) bool
|
|
}
|
|
|
|
// DispatchOperational durably creates one operational delivery. The inbox row
|
|
// and the per-target webhook / web push / Apple push outbox rows commit in a
|
|
// single transaction — a crash afterwards delays channel sends instead of dropping
|
|
// them, because the retry workers recover pending outbox rows — then realtime
|
|
// and channel dispatch run post-commit. Returns nil when the delivery deduped
|
|
// away (the partial unique indexes make operational notices idempotent).
|
|
func (s *System) DispatchOperational(ctx context.Context, delivery Delivery, opts OperationalDispatch) (*InsertedDelivery, error) {
|
|
if s == nil {
|
|
return nil, nil
|
|
}
|
|
tx, err := s.pool.Begin(ctx)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("begin operational dispatch tx: %w", err)
|
|
}
|
|
defer func() { _ = tx.Rollback(ctx) }()
|
|
|
|
inserted, err := s.Deliveries.BulkInsert(ctx, tx, []Delivery{delivery})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if len(inserted) == 0 {
|
|
return nil, nil
|
|
}
|
|
row := inserted[0]
|
|
|
|
if opts.WebhookFilter != nil && s.webhookRepo != nil && s.Settings.WebhooksEnabled(ctx) {
|
|
hooksByProfile, err := s.webhookRepo.ListEnabledByProfiles(ctx, tx, []string{delivery.ProfileID})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
attempts := make([]DeliveryAttempt, 0, 2)
|
|
for _, hook := range hooksByProfile[delivery.ProfileID] {
|
|
if !opts.WebhookFilter(hook) {
|
|
continue
|
|
}
|
|
attempts = append(attempts, DeliveryAttempt{
|
|
ID: ulid.Make().String(),
|
|
NotificationDeliveryID: row.ID,
|
|
TargetID: hook.ID,
|
|
})
|
|
}
|
|
if err := s.webhookRepo.EnqueueAttempts(ctx, tx, attempts); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
if s.webPushRepo != nil && s.Settings.WebPushEnabled(ctx) {
|
|
subsByProfile, err := s.webPushRepo.ListEnabledByProfiles(ctx, tx, []string{delivery.ProfileID})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
attempts := make([]DeliveryAttempt, 0, 2)
|
|
for _, sub := range subsByProfile[delivery.ProfileID] {
|
|
attempts = append(attempts, DeliveryAttempt{
|
|
ID: ulid.Make().String(),
|
|
NotificationDeliveryID: row.ID,
|
|
TargetID: sub.ID,
|
|
})
|
|
}
|
|
if err := s.webPushRepo.EnqueueAttempts(ctx, tx, attempts); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
if s.pushDeviceRepo != nil && s.Settings.ApplePushDeliveryEnabled(ctx) {
|
|
devicesByProfile, err := s.pushDeviceRepo.ListEnabledAppleByProfiles(ctx, tx, []string{delivery.ProfileID})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
attempts := newPushDeliveryAttempts(row.ID, devicesByProfile[delivery.ProfileID])
|
|
if err := s.pushDeviceRepo.EnqueuePushAttempts(ctx, tx, attempts); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
if err := tx.Commit(ctx); err != nil {
|
|
return nil, fmt.Errorf("commit operational dispatch: %w", err)
|
|
}
|
|
|
|
// Post-commit dispatch is best-effort: the durable inbox row covers
|
|
// websocket reconnect, and the retry workers recover the outbox rows.
|
|
full, err := s.Deliveries.GetRowByID(ctx, row.ID)
|
|
if err != nil || full == nil {
|
|
s.logger.WarnContext(ctx, "operational delivery reload failed",
|
|
"delivery_id", row.ID, "error", err)
|
|
return &row, nil
|
|
}
|
|
if err := s.dispatcher.Dispatch(ctx, *full); err != nil {
|
|
s.logger.WarnContext(ctx, "operational delivery dispatch failed",
|
|
"delivery_id", row.ID, "error", err)
|
|
}
|
|
return &row, nil
|
|
}
|