Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Avoid work for already-canceled requests #213

Merged
merged 4 commits into from
Jun 5, 2024
Merged

Avoid work for already-canceled requests #213

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5b98f1
Avoid work for already-canceled requests
jmacd Jun 4, 2024
2c6c67a
Update collector/exporter/otelarrowexporter/internal/arrow/exporter.go
jmacd Jun 5, 2024
0fabaf9
Merge branch 'main' into jmacd/export_early_cancel
jmacd Jun 5, 2024
673e69a
merge fix
jmacd Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions collector/exporter/otelarrowexporter/internal/arrow/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ import (
"go.opentelemetry.io/collector/pdata/ptrace"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/status"
)

// Exporter is 1:1 with exporter, isolates arrow-specific
Expand Down Expand Up @@ -255,6 +257,14 @@ func (e *Exporter) runArrowStream(ctx context.Context, dc doneCancel, state *str
//
// consumer should fall back to standard OTLP, (true, nil)
func (e *Exporter) SendAndWait(ctx context.Context, data any) (bool, error) {
// If the incoming context is already cancaled, return the
jmacd marked this conversation as resolved.
Show resolved Hide resolved
// same error condition a unary gRPC or HTTP exporter would do.
select {
case <-ctx.Done():
return false, status.Errorf(codes.Canceled, "context done before send: %v", ctx.Err())
default:
}

errCh := make(chan error, 1)

// Note that if the OTLP exporter's gRPC Headers field was
Expand Down
9 changes: 9 additions & 0 deletions collector/exporter/otelarrowexporter/internal/arrow/exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ import (
"go.uber.org/zap/zaptest"
"golang.org/x/net/http2/hpack"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
)

var AllPrioritizers = []PrioritizerName{LeastLoadedPrioritizer, LeastLoadedTwoPrioritizer}
Expand Down Expand Up @@ -280,6 +282,13 @@ func TestArrowExporterTimeout(t *testing.T) {
require.Error(t, err)
require.True(t, errors.Is(err, context.Canceled))

// Repeat the request, will get immediate timeout.
sent, err = tc.exporter.SendAndWait(ctx, twoTraces)
stat, is := status.FromError(err)
require.True(t, is, "is a gRPC status error: %v", err)
require.Equal(t, "context done before send: context canceled", stat.Message())
require.Equal(t, codes.Canceled, stat.Code())

require.NoError(t, tc.exporter.Shutdown(ctx))
})
}
Expand Down
Loading