Skip to content

Commit bb79d88

Browse files
committed
fix: remove accidental telemetry changes and optimize error scan
1 parent a01ef92 commit bb79d88

File tree

2 files changed

+6
-37
lines changed

2 files changed

+6
-37
lines changed

‎go/core/error.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,13 @@ func NewError(status StatusName, message string, args ...any) *GenkitError {
8080
}
8181

8282
// scan args for the last error to wrap it
83-
for _, arg := range args {
84-
if err, ok := arg.(error); ok {
83+
for i := len(args) - 1; i >= 0; i-- {
84+
if err, ok := args[i].(error); ok {
8585
ge.originalError = err
86+
break
8687
}
8788
}
88-
89+
8990
errStack := string(debug.Stack())
9091
if errStack != "" {
9192
ge.Details = make(map[string]any)

‎go/core/tracing/tracing.go‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ func Tracer() trace.Tracer {
134134
// such as one that writes to a file.
135135
func WriteTelemetryImmediate(client TelemetryClient) {
136136
e := newTelemetryServerExporter(client)
137-
filtered := &filteringExporter{exporter: e}
138-
TracerProvider().RegisterSpanProcessor(sdktrace.NewSimpleSpanProcessor(filtered))
137+
TracerProvider().RegisterSpanProcessor(sdktrace.NewSimpleSpanProcessor(e))
139138
}
140139

141140
// WriteTelemetryBatch adds a telemetry server to the global tracer provider.
@@ -147,8 +146,7 @@ func WriteTelemetryImmediate(client TelemetryClient) {
147146
// and perform other cleanup.
148147
func WriteTelemetryBatch(client TelemetryClient) (shutdown func(context.Context) error) {
149148
e := newTelemetryServerExporter(client)
150-
filtered := &filteringExporter{exporter: e}
151-
TracerProvider().RegisterSpanProcessor(sdktrace.NewBatchSpanProcessor(filtered))
149+
TracerProvider().RegisterSpanProcessor(sdktrace.NewBatchSpanProcessor(e))
152150
return TracerProvider().Shutdown
153151
}
154152

@@ -404,33 +402,3 @@ func SpanPath(ctx context.Context) string {
404402
func SpanTraceInfo(ctx context.Context) TraceInfo {
405403
return spanMetaKey.FromContext(ctx).TraceInfo
406404
}
407-
408-
type filteringExporter struct {
409-
exporter sdktrace.SpanExporter
410-
}
411-
412-
func (e *filteringExporter) ExportSpans(ctx context.Context, spans []sdktrace.ReadOnlySpan) error {
413-
genkitSpans := make([]sdktrace.ReadOnlySpan, 0, len(spans))
414-
for _, span := range spans {
415-
if isGenkitSpan(span) {
416-
genkitSpans = append(genkitSpans, span)
417-
}
418-
}
419-
if len(genkitSpans) == 0 {
420-
return nil
421-
}
422-
return e.exporter.ExportSpans(ctx, genkitSpans)
423-
}
424-
425-
func (e *filteringExporter) Shutdown(ctx context.Context) error {
426-
return e.exporter.Shutdown(ctx)
427-
}
428-
429-
func isGenkitSpan(span sdktrace.ReadOnlySpan) bool {
430-
for _, attr := range span.Attributes() {
431-
if strings.HasPrefix(string(attr.Key), "genkit") {
432-
return true
433-
}
434-
}
435-
return false
436-
}

0 commit comments

Comments
 (0)