mirror of
https://github.com/hanzoai/o11y.git
synced 2026-10-15 12:58:33 +00:00
zeekayandHanzo Dev
f337a4b21e
MAIN HAD NOT COMPILED SINCE 2026-07-30. Commit 5e3210f759 rewrote tables.go in three telemetry packages and the sentrytypes Event struct without updating their consumers, while its message claimed the read paths 'build clean' — proven false with a detached worktree at clean HEAD. That is why the deployed backend is SHA-pinned and stale: CI could not build main at all. THE RENAME: /api/v1|v2|v3|v4/<rest> -> /v1/o11y/<rest> (290 replacements; the host already says api, so the path never does, and one live generation carries no version segments). 21 duplicate v1 registrations DELETED with their v2 twins kept — gorilla/mux is first-match, so after the collapse the v1 line would have shadowed v2 silently, with no error, forever: rules (6), dashboards (6), services/top_operations/entry_point_operations/ttl (5), features, query_range v3+v4 -> v5, metrics/dashboards. 16 orphaned handler funcs (430 lines) deleted. CONSUMERS MIGRATED to the one-way table names, never the reverse: tables.go's deletion of the versioned constants was deliberate (stated three times), and the new blocks are positional 1:1 rewrites of the old, so every resolution is a constant the same commit declared — SpanIndexV3->span, LogsV2->log, SamplesV4->metric, TimeseriesV4->series, UpdatedMetadata->descriptor, ambiguity on operation-vs-trace settled by tables.go's own inline comments. sentrytypes.Frame/Event.Frames/Event.Handled RECONSTRUCTED, not guessed: pinned independently by eventsql.go's projection, eventstore.go's scan targets and module.go's clampLine/InApp, and asserted literally by the pre-existing TestFramesRoundTrip. TraceSummary.Sample -> Message (event.error has no sample column). Event.Sample deleted: a field that always read "" while claiming to hold the occurrence JSON. PATH MANGLERS KILLED, both deployment shapes: mount.go rewriteExternalPath+ setPath deleted (it mapped /v1/o11y/services -> /api/services => 404 on the cloud-binary path — proven with a real test before deletion); server.go StripPrefix removed (it reduced /v1/o11y/services -> /services => the web catch-all answered index.html on the standalone path). versionless.go + versionless_test.go + both call sites deleted: its regex matched 0 of the registered routes and walked the router at every startup to register nothing — the second spelling of one path, gone with the mechanism that needed it. FRONTEND: prependBase '/api/v1/' -> '/v1/o11y/' (both baseURL branches), 17 /api/v1/assistant literals renamed (note: no assistant route exists in pkg/ — client-only surface, a real product gap, not papered over), 21 MSW mocks moved so they intercept the paths the app now requests. GATE, all executed: go build ./... green; go test ./... green (exit 0); 0 /api/v[0-9] references in pkg code (frontend's 5 are query-builder escaping fixtures); 0 duplicate (method,path) registrations; /v1/o11y/services survives both mount.go and server.go untouched. Co-authored-by: Hanzo Dev <[email protected]>
66 lines
2.4 KiB
Go
66 lines
2.4 KiB
Go
package querier
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/hanzoai/o11y/pkg/errors"
|
|
"github.com/hanzoai/o11y/pkg/telemetrylogs"
|
|
"github.com/hanzoai/o11y/pkg/telemetrymetrics"
|
|
"github.com/hanzoai/o11y/pkg/telemetrytraces"
|
|
"github.com/hanzoai/o11y/pkg/valuer"
|
|
)
|
|
|
|
func (q *querier) Collect(ctx context.Context, _ valuer.UUID) (map[string]any, error) {
|
|
stats := make(map[string]any)
|
|
|
|
tracesTable := fmt.Sprintf("%s.%s", telemetrytraces.DBName, telemetrytraces.SpanTableName)
|
|
logsTable := fmt.Sprintf("%s.%s", telemetrylogs.DBName, telemetrylogs.LogTableName)
|
|
metricsTable := fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.MetricTableName)
|
|
|
|
var (
|
|
traces uint64
|
|
tracesLastSeenAt time.Time
|
|
)
|
|
if err := q.telemetryStore.Datastore().QueryRow(ctx, fmt.Sprintf("SELECT COUNT(*), max(timestamp) FROM %s", tracesTable)).Scan(&traces, &tracesLastSeenAt); err == nil {
|
|
stats["telemetry.traces.count"] = traces
|
|
if tracesLastSeenAt.Unix() != 0 {
|
|
stats["telemetry.traces.last_observed.time"] = tracesLastSeenAt.UTC()
|
|
stats["telemetry.traces.last_observed.time_unix"] = tracesLastSeenAt.Unix()
|
|
}
|
|
} else {
|
|
q.logger.DebugContext(ctx, "failed to collect traces stats", errors.Attr(err))
|
|
}
|
|
|
|
var (
|
|
logs uint64
|
|
logsLastSeenAt time.Time
|
|
)
|
|
if err := q.telemetryStore.Datastore().QueryRow(ctx, fmt.Sprintf("SELECT COUNT(*), fromUnixTimestamp64Nano(max(timestamp)) FROM %s", logsTable)).Scan(&logs, &logsLastSeenAt); err == nil {
|
|
stats["telemetry.logs.count"] = logs
|
|
if logsLastSeenAt.Unix() != 0 {
|
|
stats["telemetry.logs.last_observed.time"] = logsLastSeenAt.UTC()
|
|
stats["telemetry.logs.last_observed.time_unix"] = logsLastSeenAt.Unix()
|
|
}
|
|
} else {
|
|
q.logger.DebugContext(ctx, "failed to collect logs stats", errors.Attr(err))
|
|
}
|
|
|
|
var (
|
|
metrics uint64
|
|
metricsLastSeenAt time.Time
|
|
)
|
|
if err := q.telemetryStore.Datastore().QueryRow(ctx, fmt.Sprintf("SELECT COUNT(*), toDateTime(max(unix_milli) / 1000) FROM %s", metricsTable)).Scan(&metrics, &metricsLastSeenAt); err == nil {
|
|
stats["telemetry.metrics.count"] = metrics
|
|
if metricsLastSeenAt.Unix() != 0 {
|
|
stats["telemetry.metrics.last_observed.time"] = metricsLastSeenAt.UTC()
|
|
stats["telemetry.metrics.last_observed.time_unix"] = metricsLastSeenAt.Unix()
|
|
}
|
|
} else {
|
|
q.logger.DebugContext(ctx, "failed to collect metrics stats", errors.Attr(err))
|
|
}
|
|
|
|
return stats, nil
|
|
}
|