diff --git a/Makefile b/Makefile index d5d824c2..640c52e7 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ GOLANGCI=github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.1 gofumpt=mvdan.cc/gofumpt@latest govulncheck=golang.org/x/vuln/cmd/govulncheck@latest goimports=golang.org/x/tools/cmd/goimports@latest -mockgen=github.com/golang/mock/mockgen@v1.6.0 +mockgen=go.uber.org/mock/mockgen@v0.4.0 gotestsum=gotest.tools/gotestsum@v1.11.0 protoc-gen-go=google.golang.org/protobuf/cmd/protoc-gen-go@v1.33.0 protoc-gen-go-grpc=google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 diff --git a/chiware/stats_test.go b/chiware/stats_test.go index 7f49c080..87aa7aaa 100644 --- a/chiware/stats_test.go +++ b/chiware/stats_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/go-chi/chi/v5" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" "github.com/rudderlabs/rudder-go-kit/chiware" "github.com/rudderlabs/rudder-go-kit/stats" diff --git a/filemanager/mock_filemanager/mock_filemanager.go b/filemanager/mock_filemanager/mock_filemanager.go index 68dd9bce..fdc15eeb 100644 --- a/filemanager/mock_filemanager/mock_filemanager.go +++ b/filemanager/mock_filemanager/mock_filemanager.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/rudderlabs/rudder-go-kit/filemanager (interfaces: FileManager) +// +// Generated by this command: +// +// mockgen -destination=mock_filemanager/mock_filemanager.go -package mock_filemanager github.com/rudderlabs/rudder-go-kit/filemanager FileManager +// // Package mock_filemanager is a generated GoMock package. package mock_filemanager @@ -10,8 +15,8 @@ import ( reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" filemanager "github.com/rudderlabs/rudder-go-kit/filemanager" + gomock "go.uber.org/mock/gomock" ) // MockFileManager is a mock of FileManager interface. @@ -46,7 +51,7 @@ func (m *MockFileManager) Delete(arg0 context.Context, arg1 []string) error { } // Delete indicates an expected call of Delete. -func (mr *MockFileManagerMockRecorder) Delete(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockFileManagerMockRecorder) Delete(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockFileManager)(nil).Delete), arg0, arg1) } @@ -60,7 +65,7 @@ func (m *MockFileManager) Download(arg0 context.Context, arg1 *os.File, arg2 str } // Download indicates an expected call of Download. -func (mr *MockFileManagerMockRecorder) Download(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockFileManagerMockRecorder) Download(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Download", reflect.TypeOf((*MockFileManager)(nil).Download), arg0, arg1, arg2) } @@ -74,7 +79,7 @@ func (m *MockFileManager) GetDownloadKeyFromFileLocation(arg0 string) string { } // GetDownloadKeyFromFileLocation indicates an expected call of GetDownloadKeyFromFileLocation. -func (mr *MockFileManagerMockRecorder) GetDownloadKeyFromFileLocation(arg0 interface{}) *gomock.Call { +func (mr *MockFileManagerMockRecorder) GetDownloadKeyFromFileLocation(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDownloadKeyFromFileLocation", reflect.TypeOf((*MockFileManager)(nil).GetDownloadKeyFromFileLocation), arg0) } @@ -89,7 +94,7 @@ func (m *MockFileManager) GetObjectNameFromLocation(arg0 string) (string, error) } // GetObjectNameFromLocation indicates an expected call of GetObjectNameFromLocation. -func (mr *MockFileManagerMockRecorder) GetObjectNameFromLocation(arg0 interface{}) *gomock.Call { +func (mr *MockFileManagerMockRecorder) GetObjectNameFromLocation(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetObjectNameFromLocation", reflect.TypeOf((*MockFileManager)(nil).GetObjectNameFromLocation), arg0) } @@ -103,7 +108,7 @@ func (m *MockFileManager) ListFilesWithPrefix(arg0 context.Context, arg1, arg2 s } // ListFilesWithPrefix indicates an expected call of ListFilesWithPrefix. -func (mr *MockFileManagerMockRecorder) ListFilesWithPrefix(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockFileManagerMockRecorder) ListFilesWithPrefix(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListFilesWithPrefix", reflect.TypeOf((*MockFileManager)(nil).ListFilesWithPrefix), arg0, arg1, arg2, arg3) } @@ -129,7 +134,7 @@ func (m *MockFileManager) SetTimeout(arg0 time.Duration) { } // SetTimeout indicates an expected call of SetTimeout. -func (mr *MockFileManagerMockRecorder) SetTimeout(arg0 interface{}) *gomock.Call { +func (mr *MockFileManagerMockRecorder) SetTimeout(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTimeout", reflect.TypeOf((*MockFileManager)(nil).SetTimeout), arg0) } @@ -137,7 +142,7 @@ func (mr *MockFileManagerMockRecorder) SetTimeout(arg0 interface{}) *gomock.Call // Upload mocks base method. func (m *MockFileManager) Upload(arg0 context.Context, arg1 *os.File, arg2 ...string) (filemanager.UploadedFile, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} + varargs := []any{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } @@ -148,8 +153,8 @@ func (m *MockFileManager) Upload(arg0 context.Context, arg1 *os.File, arg2 ...st } // Upload indicates an expected call of Upload. -func (mr *MockFileManagerMockRecorder) Upload(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockFileManagerMockRecorder) Upload(arg0, arg1 any, arg2 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Upload", reflect.TypeOf((*MockFileManager)(nil).Upload), varargs...) } diff --git a/go.mod b/go.mod index ea5cf71c..6bfd0e4d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/rudderlabs/rudder-go-kit -go 1.22.4 +go 1.22.5 require ( cloud.google.com/go/storage v1.41.0 @@ -12,7 +12,6 @@ require ( github.com/go-chi/chi/v5 v5.0.12 github.com/go-redis/redis/v8 v8.11.5 github.com/gofrs/uuid v4.4.0+incompatible - github.com/golang/mock v1.6.0 github.com/google/uuid v1.6.0 github.com/joho/godotenv v1.5.1 github.com/json-iterator/go v1.1.12 @@ -47,6 +46,7 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.27.0 go.opentelemetry.io/otel/trace v1.27.0 go.uber.org/goleak v1.3.0 + go.uber.org/mock v0.4.0 go.uber.org/zap v1.27.0 golang.org/x/crypto v0.24.0 golang.org/x/oauth2 v0.21.0 @@ -58,22 +58,14 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 ) -require ( - cloud.google.com/go/pubsub v1.38.0 // indirect - dario.cat/mergo v1.0.0 // indirect - github.com/google/renameio/v2 v2.0.0 // indirect - github.com/gorilla/handlers v1.5.2 // indirect - github.com/gorilla/mux v1.8.1 // indirect - github.com/pkg/xattr v0.4.9 // indirect - google.golang.org/grpc v1.64.0 // indirect -) - require ( cloud.google.com/go v0.114.0 // indirect cloud.google.com/go/auth v0.5.1 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect cloud.google.com/go/compute/metadata v0.3.0 // indirect cloud.google.com/go/iam v1.1.8 // indirect + cloud.google.com/go/pubsub v1.38.0 // indirect + dario.cat/mergo v1.0.0 // indirect github.com/Azure/azure-pipeline-go v0.2.3 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect @@ -101,10 +93,13 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/renameio/v2 v2.0.0 // indirect github.com/google/s2a-go v0.1.7 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.4 // indirect + github.com/gorilla/handlers v1.5.2 // indirect + github.com/gorilla/mux v1.8.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect @@ -127,6 +122,7 @@ require ( github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pkg/errors v0.9.1 // indirect + github.com/pkg/xattr v0.4.9 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/procfs v0.12.0 // indirect @@ -166,6 +162,7 @@ require ( google.golang.org/genproto v0.0.0-20240528184218-531527333157 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.64.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 895b399f..c70ed0b7 100644 --- a/go.sum +++ b/go.sum @@ -207,8 +207,6 @@ github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= @@ -542,7 +540,6 @@ github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= @@ -623,7 +620,6 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= @@ -643,7 +639,6 @@ golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -661,7 +656,6 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= @@ -680,9 +674,7 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -728,7 +720,6 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= diff --git a/logger/mock_logger/mock_logger.go b/logger/mock_logger/mock_logger.go index 5d4456f5..592eefc1 100644 --- a/logger/mock_logger/mock_logger.go +++ b/logger/mock_logger/mock_logger.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/rudderlabs/rudder-go-kit/logger (interfaces: Logger) +// +// Generated by this command: +// +// mockgen -destination=mock_logger/mock_logger.go -package mock_logger github.com/rudderlabs/rudder-go-kit/logger Logger +// // Package mock_logger is a generated GoMock package. package mock_logger @@ -8,8 +13,8 @@ import ( http "net/http" reflect "reflect" - gomock "github.com/golang/mock/gomock" logger "github.com/rudderlabs/rudder-go-kit/logger" + gomock "go.uber.org/mock/gomock" ) // MockLogger is a mock of Logger interface. @@ -44,15 +49,15 @@ func (m *MockLogger) Child(arg0 string) logger.Logger { } // Child indicates an expected call of Child. -func (mr *MockLoggerMockRecorder) Child(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Child(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Child", reflect.TypeOf((*MockLogger)(nil).Child), arg0) } // Debug mocks base method. -func (m *MockLogger) Debug(arg0 ...interface{}) { +func (m *MockLogger) Debug(arg0 ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -60,15 +65,15 @@ func (m *MockLogger) Debug(arg0 ...interface{}) { } // Debug indicates an expected call of Debug. -func (mr *MockLoggerMockRecorder) Debug(arg0 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debug(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), arg0...) } // Debugf mocks base method. -func (m *MockLogger) Debugf(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Debugf(arg0 string, arg1 ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -76,16 +81,16 @@ func (m *MockLogger) Debugf(arg0 string, arg1 ...interface{}) { } // Debugf indicates an expected call of Debugf. -func (mr *MockLoggerMockRecorder) Debugf(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debugf(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debugf", reflect.TypeOf((*MockLogger)(nil).Debugf), varargs...) } // Debugn mocks base method. func (m *MockLogger) Debugn(arg0 string, arg1 ...logger.Field) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -93,16 +98,16 @@ func (m *MockLogger) Debugn(arg0 string, arg1 ...logger.Field) { } // Debugn indicates an expected call of Debugn. -func (mr *MockLoggerMockRecorder) Debugn(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debugn(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debugn", reflect.TypeOf((*MockLogger)(nil).Debugn), varargs...) } // Debugw mocks base method. -func (m *MockLogger) Debugw(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Debugw(arg0 string, arg1 ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -110,16 +115,16 @@ func (m *MockLogger) Debugw(arg0 string, arg1 ...interface{}) { } // Debugw indicates an expected call of Debugw. -func (mr *MockLoggerMockRecorder) Debugw(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debugw(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debugw", reflect.TypeOf((*MockLogger)(nil).Debugw), varargs...) } // Error mocks base method. -func (m *MockLogger) Error(arg0 ...interface{}) { +func (m *MockLogger) Error(arg0 ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -127,15 +132,15 @@ func (m *MockLogger) Error(arg0 ...interface{}) { } // Error indicates an expected call of Error. -func (mr *MockLoggerMockRecorder) Error(arg0 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Error(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), arg0...) } // Errorf mocks base method. -func (m *MockLogger) Errorf(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Errorf(arg0 string, arg1 ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -143,16 +148,16 @@ func (m *MockLogger) Errorf(arg0 string, arg1 ...interface{}) { } // Errorf indicates an expected call of Errorf. -func (mr *MockLoggerMockRecorder) Errorf(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Errorf(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Errorf", reflect.TypeOf((*MockLogger)(nil).Errorf), varargs...) } // Errorn mocks base method. func (m *MockLogger) Errorn(arg0 string, arg1 ...logger.Field) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -160,16 +165,16 @@ func (m *MockLogger) Errorn(arg0 string, arg1 ...logger.Field) { } // Errorn indicates an expected call of Errorn. -func (mr *MockLoggerMockRecorder) Errorn(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Errorn(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Errorn", reflect.TypeOf((*MockLogger)(nil).Errorn), varargs...) } // Errorw mocks base method. -func (m *MockLogger) Errorw(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Errorw(arg0 string, arg1 ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -177,16 +182,16 @@ func (m *MockLogger) Errorw(arg0 string, arg1 ...interface{}) { } // Errorw indicates an expected call of Errorw. -func (mr *MockLoggerMockRecorder) Errorw(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Errorw(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Errorw", reflect.TypeOf((*MockLogger)(nil).Errorw), varargs...) } // Fatal mocks base method. -func (m *MockLogger) Fatal(arg0 ...interface{}) { +func (m *MockLogger) Fatal(arg0 ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -194,15 +199,15 @@ func (m *MockLogger) Fatal(arg0 ...interface{}) { } // Fatal indicates an expected call of Fatal. -func (mr *MockLoggerMockRecorder) Fatal(arg0 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Fatal(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Fatal", reflect.TypeOf((*MockLogger)(nil).Fatal), arg0...) } // Fatalf mocks base method. -func (m *MockLogger) Fatalf(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Fatalf(arg0 string, arg1 ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -210,16 +215,16 @@ func (m *MockLogger) Fatalf(arg0 string, arg1 ...interface{}) { } // Fatalf indicates an expected call of Fatalf. -func (mr *MockLoggerMockRecorder) Fatalf(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Fatalf(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Fatalf", reflect.TypeOf((*MockLogger)(nil).Fatalf), varargs...) } // Fataln mocks base method. func (m *MockLogger) Fataln(arg0 string, arg1 ...logger.Field) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -227,16 +232,16 @@ func (m *MockLogger) Fataln(arg0 string, arg1 ...logger.Field) { } // Fataln indicates an expected call of Fataln. -func (mr *MockLoggerMockRecorder) Fataln(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Fataln(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Fataln", reflect.TypeOf((*MockLogger)(nil).Fataln), varargs...) } // Fatalw mocks base method. -func (m *MockLogger) Fatalw(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Fatalw(arg0 string, arg1 ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -244,16 +249,16 @@ func (m *MockLogger) Fatalw(arg0 string, arg1 ...interface{}) { } // Fatalw indicates an expected call of Fatalw. -func (mr *MockLoggerMockRecorder) Fatalw(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Fatalw(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Fatalw", reflect.TypeOf((*MockLogger)(nil).Fatalw), varargs...) } // Info mocks base method. -func (m *MockLogger) Info(arg0 ...interface{}) { +func (m *MockLogger) Info(arg0 ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -261,15 +266,15 @@ func (m *MockLogger) Info(arg0 ...interface{}) { } // Info indicates an expected call of Info. -func (mr *MockLoggerMockRecorder) Info(arg0 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Info(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), arg0...) } // Infof mocks base method. -func (m *MockLogger) Infof(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Infof(arg0 string, arg1 ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -277,16 +282,16 @@ func (m *MockLogger) Infof(arg0 string, arg1 ...interface{}) { } // Infof indicates an expected call of Infof. -func (mr *MockLoggerMockRecorder) Infof(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Infof(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Infof", reflect.TypeOf((*MockLogger)(nil).Infof), varargs...) } // Infon mocks base method. func (m *MockLogger) Infon(arg0 string, arg1 ...logger.Field) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -294,16 +299,16 @@ func (m *MockLogger) Infon(arg0 string, arg1 ...logger.Field) { } // Infon indicates an expected call of Infon. -func (mr *MockLoggerMockRecorder) Infon(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Infon(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Infon", reflect.TypeOf((*MockLogger)(nil).Infon), varargs...) } // Infow mocks base method. -func (m *MockLogger) Infow(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Infow(arg0 string, arg1 ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -311,9 +316,9 @@ func (m *MockLogger) Infow(arg0 string, arg1 ...interface{}) { } // Infow indicates an expected call of Infow. -func (mr *MockLoggerMockRecorder) Infow(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Infow(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Infow", reflect.TypeOf((*MockLogger)(nil).Infow), varargs...) } @@ -338,15 +343,15 @@ func (m *MockLogger) LogRequest(arg0 *http.Request) { } // LogRequest indicates an expected call of LogRequest. -func (mr *MockLoggerMockRecorder) LogRequest(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) LogRequest(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogRequest", reflect.TypeOf((*MockLogger)(nil).LogRequest), arg0) } // Warn mocks base method. -func (m *MockLogger) Warn(arg0 ...interface{}) { +func (m *MockLogger) Warn(arg0 ...any) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -354,15 +359,15 @@ func (m *MockLogger) Warn(arg0 ...interface{}) { } // Warn indicates an expected call of Warn. -func (mr *MockLoggerMockRecorder) Warn(arg0 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warn(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockLogger)(nil).Warn), arg0...) } // Warnf mocks base method. -func (m *MockLogger) Warnf(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Warnf(arg0 string, arg1 ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -370,16 +375,16 @@ func (m *MockLogger) Warnf(arg0 string, arg1 ...interface{}) { } // Warnf indicates an expected call of Warnf. -func (mr *MockLoggerMockRecorder) Warnf(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warnf(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warnf", reflect.TypeOf((*MockLogger)(nil).Warnf), varargs...) } // Warnn mocks base method. func (m *MockLogger) Warnn(arg0 string, arg1 ...logger.Field) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -387,16 +392,16 @@ func (m *MockLogger) Warnn(arg0 string, arg1 ...logger.Field) { } // Warnn indicates an expected call of Warnn. -func (mr *MockLoggerMockRecorder) Warnn(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warnn(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warnn", reflect.TypeOf((*MockLogger)(nil).Warnn), varargs...) } // Warnw mocks base method. -func (m *MockLogger) Warnw(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Warnw(arg0 string, arg1 ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -404,16 +409,16 @@ func (m *MockLogger) Warnw(arg0 string, arg1 ...interface{}) { } // Warnw indicates an expected call of Warnw. -func (mr *MockLoggerMockRecorder) Warnw(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warnw(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warnw", reflect.TypeOf((*MockLogger)(nil).Warnw), varargs...) } // With mocks base method. -func (m *MockLogger) With(arg0 ...interface{}) logger.Logger { +func (m *MockLogger) With(arg0 ...any) logger.Logger { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -423,7 +428,7 @@ func (m *MockLogger) With(arg0 ...interface{}) logger.Logger { } // With indicates an expected call of With. -func (mr *MockLoggerMockRecorder) With(arg0 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) With(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "With", reflect.TypeOf((*MockLogger)(nil).With), arg0...) } @@ -431,7 +436,7 @@ func (mr *MockLoggerMockRecorder) With(arg0 ...interface{}) *gomock.Call { // Withn mocks base method. func (m *MockLogger) Withn(arg0 ...logger.Field) logger.Logger { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -441,7 +446,7 @@ func (m *MockLogger) Withn(arg0 ...logger.Field) logger.Logger { } // Withn indicates an expected call of Withn. -func (mr *MockLoggerMockRecorder) Withn(arg0 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Withn(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Withn", reflect.TypeOf((*MockLogger)(nil).Withn), arg0...) } diff --git a/sftp/mock_sftp/mock_sftp_client.go b/sftp/mock_sftp/mock_sftp_client.go index 2c808515..cf8064bc 100644 --- a/sftp/mock_sftp/mock_sftp_client.go +++ b/sftp/mock_sftp/mock_sftp_client.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/rudderlabs/rudder-go-kit/sftp (interfaces: Client) +// +// Generated by this command: +// +// mockgen -destination=mock_sftp/mock_sftp_client.go -package mock_sftp github.com/rudderlabs/rudder-go-kit/sftp Client +// // Package mock_sftp is a generated GoMock package. package mock_sftp @@ -8,7 +13,7 @@ import ( io "io" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockClient is a mock of Client interface. @@ -43,7 +48,7 @@ func (m *MockClient) MkdirAll(arg0 string) error { } // MkdirAll indicates an expected call of MkdirAll. -func (mr *MockClientMockRecorder) MkdirAll(arg0 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) MkdirAll(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MkdirAll", reflect.TypeOf((*MockClient)(nil).MkdirAll), arg0) } @@ -58,7 +63,7 @@ func (m *MockClient) OpenFile(arg0 string, arg1 int) (io.ReadWriteCloser, error) } // OpenFile indicates an expected call of OpenFile. -func (mr *MockClientMockRecorder) OpenFile(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) OpenFile(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OpenFile", reflect.TypeOf((*MockClient)(nil).OpenFile), arg0, arg1) } @@ -72,7 +77,7 @@ func (m *MockClient) Remove(arg0 string) error { } // Remove indicates an expected call of Remove. -func (mr *MockClientMockRecorder) Remove(arg0 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Remove(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Remove", reflect.TypeOf((*MockClient)(nil).Remove), arg0) } diff --git a/sftp/sftp_test.go b/sftp/sftp_test.go index 169dfdb2..0bb88008 100644 --- a/sftp/sftp_test.go +++ b/sftp/sftp_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/ory/dockertest/v3" "github.com/pkg/sftp" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" "github.com/rudderlabs/rudder-go-kit/sftp/mock_sftp" "github.com/rudderlabs/rudder-go-kit/testhelper/docker/resource/sshserver" diff --git a/stats/mock_stats/mock_stats.go b/stats/mock_stats/mock_stats.go index 8196a043..a959ce67 100644 --- a/stats/mock_stats/mock_stats.go +++ b/stats/mock_stats/mock_stats.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/rudderlabs/rudder-go-kit/stats (interfaces: Stats,Measurement) +// +// Generated by this command: +// +// mockgen -destination=mock_stats/mock_stats.go -package mock_stats github.com/rudderlabs/rudder-go-kit/stats Stats,Measurement +// // Package mock_stats is a generated GoMock package. package mock_stats @@ -9,8 +14,8 @@ import ( reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" stats "github.com/rudderlabs/rudder-go-kit/stats" + gomock "go.uber.org/mock/gomock" ) // MockStats is a mock of Stats interface. @@ -45,7 +50,7 @@ func (m *MockStats) NewSampledTaggedStat(arg0, arg1 string, arg2 stats.Tags) sta } // NewSampledTaggedStat indicates an expected call of NewSampledTaggedStat. -func (mr *MockStatsMockRecorder) NewSampledTaggedStat(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockStatsMockRecorder) NewSampledTaggedStat(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewSampledTaggedStat", reflect.TypeOf((*MockStats)(nil).NewSampledTaggedStat), arg0, arg1, arg2) } @@ -59,7 +64,7 @@ func (m *MockStats) NewStat(arg0, arg1 string) stats.Measurement { } // NewStat indicates an expected call of NewStat. -func (mr *MockStatsMockRecorder) NewStat(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockStatsMockRecorder) NewStat(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewStat", reflect.TypeOf((*MockStats)(nil).NewStat), arg0, arg1) } @@ -73,7 +78,7 @@ func (m *MockStats) NewTaggedStat(arg0, arg1 string, arg2 stats.Tags) stats.Meas } // NewTaggedStat indicates an expected call of NewTaggedStat. -func (mr *MockStatsMockRecorder) NewTaggedStat(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockStatsMockRecorder) NewTaggedStat(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTaggedStat", reflect.TypeOf((*MockStats)(nil).NewTaggedStat), arg0, arg1, arg2) } @@ -87,7 +92,7 @@ func (m *MockStats) NewTracer(arg0 string) stats.Tracer { } // NewTracer indicates an expected call of NewTracer. -func (mr *MockStatsMockRecorder) NewTracer(arg0 interface{}) *gomock.Call { +func (mr *MockStatsMockRecorder) NewTracer(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTracer", reflect.TypeOf((*MockStats)(nil).NewTracer), arg0) } @@ -101,7 +106,7 @@ func (m *MockStats) Start(arg0 context.Context, arg1 stats.GoRoutineFactory) err } // Start indicates an expected call of Start. -func (mr *MockStatsMockRecorder) Start(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockStatsMockRecorder) Start(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockStats)(nil).Start), arg0, arg1) } @@ -148,19 +153,19 @@ func (m *MockMeasurement) Count(arg0 int) { } // Count indicates an expected call of Count. -func (mr *MockMeasurementMockRecorder) Count(arg0 interface{}) *gomock.Call { +func (mr *MockMeasurementMockRecorder) Count(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Count", reflect.TypeOf((*MockMeasurement)(nil).Count), arg0) } // Gauge mocks base method. -func (m *MockMeasurement) Gauge(arg0 interface{}) { +func (m *MockMeasurement) Gauge(arg0 any) { m.ctrl.T.Helper() m.ctrl.Call(m, "Gauge", arg0) } // Gauge indicates an expected call of Gauge. -func (mr *MockMeasurementMockRecorder) Gauge(arg0 interface{}) *gomock.Call { +func (mr *MockMeasurementMockRecorder) Gauge(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Gauge", reflect.TypeOf((*MockMeasurement)(nil).Gauge), arg0) } @@ -184,7 +189,7 @@ func (m *MockMeasurement) Observe(arg0 float64) { } // Observe indicates an expected call of Observe. -func (mr *MockMeasurementMockRecorder) Observe(arg0 interface{}) *gomock.Call { +func (mr *MockMeasurementMockRecorder) Observe(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Observe", reflect.TypeOf((*MockMeasurement)(nil).Observe), arg0) } @@ -210,7 +215,7 @@ func (m *MockMeasurement) SendTiming(arg0 time.Duration) { } // SendTiming indicates an expected call of SendTiming. -func (mr *MockMeasurementMockRecorder) SendTiming(arg0 interface{}) *gomock.Call { +func (mr *MockMeasurementMockRecorder) SendTiming(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendTiming", reflect.TypeOf((*MockMeasurement)(nil).SendTiming), arg0) } @@ -222,7 +227,7 @@ func (m *MockMeasurement) Since(arg0 time.Time) { } // Since indicates an expected call of Since. -func (mr *MockMeasurementMockRecorder) Since(arg0 interface{}) *gomock.Call { +func (mr *MockMeasurementMockRecorder) Since(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Since", reflect.TypeOf((*MockMeasurement)(nil).Since), arg0) } diff --git a/stats/otel_test.go b/stats/otel_test.go index d1ce9a77..a26d4fc1 100644 --- a/stats/otel_test.go +++ b/stats/otel_test.go @@ -13,7 +13,6 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/ory/dockertest/v3" "github.com/prometheus/client_golang/prometheus" promClient "github.com/prometheus/client_model/go" @@ -26,6 +25,7 @@ import ( "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/resource" semconv "go.opentelemetry.io/otel/semconv/v1.25.0" + "go.uber.org/mock/gomock" "github.com/rudderlabs/rudder-go-kit/config" "github.com/rudderlabs/rudder-go-kit/httputil"