fixes
This commit is contained in:
1 parent
2cf2cebf5c
commit
23243ddbdc
13 files changed
+906
-55
No files matched your search
+14
-2
@@ -48,7 +48,7 @@ func LoadErrorEvents(ctx context.Context, conn driver.Conn, database string, sta
|
||||
if withTrace {
|
||||
extra = "span_id, parent_span_id, peer_ip, ua_class, user_agent, trace_id"
|
||||
}
|
||||
rows, err := conn.Query(ctx, fmt.Sprintf(`SELECT timestamp, service, release, kind, source, status_code, span_name, route, exception_type, message_normalized, pattern_signature, is_timeout, is_cancellation, is_retry, %s
|
||||
rows, err := conn.Query(ctx, fmt.Sprintf(`SELECT timestamp, service, release, kind, source, status_code, span_name, route, exception_type, message_normalized, pattern_signature, is_timeout, is_cancellation, is_retry, issue_fingerprint, host, %s
|
||||
FROM %s.normalized_events FINAL
|
||||
WHERE is_error = 1 AND timestamp >= toDateTime64('%s', 9, 'UTC') AND timestamp < toDateTime64('%s', 9, 'UTC')
|
||||
ORDER BY timestamp LIMIT 2000000`, extra, database, chTime(start), chTime(end)))
|
||||
@@ -64,7 +64,7 @@ func LoadErrorEvents(ctx context.Context, conn driver.Conn, database string, sta
|
||||
var status uint16
|
||||
var timeout, cancel, retry uint8
|
||||
var spanID, parentID, peer, class, ua, traceID string
|
||||
if err := rows.Scan(&e.Timestamp, &e.Service, &e.Release, &e.Kind, &e.Source, &status, &e.SpanName, &e.Route, &e.ExceptionType, &e.Message, &e.PatternSignature, &timeout, &cancel, &retry,
|
||||
if err := rows.Scan(&e.Timestamp, &e.Service, &e.Release, &e.Kind, &e.Source, &status, &e.SpanName, &e.Route, &e.ExceptionType, &e.Message, &e.PatternSignature, &timeout, &cancel, &retry, &e.IssueFingerprint, &e.Host,
|
||||
&spanID, &parentID, &peer, &class, &ua, &traceID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -118,8 +118,20 @@ func resolve(ctx context.Context, conn driver.Conn, database string, start, end
|
||||
if err := rows.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
failing := map[string]map[string]struct{}{} // trace -> services with an error span
|
||||
for _, sp := range spans {
|
||||
if sp.IsError && sp.Service != "" {
|
||||
if failing[sp.TraceID] == nil {
|
||||
failing[sp.TraceID] = map[string]struct{}{}
|
||||
}
|
||||
failing[sp.TraceID][sp.Service] = struct{}{}
|
||||
}
|
||||
}
|
||||
info := tracectx.Resolve(spans)
|
||||
for i, ref := range refs {
|
||||
for sv := range failing[ref.TraceID] {
|
||||
events[i].TraceServices = append(events[i].TraceServices, sv)
|
||||
}
|
||||
in, ok := info[ref]
|
||||
if !ok {
|
||||
if !honeypot.Untrackable(own[i]) {
|
||||
|
||||
Reference in new issue
Block a user