Merge branch 'master' into refactor.scheduler-cleanup

rudderlabs · Oct 30, 2023 · 75cc9f2 · 75cc9f2
2 parents c0d3ef2 + f014c01
commit 75cc9f2
Show file tree

Hide file tree

Showing 44 changed files with 82 additions and 64 deletions.
diff --git a/.github/tools/matrixchecker/main.go b/.github/tools/matrixchecker/main.go
@@ -4,8 +4,8 @@ import (
  "log"
  "os"
  "path/filepath"
+ "slices"
 
- "golang.org/x/exp/slices"
  "gopkg.in/yaml.v2"
 )
 

diff --git a/enterprise/reporting/reporting.go b/enterprise/reporting/reporting.go
@@ -8,17 +8,18 @@ import (
  "fmt"
  "io"
  "net/http"
+ "slices"
  "strconv"
  "strings"
  "sync"
  "time"
 
+ "go.uber.org/atomic"
+ "golang.org/x/sync/errgroup"
+
  "github.com/cenkalti/backoff/v4"
  "github.com/lib/pq"
  "github.com/samber/lo"
- "go.uber.org/atomic"
- "golang.org/x/exp/slices"
- "golang.org/x/sync/errgroup"
 
  "github.com/rudderlabs/rudder-go-kit/config"
  "github.com/rudderlabs/rudder-go-kit/logger"

diff --git a/gateway/webhook/webhook.go b/gateway/webhook/webhook.go
@@ -9,6 +9,7 @@ import (
  "mime/multipart"
  "net/http"
  "net/url"
+ "slices"
  "strconv"
  "strings"
  "sync"
@@ -17,7 +18,6 @@ import (
 
  "github.com/hashicorp/go-retryablehttp"
  "github.com/samber/lo"
- "golang.org/x/exp/slices"
 
  "github.com/rudderlabs/rudder-go-kit/logger"
  "github.com/rudderlabs/rudder-go-kit/stats"

diff --git a/jobsdb/internal/cache/cache.go b/jobsdb/internal/cache/cache.go
@@ -2,12 +2,12 @@ package cache
 
 import (
  "fmt"
+ "slices"
  "sync"
  "time"
 
  "github.com/google/uuid"
  "github.com/samber/lo"
- "golang.org/x/exp/slices"
 )
 
 const (

diff --git a/jobsdb/jobsdb.go b/jobsdb/jobsdb.go
@@ -28,14 +28,14 @@ import (
  "encoding/json"
  "errors"
  "fmt"
+ "slices"
  "sort"
  "strconv"
  "strings"
  "sync"
  "time"
  "unicode/utf8"
 
- "golang.org/x/exp/slices"
  "golang.org/x/sync/errgroup"
 
  "github.com/samber/lo"

diff --git a/processor/eventfilter/eventfilter.go b/processor/eventfilter/eventfilter.go
@@ -1,10 +1,9 @@
 package eventfilter
 
 import (
+ "slices"
  "strings"
 
- "golang.org/x/exp/slices"
-
  "github.com/rudderlabs/rudder-go-kit/logger"
  backendconfig "github.com/rudderlabs/rudder-server/backend-config"
  "github.com/rudderlabs/rudder-server/processor/transformer"

diff --git a/processor/processor.go b/processor/processor.go
@@ -9,12 +9,12 @@ import (
  "io"
  "net/http"
  "runtime/trace"
+ "slices"
  "strconv"
  "strings"
  "sync"
  "time"
 
- "golang.org/x/exp/slices"
  "golang.org/x/sync/errgroup"
 
  jsoniter "github.com/json-iterator/go"

diff --git a/processor/transformer/transformer_test.go b/processor/transformer/transformer_test.go
@@ -8,6 +8,7 @@ import (
  "net/http/httptest"
  "net/url"
  "os"
+ "slices"
  "strconv"
  "sync/atomic"
  "testing"
@@ -17,8 +18,6 @@ import (
 
  warehouseutils "github.com/rudderlabs/rudder-server/warehouse/utils"
 
- "golang.org/x/exp/slices"
-
  "github.com/rudderlabs/rudder-server/utils/misc"
  "github.com/rudderlabs/rudder-server/utils/types"
 

diff --git a/router/batchrouter/handle.go b/router/batchrouter/handle.go
@@ -8,6 +8,7 @@ import (
  "net/http"
  "os"
  "path/filepath"
+ "slices"
  "sort"
  "strconv"
  "strings"
@@ -20,7 +21,6 @@ import (
  "github.com/samber/lo"
  "github.com/tidwall/gjson"
  "github.com/tidwall/sjson"
- "golang.org/x/exp/slices"
 
  "github.com/rudderlabs/rudder-go-kit/config"
  "github.com/rudderlabs/rudder-go-kit/filemanager"

diff --git a/router/batchrouter/handle_async.go b/router/batchrouter/handle_async.go
@@ -8,12 +8,12 @@ import (
  "net/http"
  "os"
  "path/filepath"
+ "slices"
  "strconv"
  "time"
 
  "github.com/google/uuid"
  "github.com/tidwall/gjson"
- "golang.org/x/exp/slices"
 
  "github.com/rudderlabs/rudder-server/jobsdb"
  "github.com/rudderlabs/rudder-server/router/batchrouter/asyncdestinationmanager"

diff --git a/router/batchrouter/handle_lifecycle.go b/router/batchrouter/handle_lifecycle.go
@@ -8,14 +8,15 @@ import (
  "net/http"
  "os"
  "path/filepath"
+ "slices"
  "strings"
  "sync"
  "time"
 
+ "golang.org/x/sync/errgroup"
+
  "github.com/google/uuid"
  "github.com/tidwall/gjson"
- "golang.org/x/exp/slices"
- "golang.org/x/sync/errgroup"
 
  "github.com/rudderlabs/rudder-go-kit/bytesize"
  "github.com/rudderlabs/rudder-go-kit/config"

diff --git a/router/batchrouter/util.go b/router/batchrouter/util.go
@@ -3,12 +3,11 @@ package batchrouter
 import (
  "context"
  "fmt"
+ "slices"
  "strings"
  "sync"
  "time"
 
- "golang.org/x/exp/slices"
-
  "github.com/rudderlabs/rudder-go-kit/config"
  "github.com/rudderlabs/rudder-go-kit/filemanager"
  "github.com/rudderlabs/rudder-go-kit/logger"

diff --git a/router/batchrouter/worker.go b/router/batchrouter/worker.go
@@ -3,13 +3,13 @@ package batchrouter
 import (
  "context"
  "fmt"
+ "slices"
  "strings"
  "sync"
  "time"
 
  "github.com/samber/lo"
  "github.com/tidwall/gjson"
- "golang.org/x/exp/slices"
 
  "github.com/rudderlabs/rudder-go-kit/logger"
  "github.com/rudderlabs/rudder-go-kit/stats"

diff --git a/router/customdestinationmanager/customdestinationmanager.go b/router/customdestinationmanager/customdestinationmanager.go
@@ -6,11 +6,11 @@ import (
  "errors"
  "fmt"
  "reflect"
+ "slices"
  "sync"
  "time"
 
  "github.com/sony/gobreaker"
- "golang.org/x/exp/slices"
 
  "github.com/rudderlabs/rudder-go-kit/config"
  "github.com/rudderlabs/rudder-go-kit/logger"

diff --git a/router/internal/partition/stats.go b/router/internal/partition/stats.go
@@ -2,11 +2,11 @@ package partition
 
 import (
  "math"
+ "slices"
  "sync"
  "time"
 
  "github.com/samber/lo"
- "golang.org/x/exp/slices"
 
  "github.com/rudderlabs/rudder-go-kit/stats/metric"
 )

diff --git a/router/manager/manager.go b/router/manager/manager.go
@@ -3,8 +3,8 @@ package manager
 import (
  "context"
  "fmt"
+ "slices"
 
- "golang.org/x/exp/slices"
  "golang.org/x/sync/errgroup"
 
  "github.com/rudderlabs/rudder-go-kit/logger"

diff --git a/router/utils/utils.go b/router/utils/utils.go
@@ -1,11 +1,10 @@
 package utils
 
 import (
+ "slices"
  "strings"
  "time"
 
- "golang.org/x/exp/slices"
-
  "github.com/tidwall/sjson"
 
  "github.com/rudderlabs/rudder-go-kit/config"

diff --git a/router/worker.go b/router/worker.go
@@ -5,13 +5,12 @@ import (
  "encoding/json"
  "fmt"
  "net/http"
+ "slices"
  "sort"
  "strconv"
  "strings"
  "time"
 
- "golang.org/x/exp/slices"
-
  "github.com/samber/lo"
  "github.com/tidwall/gjson"
 

diff --git a/schema-forwarder/internal/forwarder/jobsforwarder.go b/schema-forwarder/internal/forwarder/jobsforwarder.go
@@ -5,10 +5,10 @@ import (
  "context"
  "encoding/json"
  "fmt"
+ "slices"
  "sync"
  "time"
 
- "golang.org/x/exp/slices"
  "golang.org/x/sync/errgroup"
 
  pulsarType "github.com/apache/pulsar-client-go/pulsar"

diff --git a/services/debugger/source/eventUploader.go b/services/debugger/source/eventUploader.go
@@ -4,11 +4,10 @@ import (
  "context"
  "encoding/json"
  "fmt"
+ "slices"
  "sync"
  "time"
 
- "golang.org/x/exp/slices"
-
  "github.com/rudderlabs/rudder-go-kit/config"
  "github.com/rudderlabs/rudder-go-kit/logger"
  backendconfig "github.com/rudderlabs/rudder-server/backend-config"

diff --git a/warehouse/api/grpc.go b/warehouse/api/grpc.go
@@ -7,6 +7,7 @@ import (
  "fmt"
  "net/http"
  "os"
+ "slices"
  "strconv"
  "sync"
  "time"
@@ -19,7 +20,6 @@ import (
 
  "github.com/samber/lo"
 
- "golang.org/x/exp/slices"
  "google.golang.org/genproto/googleapis/rpc/code"
  "google.golang.org/grpc"
  "google.golang.org/grpc/codes"

diff --git a/warehouse/app.go b/warehouse/app.go
@@ -6,6 +6,7 @@ import (
  "errors"
  "fmt"
  "os"
+ "slices"
  "sync"
  "sync/atomic"
  "time"
@@ -26,7 +27,6 @@ import (
  "github.com/rudderlabs/rudder-server/warehouse/integrations/middleware/sqlquerywrapper"
 
  "github.com/samber/lo"
- "golang.org/x/exp/slices"
  "golang.org/x/sync/errgroup"
 
  "github.com/rudderlabs/rudder-go-kit/config"

diff --git a/warehouse/integrations/azure-synapse/azure-synapse.go b/warehouse/integrations/azure-synapse/azure-synapse.go
@@ -11,6 +11,7 @@ import (
  "net"
  "net/url"
  "os"
+ "slices"
  "strconv"
  "strings"
  "time"
@@ -25,8 +26,6 @@ import (
  sqlmw "github.com/rudderlabs/rudder-server/warehouse/integrations/middleware/sqlquerywrapper"
  "github.com/rudderlabs/rudder-server/warehouse/logfield"
 
- "golang.org/x/exp/slices"
-
  "github.com/rudderlabs/rudder-server/warehouse/internal/service/loadfiles/downloader"
 
  "github.com/rudderlabs/rudder-go-kit/config"

diff --git a/warehouse/integrations/bigquery/bigquery.go b/warehouse/integrations/bigquery/bigquery.go
@@ -6,6 +6,7 @@ import (
  "errors"
  "fmt"
  "regexp"
+ "slices"
  "strings"
  "time"
 
@@ -14,7 +15,6 @@ import (
  "github.com/samber/lo"
 
  "cloud.google.com/go/bigquery"
- "golang.org/x/exp/slices"
  bqService "google.golang.org/api/bigquery/v2"
  "google.golang.org/api/googleapi"
  "google.golang.org/api/iterator"

diff --git a/warehouse/integrations/bigquery/bigquery_test.go b/warehouse/integrations/bigquery/bigquery_test.go
@@ -5,13 +5,12 @@ import (
  "encoding/json"
  "fmt"
  "os"
+ "slices"
  "strconv"
  "strings"
  "testing"
  "time"
 
- "golang.org/x/exp/slices"
-
  "github.com/golang/mock/gomock"
 
  "github.com/rudderlabs/rudder-go-kit/config"

diff --git a/warehouse/integrations/clickhouse/clickhouse.go b/warehouse/integrations/clickhouse/clickhouse.go
@@ -15,6 +15,7 @@ import (
  "os"
  "path"
  "regexp"
+ "slices"
  "sort"
  "strconv"
  "strings"
@@ -29,8 +30,6 @@ import (
 
  "github.com/rudderlabs/rudder-server/warehouse/internal/model"
 
- "golang.org/x/exp/slices"
-
  "github.com/cenkalti/backoff/v4"
 
  "github.com/rudderlabs/rudder-go-kit/stats"

diff --git a/warehouse/integrations/deltalake/deltalake.go b/warehouse/integrations/deltalake/deltalake.go
@@ -6,6 +6,7 @@ import (
  "errors"
  "fmt"
  "regexp"
+ "slices"
  "strconv"
  "strings"
  "time"
@@ -14,7 +15,6 @@ import (
 
  dbsql "github.com/databricks/databricks-sql-go"
  dbsqllog "github.com/databricks/databricks-sql-go/logger"
- "golang.org/x/exp/slices"
 
  "github.com/rudderlabs/rudder-go-kit/config"
  "github.com/rudderlabs/rudder-go-kit/logger"