* 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>
165 lines
3.9 KiB
Go
165 lines
3.9 KiB
Go
package usercollections
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"log/slog"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/jackc/pgx/v5/pgxpool"
|
|
"golang.org/x/sync/errgroup"
|
|
)
|
|
|
|
// Scheduler picks user-owned collections whose next_sync_at is in the past
|
|
// and runs the configured sync. Driven by a TaskManager interval task.
|
|
type Scheduler struct {
|
|
pool *pgxpool.Pool
|
|
service *Service
|
|
logger *slog.Logger
|
|
|
|
inFlight sync.Map
|
|
}
|
|
|
|
func NewScheduler(pool *pgxpool.Pool, service *Service, logger *slog.Logger) *Scheduler {
|
|
if logger == nil {
|
|
logger = slog.Default()
|
|
}
|
|
return &Scheduler{
|
|
pool: pool,
|
|
service: service,
|
|
logger: logger,
|
|
}
|
|
}
|
|
|
|
type SchedulerResult struct {
|
|
Due int `json:"due"`
|
|
Synced int `json:"synced"`
|
|
Failed int `json:"failed"`
|
|
Skipped int `json:"skipped"`
|
|
}
|
|
|
|
type dueCollection struct {
|
|
UserID int
|
|
CollectionID string
|
|
}
|
|
|
|
func (s *Scheduler) RunOnce(ctx context.Context) (json.RawMessage, error) {
|
|
due, err := s.listDue(ctx)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("listing due user collections: %w", err)
|
|
}
|
|
result := SchedulerResult{Due: len(due)}
|
|
if len(due) == 0 {
|
|
return marshalResult(result), nil
|
|
}
|
|
|
|
s.logger.InfoContext(ctx, "user collection sync scheduler: starting", "due", len(due))
|
|
|
|
var (
|
|
mu sync.Mutex
|
|
g, gctx = errgroup.WithContext(ctx)
|
|
)
|
|
g.SetLimit(3)
|
|
|
|
for _, dc := range due {
|
|
dc := dc
|
|
g.Go(func() error {
|
|
s.syncOne(gctx, dc, &mu, &result)
|
|
return nil
|
|
})
|
|
}
|
|
_ = g.Wait()
|
|
|
|
s.logger.InfoContext(ctx, "user collection sync scheduler: complete",
|
|
"due", result.Due, "synced", result.Synced,
|
|
"failed", result.Failed, "skipped", result.Skipped,
|
|
)
|
|
return marshalResult(result), nil
|
|
}
|
|
|
|
func (s *Scheduler) listDue(ctx context.Context) ([]dueCollection, error) {
|
|
rows, err := s.pool.Query(ctx,
|
|
`SELECT user_id, id
|
|
FROM user_personal_collections
|
|
WHERE sync_schedule IS NOT NULL
|
|
AND next_sync_at IS NOT NULL
|
|
AND next_sync_at <= NOW()`,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer rows.Close()
|
|
|
|
var out []dueCollection
|
|
for rows.Next() {
|
|
var dc dueCollection
|
|
if err := rows.Scan(&dc.UserID, &dc.CollectionID); err != nil {
|
|
return nil, err
|
|
}
|
|
out = append(out, dc)
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
func (s *Scheduler) syncOne(ctx context.Context, dc dueCollection, mu *sync.Mutex, result *SchedulerResult) {
|
|
if _, loaded := s.inFlight.LoadOrStore(dc.CollectionID, struct{}{}); loaded {
|
|
mu.Lock()
|
|
result.Skipped++
|
|
mu.Unlock()
|
|
return
|
|
}
|
|
defer s.inFlight.Delete(dc.CollectionID)
|
|
|
|
startedAt := time.Now()
|
|
_, err := s.service.SyncCollection(ctx, dc.UserID, dc.CollectionID)
|
|
dur := time.Since(startedAt).Round(time.Millisecond)
|
|
|
|
mu.Lock()
|
|
defer mu.Unlock()
|
|
if err != nil {
|
|
result.Failed++
|
|
s.logger.ErrorContext(ctx, "user collection sync scheduler: sync failed",
|
|
"user_id", dc.UserID,
|
|
"collection_id", dc.CollectionID,
|
|
"duration", dur,
|
|
"error", err,
|
|
)
|
|
s.advanceAfterFailure(ctx, dc, time.Now())
|
|
return
|
|
}
|
|
result.Synced++
|
|
s.logger.InfoContext(ctx, "user collection sync scheduler: synced",
|
|
"user_id", dc.UserID,
|
|
"collection_id", dc.CollectionID,
|
|
"duration", dur,
|
|
)
|
|
}
|
|
|
|
// advanceAfterFailure pushes next_sync_at forward by the user-sync minimum
|
|
// interval so a broken source does not thrash the scheduler.
|
|
func (s *Scheduler) advanceAfterFailure(ctx context.Context, dc dueCollection, after time.Time) {
|
|
next := after.Add(time.Duration(MinSyncIntervalHours) * time.Hour)
|
|
if _, err := s.pool.Exec(ctx,
|
|
`UPDATE user_personal_collections SET next_sync_at = $1 WHERE user_id = $2 AND id = $3`,
|
|
next, dc.UserID, dc.CollectionID,
|
|
); err != nil {
|
|
s.logger.ErrorContext(ctx, "user collection sync scheduler: failed to advance next_sync_at after failure",
|
|
"user_id", dc.UserID,
|
|
"collection_id", dc.CollectionID,
|
|
"error", err,
|
|
)
|
|
}
|
|
}
|
|
|
|
func (s *Scheduler) IsInFlight(collectionID string) bool {
|
|
_, ok := s.inFlight.Load(collectionID)
|
|
return ok
|
|
}
|
|
|
|
func marshalResult(r SchedulerResult) json.RawMessage {
|
|
data, _ := json.Marshal(r)
|
|
return data
|
|
}
|