Skip to content

Commit 0dd9dfd

Browse files
committed
PMM-13543 Fix socket path failure.
1 parent 3252dcf commit 0dd9dfd

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

exporter/server.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,9 @@ func OverallTargetsHandler(exporters []*Exporter, logger *logrus.Logger) http.Ha
159159
registry.MustRegister(gc)
160160
}
161161

162-
hostlabels := prometheus.Labels{
163-
"instance": e.opts.NodeName,
162+
hostlabels := prometheus.Labels{}
163+
if e.opts.NodeName != "" {
164+
hostlabels["instance"] = e.opts.NodeName
164165
}
165166

166167
gw := NewGathererWrapper(registry, hostlabels)

main.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,14 @@ func main() {
140140
}
141141

142142
func buildExporter(opts GlobalFlags, uri string, log *logrus.Logger) *exporter.Exporter {
143-
uri = buildURI(uri, opts.User, opts.Password, log)
143+
uri = buildURI(uri, opts.User, opts.Password)
144144
log.Debugf("Connection URI: %s", uri)
145145

146146
uriParsed, _ := url.Parse(uri)
147147
var nodeName string
148-
if uriParsed.Port() != "" {
148+
if uriParsed == nil {
149+
nodeName = ""
150+
} else if uriParsed.Port() != "" {
149151
nodeName = net.JoinHostPort(uriParsed.Hostname(), uriParsed.Port())
150152
} else {
151153
nodeName = uriParsed.Host
@@ -295,7 +297,7 @@ func buildURIManually(uri string, user string, password string) string {
295297
return uri
296298
}
297299

298-
func buildURI(uri string, user string, password string, log *logrus.Logger) string {
300+
func buildURI(uri string, user string, password string) string {
299301
defaultPrefix := "mongodb://" // default prefix
300302

301303
if !strings.HasPrefix(uri, defaultPrefix) && !strings.HasPrefix(uri, "mongodb+srv://") {

main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ func TestBuildURI(t *testing.T) {
272272
}
273273
for _, tc := range tests {
274274
t.Run(tc.situation, func(t *testing.T) {
275-
newURI := buildURI(tc.origin, tc.newUser, tc.newPassword, logrus.New())
275+
newURI := buildURI(tc.origin, tc.newUser, tc.newPassword)
276276
assert.Equal(t, tc.expect, newURI)
277277
})
278278
}

0 commit comments

Comments
 (0)