final tests, making it right for scrub headers

Author: Pawel Szczodruch

client.go

@@ -42,7 +42,7 @@ func NewAsync(token, environment, codeVersion, serverHost, serverRoot string) *C
 	diagnostic := createDiagnostic()
 	return &Client{
 		Transport:     transport,
-		Telemetry:     NewTelemetry(),
+		Telemetry:     NewTelemetry(nil),
 		configuration: configuration,
 		diagnostic:    diagnostic,
 	}
@@ -55,7 +55,7 @@ func NewSync(token, environment, codeVersion, serverHost, serverRoot string) *Cl
 	diagnostic := createDiagnostic()
 	return &Client{
 		Transport:     transport,
-		Telemetry:     NewTelemetry(),
+		Telemetry:     NewTelemetry(nil),
 		configuration: configuration,
 		diagnostic:    diagnostic,
 	}
@@ -75,7 +75,7 @@ func (c *Client) CaptureTelemetryEvent(eventType, eventlevel string, eventData m
 
 // SetTelemetry sets the telemetry
 func (c *Client) SetTelemetry(options ...OptionFunc) {
-	c.Telemetry = NewTelemetry(options...)
+	c.Telemetry = NewTelemetry(c.configuration.scrubHeaders, options...)
 }
 
 // SetEnabled sets whether or not Rollbar is enabled.

client_test.go

@@ -465,6 +465,7 @@ func testGettersAndSetters(client *rollbar.Client, t *testing.T) {
 	client.SetScrubHeaders(scrubHeaders)
 	client.SetScrubFields(scrubFields)
 	client.SetCaptureIp(captureIP)
+	client.SetTelemetry()
 
 	client.SetEnabled(true)
 
@@ -680,6 +681,23 @@ func TestEnabled(t *testing.T) {
 	}
 }
 
+func TestCaptureTelemetryEvent(t *testing.T) {
+	client := testClient()
+	data := map[string]interface{}{"message": "some message"}
+	client.CaptureTelemetryEvent("eventType", "eventLevel", data)
+	items := client.Telemetry.GetQueueItems()
+	if len(items) < 1 {
+		t.Error("Queue should not be empty")
+	}
+	item := items[0].(map[string]interface{})
+	delete(item, "timestamp_ms")
+	expectedData := map[string]interface{}{"body": data, "type": "eventType", "level": "eventLevel", "source": "client"}
+	eq := reflect.DeepEqual(item, expectedData)
+	if !eq {
+		t.Error("Maps are different")
+	}
+}
+
 func configuredOptionsFromData(data map[string]interface{}) map[string]interface{} {
 	notifier := data["notifier"].(map[string]interface{})
 	diagnostic := notifier["diagnostic"].(map[string]interface{})

telemetry.go

@@ -152,8 +152,8 @@ func EnableLoggerTelemetry() OptionFunc {
 	}
 }
 
-// NewTelemetry initializes telemetry object
-func NewTelemetry(options ...OptionFunc) *Telemetry {
+// NewTelemetry initializes telemetry object with scrubheader
+func NewTelemetry(scrubHeaders *regexp.Regexp, options ...OptionFunc) *Telemetry {
 	res := &Telemetry{
 		Queue: NewQueue(TelemetryQueueSize),
 	}
@@ -162,8 +162,10 @@ func NewTelemetry(options ...OptionFunc) *Telemetry {
 		opt(res)
 	}
 
-	if res.Network.ScrubHeaders == nil { // set/define only once
+	if scrubHeaders == nil {
 		res.Network.ScrubHeaders = regexp.MustCompile("Authorization")
+	} else {
+		res.Network.ScrubHeaders = scrubHeaders
 	}
 
 	return res

telemetry_test.go

@@ -14,7 +14,7 @@ import (
 )
 
 func TestNewTelemetryDefault(t *testing.T) {
-	telemetry := NewTelemetry()
+	telemetry := NewTelemetry(nil)
 	assert.NotNil(t, telemetry)
 	expectedTelemetry := &Telemetry{Queue: NewQueue(TelemetryQueueSize)}
 	expectedTelemetry.Network.ScrubHeaders = regexp.MustCompile("Authorization")
@@ -25,7 +25,7 @@ func TestNewTelemetryDefault(t *testing.T) {
 
 func TestNewTelemetryWithOptions(t *testing.T) {
 	client := http.Client{}
-	telemetry := NewTelemetry(SetCustomQueueSize(100), EnableNetworkTelemetry(&client),
+	telemetry := NewTelemetry(nil, SetCustomQueueSize(100), EnableNetworkTelemetry(&client),
 		EnableNetworkTelemetryRequestHeaders(), EnableNetworkTelemetryResponseHeaders(), EnableLoggerTelemetry())
 	expectedTelemetry := &Telemetry{Queue: telemetry.Queue}
 	expectedTelemetry.Network.ScrubHeaders = regexp.MustCompile("Authorization")
@@ -42,7 +42,7 @@ func TestPopulateBody(t *testing.T) {
 	req.Header.Set("Some_name", "some_value")
 	rec := httptest.NewRecorder()
 
-	telemetry := NewTelemetry()
+	telemetry := NewTelemetry(nil)
 	EnableNetworkTelemetryRequestHeaders()(telemetry)
 	EnableNetworkTelemetryResponseHeaders()(telemetry)
 	data := telemetry.populateTransporterBody(req, rec.Result())
@@ -62,7 +62,7 @@ func TestPopulateBody(t *testing.T) {
 func TestPopulateLoggerBody(t *testing.T) {
 
 	message := "some message"
-	telemetry := NewTelemetry()
+	telemetry := NewTelemetry(nil)
 
 	data := telemetry.populateLoggerBody([]byte(message))
 
@@ -86,7 +86,7 @@ func TestRoundTrip(t *testing.T) {
 	defer ts.Close()
 
 	client := http.Client{}
-	telemetry := NewTelemetry(EnableNetworkTelemetry(&client))
+	telemetry := NewTelemetry(nil, EnableNetworkTelemetry(&client))
 
 	req := httptest.NewRequest("GET", ts.URL+"/good", nil)
 	res, err := telemetry.RoundTrip(req)