Skip to content

Support IPv6 DogStatsD addresses #399

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

Open
BakedSoups wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support IPv6 DogStatsD addresses #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions statsd/statsd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,12 @@ func TestResolveAddressFromEnvironment(t *testing.T) {
{"UPD Host and port passed as env", "", "10.12.16.9", "1234", "", "10.12.16.9:1234"},
{"UPD Host env, default port", "", "10.12.16.9", "", "", "10.12.16.9:8125"},
{"UPD Host passed, ignore env port", "10.12.16.9", "", "1234", "", "10.12.16.9:8125"},
{"UDP IPv6 host passed, default port", "::1", "", "", "", "[::1]:8125"},
{"UDP bracketed IPv6 host passed, default port", "[::1]", "", "", "", "[::1]:8125"},
{"UDP IPv6 host and port passed", "[::1]:1234", "", "", "", "[::1]:1234"},
{"UDP IPv6 zone host passed, default port", "fe80::1%lo0", "", "", "", "[fe80::1%lo0]:8125"},
{"UDP IPv6 host and port passed as env", "", "::1", "1234", "", "[::1]:1234"},
{"UDP bracketed IPv6 host passed as env, default port", "", "[::1]", "", "", "[::1]:8125"},

{"UDS socket passed", "unix://test/path.socket", "", "", "", "unix://test/path.socket"},
{"UDS socket env", "", "unix://test/path.socket", "", "", "unix://test/path.socket"},
Expand All @@ -309,6 +315,8 @@ func TestResolveAddressFromEnvironment(t *testing.T) {

{"DD_DOGSTATSD_URL UDP", "", "", "", "udp://localhost:1234", "localhost:1234"},
{"DD_DOGSTATSD_URL UDP, default port", "", "", "", "udp://localhost", "localhost:8125"},
{"DD_DOGSTATSD_URL UDP IPv6", "", "", "", "udp://[::1]:1234", "[::1]:1234"},
{"DD_DOGSTATSD_URL UDP IPv6, default port", "", "", "", "udp://[::1]", "[::1]:8125"},
{"DD_DOGSTATSD_URL UDS", "", "", "", "unix://test/path.socket", "unix://test/path.socket"},
{"DD_DOGSTATSD_URL UDS, ignore env port", "", "", "1234", "udp://198.51.100.123:4321", "198.51.100.123:4321"},
{"DD_DOGSTATSD_URL UDS, ignore env host", "", "localhost", "", "udp://198.51.100.123:4321", "198.51.100.123:4321"},
Expand Down
26 changes: 14 additions & 12 deletions statsd/statsdex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"errors"
"fmt"
"io"
"net"
"net/url"
"os"
"strconv"
Expand Down Expand Up @@ -344,16 +345,20 @@ func resolveAddr(addr string) string {
return addr
}
}
// TODO: How does this work for IPv6?
if strings.Contains(addr, ":") {
return addr
}
if envPort != "" {
addr = fmt.Sprintf("%s:%s", addr, envPort)
} else {
addr = fmt.Sprintf("%s:%s", addr, defaultUDPPort)
return withPort(addr, envPort)
}
return addr
return withPort(addr, defaultUDPPort)
}

func withPort(addr, port string) string {
if _, _, err := net.SplitHostPort(addr); err == nil {
return addr
}

host := strings.TrimPrefix(addr, "[")
host = strings.TrimSuffix(host, "]")
return net.JoinHostPort(host, port)
}
Comment on lines +354 to 362

func parseAgentURL(agentURL string) string {
Expand All @@ -368,10 +373,7 @@ func parseAgentURL(agentURL string) string {
}

if parsedURL.Scheme == "udp" {
if strings.Contains(parsedURL.Host, ":") {
return parsedURL.Host
}
return fmt.Sprintf("%s:%s", parsedURL.Host, defaultUDPPort)
return withPort(parsedURL.Host, defaultUDPPort)
}

if parsedURL.Scheme == "unix" {
Expand Down