diff --git a/exporter/cmd/excel-exporter/main.go b/exporter/cmd/excel-exporter/main.go index 7af5307..a47fcdb 100644 --- a/exporter/cmd/excel-exporter/main.go +++ b/exporter/cmd/excel-exporter/main.go @@ -8,13 +8,14 @@ import ( "path/filepath" "syscall" + "golang.org/x/sync/errgroup" + "golang.org/x/xerrors" + "gopkg.in/yaml.v2" + "go.ytsaurus.tech/library/go/core/log" logzap "go.ytsaurus.tech/library/go/core/log/zap" "go.ytsaurus.tech/yt/go/ytlog" "go.ytsaurus.tech/yt/microservices/excel/exporter/internal/app" - "golang.org/x/sync/errgroup" - "golang.org/x/xerrors" - "gopkg.in/yaml.v2" ) func main() { diff --git a/exporter/internal/app/api.go b/exporter/internal/app/api.go index 4700021..191e654 100644 --- a/exporter/internal/app/api.go +++ b/exporter/internal/app/api.go @@ -10,6 +10,7 @@ import ( "github.com/go-chi/chi/v5" "go.uber.org/atomic" + "go.ytsaurus.tech/library/go/core/log" "go.ytsaurus.tech/library/go/core/metrics" "go.ytsaurus.tech/library/go/core/xerrors" diff --git a/exporter/internal/app/app.go b/exporter/internal/app/app.go index 28a1bca..a3f0804 100644 --- a/exporter/internal/app/app.go +++ b/exporter/internal/app/app.go @@ -8,11 +8,12 @@ import ( "time" "github.com/go-chi/chi/v5" + "golang.org/x/sync/errgroup" + "go.ytsaurus.tech/library/go/core/log" "go.ytsaurus.tech/library/go/httputil/middleware/httpmetrics" "go.ytsaurus.tech/yt/go/yt" "go.ytsaurus.tech/yt/go/yt/ythttp" - "golang.org/x/sync/errgroup" ) const httpServerGracefulStopTimeout = 30 * time.Second diff --git a/exporter/internal/app/metrics.go b/exporter/internal/app/metrics.go index 3da0280..f62c35a 100644 --- a/exporter/internal/app/metrics.go +++ b/exporter/internal/app/metrics.go @@ -4,6 +4,7 @@ import ( "net/http" "github.com/go-chi/chi/v5" + "go.ytsaurus.tech/library/go/core/metrics" "go.ytsaurus.tech/library/go/core/metrics/prometheus" ) diff --git a/exporter/internal/app/middleware.go b/exporter/internal/app/middleware.go index b153c59..f55da45 100644 --- a/exporter/internal/app/middleware.go +++ b/exporter/internal/app/middleware.go @@ -13,13 +13,14 @@ import ( "github.com/go-chi/chi/v5/middleware" "github.com/golang/protobuf/proto" "go.uber.org/atomic" + "golang.org/x/xerrors" + "go.ytsaurus.tech/library/go/core/log" "go.ytsaurus.tech/library/go/core/log/ctxlog" "go.ytsaurus.tech/yt/go/guid" "go.ytsaurus.tech/yt/go/proto/core/rpc" "go.ytsaurus.tech/yt/go/yt" "go.ytsaurus.tech/yt/go/yterrors" - "golang.org/x/xerrors" ) const ( diff --git a/exporter/internal/exporter/converter.go b/exporter/internal/exporter/converter.go index 3d1ffb7..5ed92cb 100644 --- a/exporter/internal/exporter/converter.go +++ b/exporter/internal/exporter/converter.go @@ -7,6 +7,7 @@ import ( "github.com/c2h5oh/datasize" "github.com/xuri/excelize/v2" + "go.ytsaurus.tech/library/go/core/xerrors" "go.ytsaurus.tech/yt/go/schema" "go.ytsaurus.tech/yt/go/yson" diff --git a/exporter/internal/exporter/converter_test.go b/exporter/internal/exporter/converter_test.go index 04e60ae..e7c9a92 100644 --- a/exporter/internal/exporter/converter_test.go +++ b/exporter/internal/exporter/converter_test.go @@ -8,6 +8,7 @@ import ( "github.com/stretchr/testify/require" "github.com/xuri/excelize/v2" + "go.ytsaurus.tech/yt/go/schema" "go.ytsaurus.tech/yt/go/yson" ) diff --git a/exporter/internal/exporter/exporter.go b/exporter/internal/exporter/exporter.go index d69a2f6..8312a48 100644 --- a/exporter/internal/exporter/exporter.go +++ b/exporter/internal/exporter/exporter.go @@ -6,6 +6,7 @@ import ( "strings" "github.com/xuri/excelize/v2" + "go.ytsaurus.tech/library/go/core/xerrors" "go.ytsaurus.tech/yt/go/schema" "go.ytsaurus.tech/yt/go/ypath" diff --git a/exporter/internal/exporter/exporter_test.go b/exporter/internal/exporter/exporter_test.go index 82e4e9b..1c3618c 100644 --- a/exporter/internal/exporter/exporter_test.go +++ b/exporter/internal/exporter/exporter_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" + "go.ytsaurus.tech/library/go/core/log/zap" "go.ytsaurus.tech/yt/go/guid" "go.ytsaurus.tech/yt/go/schema" diff --git a/uploader/cmd/excel-uploader/main.go b/uploader/cmd/excel-uploader/main.go index b2f8dbc..128d6bf 100644 --- a/uploader/cmd/excel-uploader/main.go +++ b/uploader/cmd/excel-uploader/main.go @@ -8,13 +8,14 @@ import ( "path/filepath" "syscall" + "golang.org/x/sync/errgroup" + "golang.org/x/xerrors" + "gopkg.in/yaml.v2" + "go.ytsaurus.tech/library/go/core/log" logzap "go.ytsaurus.tech/library/go/core/log/zap" "go.ytsaurus.tech/yt/go/ytlog" "go.ytsaurus.tech/yt/microservices/excel/uploader/internal/app" - "golang.org/x/sync/errgroup" - "golang.org/x/xerrors" - "gopkg.in/yaml.v2" ) func main() { diff --git a/uploader/internal/app/api.go b/uploader/internal/app/api.go index 9c83c09..592de15 100644 --- a/uploader/internal/app/api.go +++ b/uploader/internal/app/api.go @@ -10,6 +10,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/xuri/excelize/v2" "go.uber.org/atomic" + "go.ytsaurus.tech/library/go/core/log" "go.ytsaurus.tech/library/go/core/metrics" "go.ytsaurus.tech/library/go/core/xerrors" diff --git a/uploader/internal/app/app.go b/uploader/internal/app/app.go index 4997285..40c28d6 100644 --- a/uploader/internal/app/app.go +++ b/uploader/internal/app/app.go @@ -7,11 +7,12 @@ import ( "time" "github.com/go-chi/chi/v5" + "golang.org/x/sync/errgroup" + "go.ytsaurus.tech/library/go/core/log" "go.ytsaurus.tech/library/go/httputil/middleware/httpmetrics" "go.ytsaurus.tech/yt/go/yt" "go.ytsaurus.tech/yt/go/yt/ythttp" - "golang.org/x/sync/errgroup" ) const httpServerGracefulStopTimeout = 30 * time.Second diff --git a/uploader/internal/app/metrics.go b/uploader/internal/app/metrics.go index 3da0280..f62c35a 100644 --- a/uploader/internal/app/metrics.go +++ b/uploader/internal/app/metrics.go @@ -4,6 +4,7 @@ import ( "net/http" "github.com/go-chi/chi/v5" + "go.ytsaurus.tech/library/go/core/metrics" "go.ytsaurus.tech/library/go/core/metrics/prometheus" ) diff --git a/uploader/internal/app/middleware.go b/uploader/internal/app/middleware.go index a639b4f..d74dfbc 100644 --- a/uploader/internal/app/middleware.go +++ b/uploader/internal/app/middleware.go @@ -13,13 +13,14 @@ import ( "github.com/go-chi/chi/v5/middleware" "github.com/golang/protobuf/proto" "go.uber.org/atomic" + "golang.org/x/xerrors" + "go.ytsaurus.tech/library/go/core/log" "go.ytsaurus.tech/library/go/core/log/ctxlog" "go.ytsaurus.tech/yt/go/guid" "go.ytsaurus.tech/yt/go/proto/core/rpc" "go.ytsaurus.tech/yt/go/yt" "go.ytsaurus.tech/yt/go/yterrors" - "golang.org/x/xerrors" ) const ( diff --git a/uploader/internal/uploader/uploader.go b/uploader/internal/uploader/uploader.go index 8b6cb05..1fa672f 100644 --- a/uploader/internal/uploader/uploader.go +++ b/uploader/internal/uploader/uploader.go @@ -9,6 +9,7 @@ import ( "time" "github.com/xuri/excelize/v2" + "go.ytsaurus.tech/library/go/core/xerrors" "go.ytsaurus.tech/yt/go/schema" "go.ytsaurus.tech/yt/go/ypath" diff --git a/uploader/internal/uploader/uploader_test.go b/uploader/internal/uploader/uploader_test.go index be91731..1248cdc 100644 --- a/uploader/internal/uploader/uploader_test.go +++ b/uploader/internal/uploader/uploader_test.go @@ -8,6 +8,7 @@ import ( "github.com/stretchr/testify/require" "github.com/xuri/excelize/v2" + "go.ytsaurus.tech/yt/go/schema" "go.ytsaurus.tech/yt/go/ypath" "go.ytsaurus.tech/yt/go/yt"