chore: merge master

rudderlabs · Jul 23, 2024 · b76ea10 · b76ea10
2 parents 847391f + 069c23f
commit b76ea10
Show file tree

Hide file tree

Showing 138 changed files with 746 additions and 668 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,36 @@
 # Changelog
 
+## [1.30.0](https://github.com/rudderlabs/rudder-server/compare/v1.29.0...v1.30.0) (2024-07-22)
+
+
+### Features
+
+* drop trigger for populating warehouse schema versions ([#4904](https://github.com/rudderlabs/rudder-server/issues/4904)) ([96558d0](https://github.com/rudderlabs/rudder-server/commit/96558d0251a8728a822f8c331f8d5a60b68b1fc9))
+* onboard new custom destination: wunderkind ([#4798](https://github.com/rudderlabs/rudder-server/issues/4798)) ([8aa0e49](https://github.com/rudderlabs/rudder-server/commit/8aa0e49a3d38f0b29105c1527ae1cbdb9f307684))
+
+
+### Bug Fixes
+
+* fill metadata with typer version id if exist ([#4897](https://github.com/rudderlabs/rudder-server/issues/4897)) ([aab477b](https://github.com/rudderlabs/rudder-server/commit/aab477b462e6b4155ecb144f2b7ac4bd091beb6a))
+* **gateway:** send on closed chan - (*Handle).webRequestQ ([#4709](https://github.com/rudderlabs/rudder-server/issues/4709)) ([d857284](https://github.com/rudderlabs/rudder-server/commit/d85728447884ad491d028e112d0742758f73a1d6))
+* remove successJobs tag from upload in klaviyo bulk ([#4898](https://github.com/rudderlabs/rudder-server/issues/4898)) ([118d01a](https://github.com/rudderlabs/rudder-server/commit/118d01a6154d51703ab08824dcd0b3cd7c6adfc7))
+
+
+### Miscellaneous
+
+* add integration tests for mtu reporting ([#4860](https://github.com/rudderlabs/rudder-server/issues/4860)) ([784a51c](https://github.com/rudderlabs/rudder-server/commit/784a51cd101d70ca2a2b0e9e5394b26b1b0583d2))
+* add missing transformer sent stat ([#4855](https://github.com/rudderlabs/rudder-server/issues/4855)) ([3bc3e38](https://github.com/rudderlabs/rudder-server/commit/3bc3e38ea0af0bfab050d2838ad6c2177443201e))
+* add mock reporting server in mtu integration tests ([#4894](https://github.com/rudderlabs/rudder-server/issues/4894)) ([55cdb59](https://github.com/rudderlabs/rudder-server/commit/55cdb59e65570d3234136316c7e1af95c12818ff))
+* add tests for processor worker ([#4884](https://github.com/rudderlabs/rudder-server/issues/4884)) ([9db1ea4](https://github.com/rudderlabs/rudder-server/commit/9db1ea4a075f295e7780722211832634a64af40a))
+* **deps:** bump github.com/aws/aws-sdk-go from 1.54.14 to 1.54.15 in the frequent group ([#4878](https://github.com/rudderlabs/rudder-server/issues/4878)) ([fe10438](https://github.com/rudderlabs/rudder-server/commit/fe104389765b021c2cb77420b13e7f772bb82a2a))
+* **deps:** bump the frequent group across 1 directory with 2 updates ([#4895](https://github.com/rudderlabs/rudder-server/issues/4895)) ([a2137c0](https://github.com/rudderlabs/rudder-server/commit/a2137c07d599ae6cd96ef61c460512b37476e879))
+* **deps:** bump the go-deps group across 1 directory with 4 updates ([#4900](https://github.com/rudderlabs/rudder-server/issues/4900)) ([f9a8d13](https://github.com/rudderlabs/rudder-server/commit/f9a8d137effe52283fdf97973841c4bedee6341a))
+* flipping SourceID & OriginalSourceID during transformation ([#4887](https://github.com/rudderlabs/rudder-server/issues/4887)) ([009a071](https://github.com/rudderlabs/rudder-server/commit/009a071d05b9ed8bae8182468aec9e20a4516464))
+* include extra columns for errors reporting table ([#4891](https://github.com/rudderlabs/rudder-server/issues/4891)) ([6ca22ca](https://github.com/rudderlabs/rudder-server/commit/6ca22ca1280f35f0a621df195e935eff50ed1d60))
+* update default mtu config ([#4890](https://github.com/rudderlabs/rudder-server/issues/4890)) ([d962876](https://github.com/rudderlabs/rudder-server/commit/d962876974d1d1f1e84fa8f2c2e615d91ed09a50))
+* upgrade go to 1.22.5 ([a80f494](https://github.com/rudderlabs/rudder-server/commit/a80f494e268759cef30e3734b9da1e2828b47735))
+* upgrade go v1.22.5 ([#4905](https://github.com/rudderlabs/rudder-server/issues/4905)) ([a80f494](https://github.com/rudderlabs/rudder-server/commit/a80f494e268759cef30e3734b9da1e2828b47735))
+
 ## [1.29.0](https://github.com/rudderlabs/rudder-server/compare/v1.28.1...v1.29.0) (2024-07-09)
 
 

diff --git a/Makefile b/Makefile
@@ -10,7 +10,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
@@ -100,7 +100,7 @@ install-tools:
 lint: fmt ## Run linters on all go files
  $(GO) run $(GOLANGCI) run -v
  $(GO) run $(govulncheck) ./...
- $(GO) run $(actionlint) 
+ $(GO) run $(actionlint)
 
 .PHONY: fmt
 fmt: install-tools ## Formats all go files

diff --git a/app/cluster/dynamic_test.go b/app/cluster/dynamic_test.go
@@ -6,7 +6,8 @@ import (
  "testing"
  "time"
 
- "github.com/golang/mock/gomock"
+ "go.uber.org/mock/gomock"
+
  "github.com/stretchr/testify/require"
 
  mockjobsforwarder "github.com/rudderlabs/rudder-server/mocks/jobs-forwarder"

diff --git a/app/cluster/integration_test.go b/app/cluster/integration_test.go
@@ -14,7 +14,8 @@ import (
 
  "github.com/rudderlabs/rudder-server/enterprise/trackedusers"
 
- "github.com/golang/mock/gomock"
+ "go.uber.org/mock/gomock"
+
  "github.com/google/uuid"
  "github.com/ory/dockertest/v3"
  "github.com/stretchr/testify/require"

diff --git a/backend-config/backend-config.go b/backend-config/backend-config.go
@@ -1,7 +1,7 @@
 package backendconfig
 
-// go:generate mockgen -destination=../mocks/backend-config/mock_backendconfig.go -package=mock_backendconfig github.com/rudderlabs/rudder-server/backend-config BackendConfig
-// go:generate mockgen -destination=./mock_workspaceconfig.go -package=backendconfig -source=./backend-config.go workspaceConfig
+//go:generate mockgen -destination=../mocks/backend-config/mock_backendconfig.go -package=mock_backendconfig github.com/rudderlabs/rudder-server/backend-config BackendConfig
+//go:generate mockgen -destination=./mock_workspaceconfig.go -package=backendconfig -source=./backend-config.go workspaceConfig
 
 import (
  "context"

diff --git a/backend-config/backend_config_test.go b/backend-config/backend_config_test.go
@@ -16,7 +16,8 @@ import (
  "testing"
  "time"
 
- "github.com/golang/mock/gomock"
+ "go.uber.org/mock/gomock"
+
  "github.com/ory/dockertest/v3"
  "github.com/stretchr/testify/require"
 

diff --git a/backend-config/internal/cache/mock_cache.go b/backend-config/internal/cache/mock_cache.go
diff --git a/backend-config/mock_workspaceconfig.go b/backend-config/mock_workspaceconfig.go
diff --git a/enterprise/reporting/config_subscriber_test.go b/enterprise/reporting/config_subscriber_test.go
@@ -4,8 +4,8 @@ import (
  "context"
  "testing"
 
- "github.com/golang/mock/gomock"
  "github.com/stretchr/testify/require"
+ "go.uber.org/mock/gomock"
 
  "github.com/rudderlabs/rudder-go-kit/logger"
  backendconfig "github.com/rudderlabs/rudder-server/backend-config"

diff --git a/enterprise/reporting/event_stats_test.go b/enterprise/reporting/event_stats_test.go
@@ -4,8 +4,8 @@ import (
  "context"
  "testing"
 
- "github.com/golang/mock/gomock"
  "github.com/stretchr/testify/require"
+ "go.uber.org/mock/gomock"
 
  "github.com/rudderlabs/rudder-go-kit/logger"
  "github.com/rudderlabs/rudder-go-kit/stats/memstats"

diff --git a/enterprise/reporting/flusher/aggregator/aggregator_mock.go b/enterprise/reporting/flusher/aggregator/aggregator_mock.go
diff --git a/enterprise/reporting/flusher/factory_test.go b/enterprise/reporting/flusher/factory_test.go
@@ -4,8 +4,8 @@ import (
  "context"
  "testing"
 
- "github.com/golang/mock/gomock"
  "github.com/stretchr/testify/assert"
+ "go.uber.org/mock/gomock"
 
  "github.com/rudderlabs/rudder-go-kit/config"
  "github.com/rudderlabs/rudder-go-kit/logger"

diff --git a/gateway/gateway_test.go b/gateway/gateway_test.go
@@ -22,7 +22,8 @@ import (
  kithelper "github.com/rudderlabs/rudder-go-kit/testhelper"
  kituuid "github.com/rudderlabs/rudder-go-kit/uuid"
 
- "github.com/golang/mock/gomock"
+ "go.uber.org/mock/gomock"
+
  "github.com/google/uuid"
  . "github.com/onsi/ginkgo/v2"
  . "github.com/onsi/gomega"

diff --git a/gateway/mocks/mockwebhook.go b/gateway/mocks/mockwebhook.go
diff --git a/gateway/webhook/webhook_test.go b/gateway/webhook/webhook_test.go
@@ -13,7 +13,8 @@ import (
  "testing"
  "testing/iotest"
 
- "github.com/golang/mock/gomock"
+ "go.uber.org/mock/gomock"
+
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
 

diff --git a/go.mod b/go.mod
@@ -23,7 +23,7 @@ replace (
 )
 
 require (
- cloud.google.com/go/bigquery v1.61.0
+ cloud.google.com/go/bigquery v1.62.0
  cloud.google.com/go/pubsub v1.40.0
  cloud.google.com/go/storage v1.43.0
  github.com/Azure/azure-storage-blob-go v0.15.0
@@ -33,7 +33,7 @@ require (
  github.com/allisson/go-pglock/v2 v2.0.1
  github.com/apache/pulsar-client-go v0.13.0
  github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
- github.com/aws/aws-sdk-go v1.54.20
+ github.com/aws/aws-sdk-go v1.55.0
  github.com/bugsnag/bugsnag-go/v2 v2.4.0
  github.com/cenkalti/backoff v2.2.1+incompatible
  github.com/cenkalti/backoff/v4 v4.3.0
@@ -74,9 +74,9 @@ require (
  github.com/redis/go-redis/v9 v9.6.0
  github.com/rs/cors v1.11.0
  github.com/rudderlabs/analytics-go v3.3.3+incompatible
- github.com/rudderlabs/bing-ads-go-sdk v0.2.2
+ github.com/rudderlabs/bing-ads-go-sdk v0.2.3
  github.com/rudderlabs/compose-test v0.1.3
- github.com/rudderlabs/rudder-go-kit v0.34.2
+ github.com/rudderlabs/rudder-go-kit v0.35.1
  github.com/rudderlabs/rudder-observability-kit v0.0.3
  github.com/rudderlabs/rudder-schemas v0.5.0
  github.com/rudderlabs/sql-tunnels v0.1.7
@@ -103,11 +103,12 @@ require (
  go.uber.org/atomic v1.11.0
  go.uber.org/automaxprocs v1.5.3
  go.uber.org/goleak v1.3.0
+ go.uber.org/mock v0.4.0
  golang.org/x/exp v0.0.0-20240529005216-23cca8864a10
  golang.org/x/oauth2 v0.21.0
  golang.org/x/sync v0.7.0
- google.golang.org/api v0.188.0
- google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b
+ google.golang.org/api v0.189.0
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade
  google.golang.org/grpc v1.65.0
  google.golang.org/protobuf v1.34.2
 )
@@ -119,9 +120,9 @@ require (
 
 require (
  cloud.google.com/go v0.115.0 // indirect
- cloud.google.com/go/auth v0.7.0 // indirect
- cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
- cloud.google.com/go/compute/metadata v0.4.0 // indirect
+ cloud.google.com/go/auth v0.7.2 // indirect
+ cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
+ cloud.google.com/go/compute/metadata v0.5.0 // indirect
  cloud.google.com/go/iam v1.1.10 // indirect
  dario.cat/mergo v1.0.0 // indirect
  github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
@@ -313,7 +314,7 @@ require (
  golang.org/x/tools v0.22.0 // indirect
  golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
  gonum.org/v1/gonum v0.15.0 // indirect
- google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b // indirect
+ google.golang.org/genproto v0.0.0-20240722135656-d784300faade // indirect
  google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
  gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect