fix: default timeout should be 30 seconds, not 30 nanoseconds
Merge branch 'master' of github.com:prometheus/sd_client_golang

Conflicts:
	prometheus.go