Merge branch 'main' into profiles-cache

Author: dmathieu

exporter/sumologicexporter/exporter.go

@@ -281,7 +281,7 @@ func (se *sumologicexporter) getHTTPClient() *http.Client {
 
 func (se *sumologicexporter) setDataURLs(logs, metrics, traces string) {
 	se.dataURLsLock.Lock()
-	se.logger.Info("setting data urls", zap.String("logs_url", logs), zap.String("metrics_url", metrics), zap.String("traces_url", traces))
+	se.logger.Info("setting data urls", zap.String("logs_url", sanitizeURL(logs)), zap.String("metrics_url", sanitizeURL(metrics)), zap.String("traces_url", sanitizeURL(traces)))
 	se.dataURLLogs, se.dataURLMetrics, se.dataURLTraces = logs, metrics, traces
 	se.dataURLsLock.Unlock()
 }
@@ -456,3 +456,31 @@ func getSignalURL(oCfg *Config, endpointURL string, signal pipeline.Signal) (str
 
 	return url.String(), nil
 }
+
+func sanitizeURL(urlString string) string {
+	strBefore := "otlp/"
+	strAfter := "/v1/"
+	leftIndex := strings.Index(urlString, strBefore)
+	rightIndex := strings.LastIndex(urlString, strAfter)
+	if leftIndex == -1 || rightIndex == -1 {
+		return urlString
+	}
+	length := len(strBefore)
+	checkSensitiveStrLen := (rightIndex - leftIndex) - length
+	if checkSensitiveStrLen > 0 {
+		s1 := urlString[0 : leftIndex+len(strBefore)]
+		s2 := nchars('*', (rightIndex - leftIndex - length))
+		s3 := urlString[rightIndex:]
+		sanitizedStr := strings.Join([]string{s1, s2, s3}, "")
+		return sanitizedStr
+	}
+	return urlString
+}
+
+func nchars(b byte, n int) string {
+	s := make([]byte, n)
+	for i := range n {
+		s[i] = b
+	}
+	return string(s)
+}

exporter/sumologicexporter/exporter_test.go

@@ -648,3 +648,51 @@ func TestGetSignalURL(t *testing.T) {
 		})
 	}
 }
+
+func TestNChars(t *testing.T) {
+	s := nchars('*', 10)
+	require.Equal(t, "**********", s)
+	s = nchars(' ', 2)
+	require.Equal(t, "  ", s)
+}
+
+func TestSanitizeURL(t *testing.T) {
+	testCases := []struct {
+		description string
+		urlString   string
+		expected    string
+	}{
+		{
+			description: "sanitized logs url",
+			urlString:   "https://collectors.au.sumologic.com/receiver/v1/otlp/xxxxx/v1/logs",
+			expected:    "https://collectors.au.sumologic.com/receiver/v1/otlp/*****/v1/logs",
+		},
+		{
+			description: "sanitized metrics url",
+			urlString:   "https://collectors.au.sumologic.com/receiver/v1/otlp/xxxx==/v1/metrics",
+			expected:    "https://collectors.au.sumologic.com/receiver/v1/otlp/******/v1/metrics",
+		},
+		{
+			description: "sanitized traces url",
+			urlString:   "https://collectors.au.sumologic.com/receiver/v1/otlp/xxxx==/v1/traces",
+			expected:    "https://collectors.au.sumologic.com/receiver/v1/otlp/******/v1/traces",
+		},
+		{
+			description: "no sanitization required",
+			urlString:   "https://collectors.au.sumologic.com/receiver/v1/xxxx==/v1/traces",
+			expected:    "https://collectors.au.sumologic.com/receiver/v1/xxxx==/v1/traces",
+		},
+		{
+			description: "no sanitization required with otlp/ appearing after v1/",
+			urlString:   "https://collectors.au.sumologic.com/receiver/v1/v1/xxxx==/otlp/traces",
+			expected:    "https://collectors.au.sumologic.com/receiver/v1/v1/xxxx==/otlp/traces",
+		},
+	}
+	for _, tC := range testCases {
+		testCase := tC
+		t.Run(tC.description, func(t *testing.T) {
+			actual := sanitizeURL(testCase.urlString)
+			require.Equal(t, testCase.expected, actual)
+		})
+	}
+}