Merge branch 'master' into feature/pipe-258-use-append-vs-merge-optio…

…n-from-backend-config-ui
rudderlabs · Oct 25, 2023 · e738f57 · e738f57
2 parents f942511 + 03a4c26
commit e738f57
Show file tree

Hide file tree

Showing 46 changed files with 578 additions and 257 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.15.4](https://github.com/rudderlabs/rudder-server/compare/v1.15.3...v1.15.4) (2023-10-23)
+
+
+### Bug Fixes
+
+* invalid memory address or nil pointer dereference in googlecloudfunction ([#4003](https://github.com/rudderlabs/rudder-server/issues/4003)) ([ccb6068](https://github.com/rudderlabs/rudder-server/commit/ccb606876b4b487bf6eb33a489e6aee6aba5fb89))
+
 ## [1.15.3](https://github.com/rudderlabs/rudder-server/compare/v1.15.2...v1.15.3) (2023-10-19)
 
 

diff --git a/app/apphandlers/embeddedAppHandler.go b/app/apphandlers/embeddedAppHandler.go
@@ -93,6 +93,7 @@ func (a *embeddedApp) StartRudderCore(ctx context.Context, options *app.Options)
  a.log.Infof("Configured deployment type: %q", deploymentType)
 
  reporting := a.app.Features().Reporting.Setup(ctx, backendconfig.DefaultBackendConfig)
+ defer reporting.Stop()
  syncer := reporting.DatabaseSyncer(types.SyncerConfig{ConnInfo: misc.GetConnectionString(config)})
  g.Go(func() error {
  syncer()

diff --git a/app/apphandlers/processorAppHandler.go b/app/apphandlers/processorAppHandler.go
@@ -107,6 +107,7 @@ func (a *processorApp) StartRudderCore(ctx context.Context, options *app.Options
  a.log.Infof("Configured deployment type: %q", deploymentType)
 
  reporting := a.app.Features().Reporting.Setup(ctx, backendconfig.DefaultBackendConfig)
+ defer reporting.Stop()
  syncer := reporting.DatabaseSyncer(types.SyncerConfig{ConnInfo: misc.GetConnectionString(config.Default)})
  g.Go(misc.WithBugsnag(func() error {
  syncer()

diff --git a/cmd/devtool/commands/event.go b/cmd/devtool/commands/event.go
@@ -33,19 +33,22 @@ func EVENT() *cli.Command {
  Action: EventSend,
  Flags: []cli.Flag{
  &cli.StringFlag{
- Name: "endpoint",
- Usage: "HTTP endpoint for rudder-server",
- Value: "http://localhost:8080",
+ Name: "endpoint",
+ Usage: "HTTP endpoint for rudder-server",
+ Value: "http://localhost:8080",
+ Aliases: []string{"e"},
  },
  &cli.StringFlag{
  Name: "write-key",
  Usage: "source write key",
  Required: true,
+ Aliases: []string{"w"},
  },
  &cli.IntFlag{
- Name: "count",
- Usage: "number of events to send",
- Value: 1,
+ Name: "count",
+ Usage: "number of events to send",
+ Value: 1,
+ Aliases: []string{"c"},
  },
  },
  ArgsUsage: "",

diff --git a/cmd/rudder-cli/db/queries.go b/cmd/rudder-cli/db/queries.go
@@ -8,7 +8,7 @@ import (
 
  "github.com/lensesio/tableprinter"
  _ "github.com/lib/pq"
- "github.com/urfave/cli"
+ "github.com/urfave/cli/v2"
 
  "github.com/rudderlabs/rudder-server/cmd/rudder-cli/client"
 )

diff --git a/cmd/rudder-cli/gateway/gateway.go b/cmd/rudder-cli/gateway/gateway.go
@@ -6,7 +6,7 @@ import (
  "os"
 
  "github.com/lensesio/tableprinter"
- "github.com/urfave/cli"
+ "github.com/urfave/cli/v2"
 
  "github.com/rudderlabs/rudder-server/cmd/rudder-cli/client"
 )