chore: remove global pkglogger from warehouse integrations (#3202)

rudderlabs · Apr 14, 2023 · 1211e51 · 1211e51
1 parent 7660520
commit 1211e51
Show file tree

Hide file tree

Showing 28 changed files with 259 additions and 396 deletions.
diff --git a/runner/runner.go b/runner/runner.go
@@ -55,16 +55,6 @@ import (
 	"github.com/rudderlabs/rudder-server/warehouse"
 	warehousearchiver "github.com/rudderlabs/rudder-server/warehouse/archive"
 	"github.com/rudderlabs/rudder-server/warehouse/encoding"
-	azuresynapse "github.com/rudderlabs/rudder-server/warehouse/integrations/azure-synapse"
-	"github.com/rudderlabs/rudder-server/warehouse/integrations/bigquery"
-	"github.com/rudderlabs/rudder-server/warehouse/integrations/clickhouse"
-	"github.com/rudderlabs/rudder-server/warehouse/integrations/datalake"
-	"github.com/rudderlabs/rudder-server/warehouse/integrations/deltalake"
-	"github.com/rudderlabs/rudder-server/warehouse/integrations/mssql"
-	"github.com/rudderlabs/rudder-server/warehouse/integrations/postgres"
-	postgreslegacy "github.com/rudderlabs/rudder-server/warehouse/integrations/postgres-legacy"
-	"github.com/rudderlabs/rudder-server/warehouse/integrations/redshift"
-	"github.com/rudderlabs/rudder-server/warehouse/integrations/snowflake"
 	warehouseutils "github.com/rudderlabs/rudder-server/warehouse/utils"
 	"github.com/rudderlabs/rudder-server/warehouse/validations"
 )
@@ -342,8 +332,6 @@ func runAllInit() {
 	backendconfig.Init()
 	warehouseutils.Init()
 	encoding.Init()
-	bigquery.Init()
-	clickhouse.Init()
 	archiver.Init()
 	pgnotifier.Init()
 	jobsdb.Init()
@@ -357,14 +345,6 @@ func runAllInit() {
 	warehouse.Init6()
 	warehousearchiver.Init()
 	validations.Init()
-	datalake.Init()
-	azuresynapse.Init()
-	mssql.Init()
-	postgres.Init()
-	postgreslegacy.Init()
-	redshift.Init()
-	snowflake.Init()
-	deltalake.Init()
 	transformer.Init()
 	webhook.Init()
 	batchrouter.Init()

diff --git a/warehouse/integrations/azure-synapse/azure-synapse.go b/warehouse/integrations/azure-synapse/azure-synapse.go
@@ -28,8 +28,6 @@ import (
 	warehouseutils "github.com/rudderlabs/rudder-server/warehouse/utils"
 )
 
-var pkgLogger logger.Logger
-
 const (
 	host     = "host"
 	dbName   = "database"
@@ -115,9 +113,9 @@ var partitionKeyMap = map[string]string{
 	warehouseutils.DiscardsTable:   "row_id, column_name, table_name",
 }
 
-func NewAzureSynapse() *AzureSynapse {
+func New() *AzureSynapse {
 	return &AzureSynapse{
-		Logger: pkgLogger,
+		Logger: logger.NewLogger().Child("warehouse").Child("integrations").Child("synapse"),
 	}
 }
 
@@ -142,8 +140,7 @@ func connect(cred credentials) (*sql.DB, error) {
 	query.Add("TrustServerCertificate", "true")
 	port, err := strconv.Atoi(cred.port)
 	if err != nil {
-		pkgLogger.Errorf("Error parsing synapse connection port : %v", err)
-		return nil, err
+		return nil, fmt.Errorf("invalid port: %w", err)
 	}
 	connUrl := &url.URL{
 		Scheme:   "sqlserver",
@@ -159,10 +156,6 @@ func connect(cred credentials) (*sql.DB, error) {
 	return db, nil
 }
 
-func Init() {
-	pkgLogger = logger.NewLogger().Child("warehouse").Child("synapse")
-}
-
 func (as *AzureSynapse) getConnectionCredentials() credentials {
 	return credentials{
 		host:     warehouseutils.GetConfigValue(host, as.Warehouse),
@@ -559,7 +552,7 @@ func (as *AzureSynapse) CreateSchema() (err error) {
 	sqlStatement := fmt.Sprintf(`IF NOT EXISTS ( SELECT  * FROM  sys.schemas WHERE   name = N'%s' )
     EXEC('CREATE SCHEMA [%s]');
 `, as.Namespace, as.Namespace)
-	pkgLogger.Infof("SYNAPSE: Creating schema name in synapse for AZ:%s : %v", as.Warehouse.Destination.ID, sqlStatement)
+	as.Logger.Infof("SYNAPSE: Creating schema name in synapse for AZ:%s : %v", as.Warehouse.Destination.ID, sqlStatement)
 	_, err = as.DB.Exec(sqlStatement)
 	if err == io.EOF {
 		return nil