-
Notifications
You must be signed in to change notification settings - Fork 651
fix(go/core): error chaining #4018
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
DEVMANISHOFFL
wants to merge
3
commits into
firebase:main
Choose a base branch
from
DEVMANISHOFFL:fix/error-chaining
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package core | ||
|
|
||
| import ( | ||
| "errors" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestGenkitErrorUnwrap(t *testing.T) { | ||
| original := errors.New("original failure") | ||
|
|
||
| // Use INTERNAL instead of StatusInternal | ||
| gErr := NewError(INTERNAL, "something happened: %v", original) | ||
|
|
||
| // Verify errors.Is works (this is the most important check) | ||
| if !errors.Is(gErr, original) { | ||
| t.Errorf("expected errors.Is to return true, but got false") | ||
| } | ||
|
|
||
| // Verify Unwrap works directly | ||
| if gErr.Unwrap() != original { | ||
| t.Errorf("Unwrap() returned wrong error") | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -134,7 +134,8 @@ func Tracer() trace.Tracer { | |||||
| // such as one that writes to a file. | ||||||
| func WriteTelemetryImmediate(client TelemetryClient) { | ||||||
| e := newTelemetryServerExporter(client) | ||||||
| TracerProvider().RegisterSpanProcessor(sdktrace.NewSimpleSpanProcessor(e)) | ||||||
| filtered := &filteringExporter{exporter: e} | ||||||
| TracerProvider().RegisterSpanProcessor(sdktrace.NewSimpleSpanProcessor(filtered)) | ||||||
| } | ||||||
|
|
||||||
| // WriteTelemetryBatch adds a telemetry server to the global tracer provider. | ||||||
|
|
@@ -146,7 +147,8 @@ func WriteTelemetryImmediate(client TelemetryClient) { | |||||
| // and perform other cleanup. | ||||||
| func WriteTelemetryBatch(client TelemetryClient) (shutdown func(context.Context) error) { | ||||||
| e := newTelemetryServerExporter(client) | ||||||
| TracerProvider().RegisterSpanProcessor(sdktrace.NewBatchSpanProcessor(e)) | ||||||
| filtered := &filteringExporter{exporter: e} | ||||||
| TracerProvider().RegisterSpanProcessor(sdktrace.NewBatchSpanProcessor(filtered)) | ||||||
| return TracerProvider().Shutdown | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -402,3 +404,33 @@ func SpanPath(ctx context.Context) string { | |||||
| func SpanTraceInfo(ctx context.Context) TraceInfo { | ||||||
| return spanMetaKey.FromContext(ctx).TraceInfo | ||||||
| } | ||||||
|
|
||||||
| type filteringExporter struct { | ||||||
| exporter sdktrace.SpanExporter | ||||||
| } | ||||||
|
|
||||||
| func (e *filteringExporter) ExportSpans(ctx context.Context, spans []sdktrace.ReadOnlySpan) error { | ||||||
| var genkitSpans []sdktrace.ReadOnlySpan | ||||||
| for _, span := range spans { | ||||||
| if isGenkitSpan(span) { | ||||||
| genkitSpans = append(genkitSpans, span) | ||||||
| } | ||||||
| } | ||||||
| if len(genkitSpans) == 0 { | ||||||
| return nil | ||||||
| } | ||||||
| return e.exporter.ExportSpans(ctx, genkitSpans) | ||||||
| } | ||||||
|
|
||||||
| func (e *filteringExporter) Shutdown(ctx context.Context) error { | ||||||
| return e.exporter.Shutdown(ctx) | ||||||
| } | ||||||
|
|
||||||
| func isGenkitSpan(span sdktrace.ReadOnlySpan) bool { | ||||||
| for _, attr := range span.Attributes() { | ||||||
| if strings.HasPrefix(string(attr.Key), "genkit") { | ||||||
|
||||||
| if strings.HasPrefix(string(attr.Key), "genkit") { | |
| if strings.HasPrefix(string(attr.Key), attrPrefix) { |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comment says "scan args for the last error to wrap it". The current implementation iterates through all arguments and overwrites
ge.originalErrorif it finds an error. To make this more efficient and to more explicitly match the comment's intent, you could iterate backwards and break after finding the first error (which would be the last one in theargsslice).