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

chore: load file upload #3552

Merged
merged 8 commits into from
Jul 5, 2023
Merged

chore: load file upload #3552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
494b5bc
chore: load file upload
achettyiitr Jun 26, 2023
d9b4dbe
chore: review comments
achettyiitr Jul 3, 2023
262c1c7
make fmt
achettyiitr Jul 3, 2023
7ef7904
chore: review comments
achettyiitr Jul 3, 2023
dbf6865
chore: master pull
achettyiitr Jul 3, 2023
3f2ae82
chore: master pull
achettyiitr Jul 3, 2023
2436d6b
chore: review comments
achettyiitr Jul 4, 2023
af56f8b
chore: review comments
achettyiitr Jul 5, 2023
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ require (
github.com/xitongsys/parquet-go-source v0.0.0-20230312005205-fbbcdea5f512
go.etcd.io/etcd/api/v3 v3.5.9
go.etcd.io/etcd/client/v3 v3.5.9
go.uber.org/atomic v1.10.0
go.uber.org/automaxprocs v1.5.2
go.uber.org/goleak v1.2.1
golang.org/x/crypto v0.9.0
Expand Down Expand Up @@ -268,7 +269,6 @@ require (
go.opentelemetry.io/otel/sdk/metric v0.37.0 // indirect
go.opentelemetry.io/otel/trace v1.14.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/mod v0.10.0 // indirect
Expand Down
10 changes: 6 additions & 4 deletions warehouse/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"fmt"
"strings"

warehouseutils "github.com/rudderlabs/rudder-server/warehouse/utils"

"github.com/rudderlabs/rudder-server/warehouse/integrations/manager"
"github.com/rudderlabs/rudder-server/warehouse/internal/model"
)
Expand All @@ -24,9 +26,9 @@ type ErrorHandler struct {
// MatchErrorMappings matches the error with the error mappings defined in the integrations
// and returns the corresponding joins of the matched error type
// else returns UnknownError
func (e *ErrorHandler) MatchErrorMappings(err error) Tag {
func (e *ErrorHandler) MatchErrorMappings(err error) warehouseutils.Tag {
if e.Manager == nil || err == nil {
return Tag{Name: "error_mapping", Value: string(model.Noop)}
return warehouseutils.Tag{Name: "error_mapping", Value: string(model.Noop)}
}

var (
Expand All @@ -41,7 +43,7 @@ func (e *ErrorHandler) MatchErrorMappings(err error) Tag {
}

if len(errMappings) > 0 {
return Tag{Name: "error_mapping", Value: strings.Join(errMappings, ",")}
return warehouseutils.Tag{Name: "error_mapping", Value: strings.Join(errMappings, ",")}
}
return Tag{Name: "error_mapping", Value: string(model.UnknownError)}
return warehouseutils.Tag{Name: "error_mapping", Value: string(model.UnknownError)}
}
Loading
Loading