Merge pull request #85 from keep94/23392

Fix senders.NewSender() for direct ingestion.

senders/client_factory.go

@@ -44,6 +44,11 @@ type configuration struct {
 	SDKMetricsTags       map[string]string
 }
 
+func (c *configuration) setDefaultPort(port int) {
+	c.MetricsPort = port
+	c.TracesPort = port
+}
+
 // NewSender creates Wavefront client
 func NewSender(wfURL string, setters ...Option) (Sender, error) {
 	cfg, err := CreateConfig(wfURL, setters...)
@@ -68,22 +73,30 @@ func CreateConfig(wfURL string, setters ...Option) (*configuration, error) {
 		return nil, err
 	}
 
-	if !strings.HasPrefix(strings.ToLower(u.Scheme), "http") {
-		return nil, fmt.Errorf("invalid scheme '%s' in '%s', only 'http' is supported", u.Scheme, u)
-	}
-
 	if len(u.User.String()) > 0 {
 		cfg.Token = u.User.String()
 		u.User = nil
 	}
 
+	switch strings.ToLower(u.Scheme) {
+	case "http":
+		if cfg.Token != "" {
+			cfg.setDefaultPort(80)
+		}
+	case "https":
+		if cfg.Token != "" {
+			cfg.setDefaultPort(443)
+		}
+	default:
+		return nil, fmt.Errorf("invalid scheme '%s' in '%s', only 'http' is supported", u.Scheme, u)
+	}
+
 	if u.Port() != "" {
 		port, err := strconv.Atoi(u.Port())
 		if err != nil {
 			return nil, fmt.Errorf("unable to convert port to integer: %s", err)
 		}
-		cfg.MetricsPort = port
-		cfg.TracesPort = port
+		cfg.setDefaultPort(port)
 		u.Host = u.Hostname()
 	}
 	cfg.Server = u.String()

senders/client_factory_test.go

@@ -24,6 +24,27 @@ func TestScheme(t *testing.T) {
 	require.Error(t, err)
 }
 
+func TestDefaultPortsProxy(t *testing.T) {
+	cfg, err := senders.CreateConfig("http://localhost")
+	require.NoError(t, err)
+	assert.Equal(t, 2878, cfg.MetricsPort)
+	assert.Equal(t, 30001, cfg.TracesPort)
+}
+
+func TestDefaultPortsDIHttp(t *testing.T) {
+	cfg, err := senders.CreateConfig("http://11111111-2222-3333-4444-555555555555@localhost")
+	require.NoError(t, err)
+	assert.Equal(t, 80, cfg.MetricsPort)
+	assert.Equal(t, 80, cfg.TracesPort)
+}
+
+func TestDefaultPortsDIHttps(t *testing.T) {
+	cfg, err := senders.CreateConfig("https://11111111-2222-3333-4444-555555555555@localhost")
+	require.NoError(t, err)
+	assert.Equal(t, 443, cfg.MetricsPort)
+	assert.Equal(t, 443, cfg.TracesPort)
+}
+
 func TestPortExtractedFromURL(t *testing.T) {
 	cfg, err := senders.CreateConfig("http://localhost:1234")
 	require.NoError(t, err)