Skip to content
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.

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

Add TLS for SAPM and SignalFx receiver #215

Merged
merged 4 commits into from
May 29, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Make lint/fmt for each folder just to be sure
  • Loading branch information
ccaraman committed May 29, 2020
commit 0026d1d72e0ccab435a65848aac78b50682b38fc
6 changes: 3 additions & 3 deletions receiver/sapmreceiver/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ func (f *Factory) CustomUnmarshaler() component.CustomUnmarshaler {
func (f *Factory) CreateDefaultConfig() configmodels.Receiver {
return &Config{
ReceiverSettings: configmodels.ReceiverSettings{
TypeVal: typeStr,
NameVal: typeStr,
Endpoint: defaultEndpoint,
TypeVal: typeStr,
NameVal: typeStr,
Endpoint: defaultEndpoint,
},
}
}
Expand Down
6 changes: 3 additions & 3 deletions receiver/sapmreceiver/trace_receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@ func sendSapm(endpoint string, sapm *splunksapm.PostSpansRequest, zipped bool, t
client := &http.Client{}

if tlsEnabled {
caCert, err := ioutil.ReadFile("./testdata/testcert.crt")
if err != nil {
return nil, fmt.Errorf("failed to load certificate: %s", err.Error())
caCert, errCert := ioutil.ReadFile("./testdata/testcert.crt")
if errCert != nil {
return nil, fmt.Errorf("failed to load certificate: %s", errCert.Error())
}
caCertPool := x509.NewCertPool()
caCertPool.AppendCertsFromPEM(caCert)
Expand Down
3 changes: 1 addition & 2 deletions receiver/signalfxreceiver/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@

package signalfxreceiver

import(
import (
"go.opentelemetry.io/collector/config/configmodels"
"go.opentelemetry.io/collector/config/configtls"
)


// Config defines configuration for the SignalFx receiver.
type Config struct {
configmodels.ReceiverSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct
Expand Down
2 changes: 1 addition & 1 deletion receiver/signalfxreceiver/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/config/configmodels"
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/config/configtls"
)

func TestLoadConfig(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion receiver/signalfxreceiver/receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func (r *sfxReceiver) Start(_ context.Context, host component.Host) error {
if r.config.TLSCredentials != nil {
host.ReportFatalError(r.server.ListenAndServeTLS(r.config.TLSCredentials.CertFile, r.config.TLSCredentials.KeyFile))
} else {
if err := r.server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
if err = r.server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
host.ReportFatalError(err)
}
}
Expand Down
1 change: 1 addition & 0 deletions receiver/signalfxreceiver/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,7 @@ func Test_sfxReceiver_TLS(t *testing.T) {
url := fmt.Sprintf("https://%s/v2/datapoint", addr)

req, err := http.NewRequest("POST", url, bytes.NewReader(body))
require.NoError(t, err, fmt.Sprintf("should have no errors with new request: %v", err))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
require.NoError(t, err, fmt.Sprintf("should have no errors with new request: %v", err))
require.NoErrorf(t, err, "should have no errors with new request: %v", err)

req.Header.Set("Content-Type", "application/x-protobuf")

caCert, err := ioutil.ReadFile("./testdata/testcert.crt")
Expand Down
4 changes: 2 additions & 2 deletions testbed/tests/receivers.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func NewSapmDataReceiver(port int) *SapmDataReceiver {
func (sr *SapmDataReceiver) Start(tc *testbed.MockTraceConsumer, mc *testbed.MockMetricConsumer) error {
sapmCfg := sapmreceiver.Config{
ReceiverSettings: configmodels.ReceiverSettings{
Endpoint: fmt.Sprintf("localhost:%d", sr.Port),
Endpoint: fmt.Sprintf("localhost:%d", sr.Port),
},
}
var err error
Expand Down Expand Up @@ -100,7 +100,7 @@ func NewSFxMetricsDataReceiver(port int) *SFxMetricsDataReceiver {
func (sr *SFxMetricsDataReceiver) Start(tc *testbed.MockTraceConsumer, mc *testbed.MockMetricConsumer) error {
addr := fmt.Sprintf("localhost:%d", sr.Port)
config := signalfxreceiver.Config{
ReceiverSettings: configmodels.ReceiverSettings{Endpoint: addr},
ReceiverSettings: configmodels.ReceiverSettings{Endpoint: addr},
}
var err error
sr.receiver, err = signalfxreceiver.New(zap.L(), config, mc)
Expand Down