From 8087d901aa5f766ce9f14b35afc9b13fda922efb Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 26 Jun 2020 19:26:53 +0100 Subject: [PATCH] Fix handling of DSN extra arguments Signed-off-by: Nick --- collector/exporter.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/collector/exporter.go b/collector/exporter.go index 986c4f9c..3e362a3b 100644 --- a/collector/exporter.go +++ b/collector/exporter.go @@ -92,7 +92,10 @@ func New(ctx context.Context, dsn string, metrics Metrics, scrapers []Scraper, l dsnParams = append(dsnParams, sessionSettingsParam) } - if strings.Contains(dsn, "?") { + dsnParts := strings.Split(dsn, "/") + lastDsnPart := dsnParts[len(dsnParts)-1] + + if strings.Contains(lastDsnPart, "?") { dsn = dsn + "&" } else { dsn = dsn + "?"