feat(runtime+admin): A2 LLM异步提取接线 + A4 Tracing接线 + A6通知后端聚合
A2 异步记忆提取:
- loop/memory.go: asyncExtractor接口(ExtractAsync)+extractMemoryAsync(60s超时,WithOutCancel,dispatch即返回,后台落库,失败仅Warn)+persistMemories共用
- run.go 三个回合落定点改异步提取; 删除run.go逐步提取(design/03'每轮后', 避免多轮工具N次LLM调用/重复写)
- cmd/cyrene/extractor.go buildMemoryExtractor: llmGroupUsable为真→LLMExtractor, 否则回落ManualExtractor(日志说明); keylessEndpoint放行loopback/私网
A4 可观测性 Tracing:
- cmd/cyrene/observability.go: newAppTraceWriter+traceFanout(多sink)+gatewaySpanSink(走gw.ObserveSpan,喂环形缓冲+LLM/subagent指标)
- wire.go 注入; 未改trace/gateway数据结构
A6 通知后端:
- internal/services/gateway/notifications.go(311行): GET /admin/notifications?type=&before=&limit= (adminAuth)
- 聚合已有源(obs.audit SQLite + s.backthink), createdAt倒序, id=source:id; 类型派生(channel/system/audit/backthink); 无新建表/无新Deps/wire零改动
- 诚实: backthink仅shouldPush计, 未注入源为空, 报错500, 未读游标后置
- 契约与前端Y一致: {id,type,title,body,source,createdAt}, before含游标(<=), type未知400
- Docs/api-client v0.33
全仓 build/vet/test绿(56包)+win/darwin/linux-arm64交叉编译绿; 新增测试(memory_async/extractor/observability/notifications)
This commit is contained in:
1 parent
34c8cc4dca
commit
153a9d6211
12 files changed
+1427
-11
No files matched your search
@@ -0,0 +1,98 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"sync"
|
||||
|
||||
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/trace"
|
||||
"git.yeij.top/AskaEth/Cyrene_v2/internal/services/gateway"
|
||||
)
|
||||
|
||||
// newAppTraceWriter builds the composition root's trace writer: the JSONL stderr
|
||||
// recorder (the local structured log of every span) plus room for the gateway's
|
||||
// observability sink, which can only be registered once the gateway exists (see
|
||||
// wireGatewayTraceSink).
|
||||
func newAppTraceWriter() *traceFanout {
|
||||
return newTraceFanout(trace.NewJSONRecorder(os.Stderr))
|
||||
}
|
||||
|
||||
// wireGatewayTraceSink registers the gateway's observability sink on the app's
|
||||
// trace fanout. It is called from wireFrontend — the first moment the gateway
|
||||
// exists — because the gateway is built after the loop that emits the spans.
|
||||
// Without it the admin trace ring buffer is never fed and
|
||||
// GET /api/v1/admin/observability/trace answers an empty list forever
|
||||
// (design/19 §2). It is a no-op on a boot without a tracer or gateway.
|
||||
func wireGatewayTraceSink(a *app, gw *gateway.Server) {
|
||||
if a.traceWriter == nil || gw == nil {
|
||||
return
|
||||
}
|
||||
a.traceWriter.Add(gatewaySpanSink{srv: gw})
|
||||
a.log.Info("observability trace sink wired")
|
||||
}
|
||||
|
||||
// traceFanout is the composition root's trace.Writer. It fans every completed
|
||||
// span out to the sinks installed at boot (the JSONL stderr recorder) plus any
|
||||
// sink registered later in the boot sequence: the gateway's observability buffer
|
||||
// only exists once wireFrontend has built the gateway, while the loop that emits
|
||||
// the spans is built earlier in wireRuntime.
|
||||
//
|
||||
// It is safe for concurrent use — the loop finishes spans from several
|
||||
// goroutines (per-step, per-tool-call, sub-agents).
|
||||
type traceFanout struct {
|
||||
mu sync.RWMutex
|
||||
writers []trace.Writer
|
||||
}
|
||||
|
||||
// newTraceFanout builds a fanout over the given writers. Nil writers are dropped.
|
||||
func newTraceFanout(writers ...trace.Writer) *traceFanout {
|
||||
f := &traceFanout{}
|
||||
for _, w := range writers {
|
||||
f.Add(w)
|
||||
}
|
||||
return f
|
||||
}
|
||||
|
||||
// Add installs one more sink. A nil writer is ignored.
|
||||
func (f *traceFanout) Add(w trace.Writer) {
|
||||
if w == nil {
|
||||
return
|
||||
}
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
f.writers = append(f.writers, w)
|
||||
}
|
||||
|
||||
// WriteSpan writes rec to every sink and returns the first error. Every sink is
|
||||
// tried even after a failure, so one broken sink cannot hide a span from the
|
||||
// others; the tracer only logs the returned error (trace.Tracer.emit).
|
||||
func (f *traceFanout) WriteSpan(rec trace.SpanRecord) error {
|
||||
f.mu.RLock()
|
||||
defer f.mu.RUnlock()
|
||||
var firstErr error
|
||||
for _, w := range f.writers {
|
||||
if w == nil {
|
||||
continue
|
||||
}
|
||||
if err := w.WriteSpan(rec); err != nil && firstErr == nil {
|
||||
firstErr = fmt.Errorf("trace fanout: %w", err)
|
||||
}
|
||||
}
|
||||
return firstErr
|
||||
}
|
||||
|
||||
// gatewaySpanSink adapts *gateway.Server to trace.Writer through its ObserveSpan
|
||||
// entry point, so an emitted span lands in the admin panel's trace ring buffer
|
||||
// AND in the LLM/subagent metric counters (ObserveSpan appends to the buffer and
|
||||
// observes the metrics; the buffer is what GET /api/v1/admin/observability/trace
|
||||
// serves).
|
||||
type gatewaySpanSink struct{ srv *gateway.Server }
|
||||
|
||||
// WriteSpan feeds rec to the gateway. A missing server is a no-op.
|
||||
func (g gatewaySpanSink) WriteSpan(rec trace.SpanRecord) error {
|
||||
if g.srv == nil {
|
||||
return nil
|
||||
}
|
||||
g.srv.ObserveSpan(rec)
|
||||
return nil
|
||||
}
|
||||
Reference in new issue
Block a user