Skip to content

Commit

Permalink
Fix senders.NewSender() for direct ingestion.
Browse files Browse the repository at this point in the history
This commit fixes Issue #84.
  • Loading branch information
keep94 committed Jun 15, 2022
1 parent 6be54bd commit 2d67ee6
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 4 deletions.
19 changes: 15 additions & 4 deletions senders/client_factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,26 @@ 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.MetricsPort = 80
cfg.TracesPort = 80
}
case "https":
if cfg.Token != "" {
cfg.MetricsPort = 443
cfg.TracesPort = 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 {
Expand Down
21 changes: 21 additions & 0 deletions senders/client_factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 2d67ee6

Please sign in to comment.