Skip to content

PMM-13543 Fix socket path failure. #969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BupycHuk merged 2 commits into from
Nov 19, 2024
Merged

PMM-13543 Fix socket path failure. #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dd9dfd
PMM-13543 Fix socket path failure.
BupycHuk Nov 18, 2024
f7298e7
PMM-13543 Address golangci review.
BupycHuk Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions exporter/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,9 @@ func OverallTargetsHandler(exporters []*Exporter, logger *logrus.Logger) http.Ha
registry.MustRegister(gc)
}

hostlabels := prometheus.Labels{
"instance": e.opts.NodeName,
hostlabels := prometheus.Labels{}
if e.opts.NodeName != "" {
hostlabels["instance"] = e.opts.NodeName
}

gw := NewGathererWrapper(registry, hostlabels)
Expand Down
11 changes: 7 additions & 4 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,17 @@ func main() {
}

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

uriParsed, _ := url.Parse(uri)
var nodeName string
if uriParsed.Port() != "" {
switch {
case uriParsed == nil:
nodeName = ""
case uriParsed.Port() != "":
nodeName = net.JoinHostPort(uriParsed.Hostname(), uriParsed.Port())
} else {
default:
nodeName = uriParsed.Host
}

Expand Down Expand Up @@ -295,7 +298,7 @@ func buildURIManually(uri string, user string, password string) string {
return uri
}

func buildURI(uri string, user string, password string, log *logrus.Logger) string {
func buildURI(uri string, user string, password string) string {
defaultPrefix := "mongodb://" // default prefix

if !strings.HasPrefix(uri, defaultPrefix) && !strings.HasPrefix(uri, "mongodb+srv://") {
Expand Down
2 changes: 1 addition & 1 deletion main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ func TestBuildURI(t *testing.T) {
}
for _, tc := range tests {
t.Run(tc.situation, func(t *testing.T) {
newURI := buildURI(tc.origin, tc.newUser, tc.newPassword, logrus.New())
newURI := buildURI(tc.origin, tc.newUser, tc.newPassword)
assert.Equal(t, tc.expect, newURI)
})
}
Expand Down
Loading