Use pgx instead of lib/pq

Author: mkabilov

Gopkg.lock

@@ -26,8 +26,8 @@
 
 
 [[constraint]]
+  name = "github.com/jackc/pgx"
   branch = "master"
-  name = "github.com/lib/pq"
 
 [[constraint]]
   name = "github.com/prometheus/client_golang"

Gopkg.toml

@@ -35,8 +35,8 @@ Run:
     sslmode: {ssl mode}
     workers: {number of parallel connections to use}
     statementTimeout: {pg statement_timeout value for each connection}
-    skipVersionDetection: {whether perform "show server_version_num" on connect or not; useful while gathering stats of connection poolers}
-    labels: 
+    isNotPg: {true if the destination side is not postgresql}
+    labels:
         {labels added to each metric in the "queryFiles"}
     queryFiles: 
         {use metric queries from files}

README.md

@@ -93,7 +93,7 @@ loop:
 		case syscall.SIGTERM:
 			break loop
 		case syscall.SIGHUP:
-			log.Printf("reloading config. to be implemented")
+			//TODO: reload config
 		default:
 			log.Printf("received signal: %v", sig)
 		}

main.go

@@ -181,8 +181,8 @@ func (v VerSQLs) Query(version PgVersion) string {
 	return ""
 }
 
-func parseVersion(str string) PgVersion {
-	var res int
+func ParseVersion(str string) PgVersion {
+	var res = int(NoVersion)
 	matches := pgVerRegex.FindStringSubmatch(str)
 	if matches == nil {
 		return PgVersion(res)
@@ -214,14 +214,14 @@ func parseVersionRange(str string) (PgVersion, PgVersion) {
 
 	parts := strings.Split(str, "-")
 	if len(parts) == 1 {
-		min = parseVersion(parts[0])
+		min = ParseVersion(parts[0])
 		max = min
 	} else {
 		if parts[0] != "" {
-			min = parseVersion(parts[0])
+			min = ParseVersion(parts[0])
 		}
 		if parts[1] != "" {
-			max = parseVersion(parts[1])
+			max = ParseVersion(parts[1])
 		}
 	}
 
@@ -267,8 +267,8 @@ func (c *Config) Load() error {
 		if err := d.LoadQueries(); err != nil {
 			return fmt.Errorf("could not load db queries: %v", err)
 		}
-		if d.Workers <= 0 {
-			d.Workers = 1
+		if d.WorkersNumber <= 0 {
+			d.WorkersNumber = 1
 		}
 
 		dbs[dbName] = d

pkg/config/config.go

@@ -13,26 +13,26 @@ const applicationName = "pg_prometheus_exporter"
 
 // DbConfigInterface describes DbConfig methods
 type DbConfigInterface interface {
-	GetWorkers() int
-	GetQueries() []Query
-	ConnectionString() string
+	Workers() int
+	Queries() []Query
 	InstanceName() string
-	GetLabels() map[string]string
+	Labels() map[string]string
+	ApplicationName() string
 }
 
 // DbConfig describes database to get metrics from
 type DbConfig struct {
-	Host                 string            `yaml:"host"`
-	Port                 int               `yaml:"port"`
-	User                 string            `yaml:"user"`
-	Password             string            `yaml:"password"`
-	Dbname               string            `yaml:"dbname"`
-	Sslmode              string            `yaml:"sslmode"`
-	QueryFiles           []string          `yaml:"queryFiles"`
-	Labels               map[string]string `yaml:"labels"`
-	Workers              int               `yaml:"workers"`
-	SkipVersionDetection bool              `yaml:"skipVersionDetection"`
-	StatementTimeout     time.Duration     `yaml:"statementTimeout"`
+	Host             string            `yaml:"host"`
+	Port             uint16            `yaml:"port"`
+	User             string            `yaml:"user"`
+	Password         string            `yaml:"password"`
+	Dbname           string            `yaml:"dbname"`
+	Sslmode          string            `yaml:"sslmode"`
+	QueryFiles       []string          `yaml:"queryFiles"`
+	LabelsMap        map[string]string `yaml:"labels"`
+	WorkersNumber    int               `yaml:"workers"`
+	StatementTimeout time.Duration     `yaml:"statementTimeout"`
+	IsNotPg          bool              `yaml:"isNotPg"`
 
 	queries []Query
 }
@@ -65,28 +65,26 @@ func (d *DbConfig) LoadQueries() error {
 	return nil
 }
 
-// ConnectionString returns connection string
-func (d *DbConfig) ConnectionString() string {
-	return fmt.Sprintf("postgres://%s:%s@%s:%d/%s?sslmode=%s&fallback_application_name=%s",
-		d.User, d.Password, d.Host, d.Port, d.Dbname, d.Sslmode, applicationName)
-}
-
 // InstanceName returns instance name
 func (d *DbConfig) InstanceName() string {
 	return fmt.Sprintf("%s:%d", d.Host, d.Port)
 }
 
-// GetWorkers returns number of workers for the db
-func (d *DbConfig) GetWorkers() int {
-	return d.Workers
+// Workers returns number of workers for the db
+func (d *DbConfig) Workers() int {
+	return d.WorkersNumber
 }
 
-// GetQueries returns db queries
-func (d *DbConfig) GetQueries() []Query {
+// Queries returns db queries
+func (d *DbConfig) Queries() []Query {
 	return d.queries
 }
 
-// GetLabels returns db labels
-func (d *DbConfig) GetLabels() map[string]string {
-	return d.Labels
+// Labels returns db labels
+func (d *DbConfig) Labels() map[string]string {
+	return d.LabelsMap
+}
+
+func (d *DbConfig) ApplicationName() string {
+	return applicationName
 }