* 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>
127 lines
3.8 KiB
Go
127 lines
3.8 KiB
Go
package policy
|
|
|
|
import (
|
|
"context"
|
|
"log/slog"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/jackc/pgx/v5/pgxpool"
|
|
)
|
|
|
|
const decisionLogCleanupBatchSize = 10000
|
|
|
|
// DecisionLogSettingsStore is satisfied by *catalog.ServerSettingsRepo.
|
|
type DecisionLogSettingsStore interface {
|
|
Get(ctx context.Context, key string) (string, error)
|
|
}
|
|
|
|
// DecisionLogPartitionManager is satisfied by *partman.Manager.
|
|
type DecisionLogPartitionManager interface {
|
|
EnsureFuturePartitions(ctx context.Context) error
|
|
DropExpiredPartitions(ctx context.Context, cutoff time.Time) ([]string, error)
|
|
DeleteExpiredRowsFromDefault(ctx context.Context, cutoff time.Time) (int64, error)
|
|
}
|
|
|
|
// CleanupDecisionLogsOnce runs one policy decision log retention pass. It
|
|
// returns the number of deleted rows plus the first error encountered, so
|
|
// callers (the task manager) can report a degraded pass instead of silently
|
|
// letting policy_decisions grow unbounded.
|
|
func CleanupDecisionLogsOnce(
|
|
ctx context.Context,
|
|
pool *pgxpool.Pool,
|
|
store DecisionLogSettingsStore,
|
|
pm DecisionLogPartitionManager,
|
|
) (int64, error) {
|
|
var firstErr error
|
|
days := DefaultDecisionLogRetentionDays
|
|
if store != nil {
|
|
if raw, err := store.Get(ctx, SettingDecisionLogRetentionDays); err == nil && raw != "" {
|
|
if parsed := parsePositiveInt(raw); parsed > 0 {
|
|
days = parsed
|
|
}
|
|
}
|
|
}
|
|
|
|
cutoff := time.Now().UTC().AddDate(0, 0, -days)
|
|
if pm != nil {
|
|
if err := pm.EnsureFuturePartitions(ctx); err != nil {
|
|
slog.WarnContext(ctx, "policy decision log ensure future partitions error", "component", "policy", "error", err)
|
|
firstErr = err
|
|
}
|
|
|
|
partitionCleanupFailed := false
|
|
totalDeleted := int64(0)
|
|
if dropped, err := pm.DropExpiredPartitions(ctx, cutoff); err != nil {
|
|
slog.WarnContext(ctx, "policy decision log partition cleanup error", "component", "policy", "error", err)
|
|
partitionCleanupFailed = true
|
|
if firstErr == nil {
|
|
firstErr = err
|
|
}
|
|
} else if len(dropped) > 0 {
|
|
slog.InfoContext(ctx, "policy decision log dropped expired partitions", "component", "policy", "partitions", dropped)
|
|
}
|
|
|
|
if deleted, err := pm.DeleteExpiredRowsFromDefault(ctx, cutoff); err != nil {
|
|
slog.WarnContext(ctx, "policy decision log default partition cleanup error", "component", "policy", "error", err)
|
|
partitionCleanupFailed = true
|
|
if firstErr == nil {
|
|
firstErr = err
|
|
}
|
|
} else if deleted > 0 {
|
|
totalDeleted += deleted
|
|
slog.InfoContext(ctx, "policy decision log default partition cleanup completed", "component", "policy", "deleted", deleted, "retention_days", days)
|
|
}
|
|
|
|
if !partitionCleanupFailed {
|
|
return totalDeleted, firstErr
|
|
}
|
|
slog.WarnContext(ctx, "policy decision log partition cleanup degraded, falling back to row deletes", "component", "policy", "retention_days", days)
|
|
}
|
|
|
|
total, err := deleteExpiredDecisionRowsBefore(ctx, pool, cutoff)
|
|
if err != nil && firstErr == nil {
|
|
firstErr = err
|
|
}
|
|
if total > 0 {
|
|
slog.InfoContext(ctx, "policy decision log cleanup completed", "component", "policy", "deleted", total, "retention_days", days)
|
|
}
|
|
return total, firstErr
|
|
}
|
|
|
|
func deleteExpiredDecisionRowsBefore(ctx context.Context, pool *pgxpool.Pool, cutoff time.Time) (int64, error) {
|
|
if pool == nil {
|
|
return 0, nil
|
|
}
|
|
total := int64(0)
|
|
for {
|
|
result, err := pool.Exec(ctx, `
|
|
DELETE FROM policy_decisions
|
|
WHERE (id, "timestamp") IN (
|
|
SELECT id, "timestamp" FROM policy_decisions
|
|
WHERE "timestamp" < $1
|
|
LIMIT $2
|
|
)
|
|
`, cutoff, decisionLogCleanupBatchSize)
|
|
if err != nil {
|
|
slog.WarnContext(ctx, "policy decision log cleanup error", "component", "policy", "error", err)
|
|
return total, err
|
|
}
|
|
deleted := result.RowsAffected()
|
|
total += deleted
|
|
if deleted < int64(decisionLogCleanupBatchSize) {
|
|
break
|
|
}
|
|
}
|
|
return total, nil
|
|
}
|
|
|
|
func parsePositiveInt(s string) int {
|
|
v, err := strconv.Atoi(strings.TrimSpace(s))
|
|
if err != nil {
|
|
return 0
|
|
}
|
|
return v
|
|
}
|