refactor(metrics): remove unnecessary params

Signed-off-by: AyushSenapati <a.p.senapati008@gmail.com>

Author: AyushSenapati

app/kuma-dp/pkg/dataplane/metrics/server.go

@@ -212,10 +212,10 @@ func (s *Hijacker) ServeHTTP(writer http.ResponseWriter, req *http.Request) {
 	}
 }
 
-func processMetrics(metrices <-chan []byte, contentType expfmt.Format) []byte {
+func processMetrics(contents <-chan []byte, contentType expfmt.Format) []byte {
 	buf := new(bytes.Buffer)
 
-	for metrics := range metrices {
+	for metrics := range contents {
 		// remove the EOF marker from the metrics, because we are
 		// merging multiple metrics into one response.
 		metrics = bytes.ReplaceAll(metrics, []byte("# EOF"), []byte(""))
@@ -228,7 +228,7 @@ func processMetrics(metrices <-chan []byte, contentType expfmt.Format) []byte {
 		}
 	}
 
-	processedMetrics := processNewlineChars(buf.Bytes(), true, true)
+	processedMetrics := processNewlineChars(buf.Bytes())
 	processedMetrics = append(processedMetrics, '\n')
 	buf.Reset()
 	_, err := buf.Write(processedMetrics)
@@ -245,20 +245,13 @@ func processMetrics(metrices <-chan []byte, contentType expfmt.Format) []byte {
 	return buf.Bytes()
 }
 
-// processNewlineChars processes the newline characters in the byteData.
-// If dedup is true, it replaces multiple consecutive newline characters with a single newline character.
-// If trim is true, it trims the leading and trailing newline characters.
-func processNewlineChars(byteData []byte, dedup, trim bool) []byte {
-	if dedup {
-		byteData = dedupFn(byteData, '\n', '\n')
-	}
-	if trim {
-		byteData = bytes.TrimSpace(byteData)
-	}
-	return byteData
+// processNewlineChars takes byte data and returns a new byte slice
+// after trimming and deduplicating the newline characters.
+func processNewlineChars(byteData []byte) []byte {
+	return bytes.TrimSpace(dedup(byteData, '\n', '\n'))
 }
 
-func dedupFn(input []byte, old, new byte) []byte {
+func dedup(input []byte, old, new byte) []byte {
 	var deduped []byte
 
 	var last byte

app/kuma-dp/pkg/dataplane/metrics/server_test.go

@@ -173,56 +173,22 @@ var _ = Describe("Process Metrics", func() {
 
 var _ = Describe("ProcessNewlineChars", func() {
 	type testCase struct {
-		input       string
-		deduplicate bool
-		trim        bool
-		expected    string
+		input    string
+		expected string
 	}
 
 	DescribeTable("should",
 		func(given testCase) {
-			actual := string(processNewlineChars([]byte(given.input), given.deduplicate, given.trim))
+			actual := string(processNewlineChars([]byte(given.input)))
 			Expect(actual).To(Equal(given.expected))
 		},
-		Entry("should not deduplicate or trim newline characters", testCase{
-			input:       "This is a test.\n\nThis is another test.\n",
-			deduplicate: false,
-			trim:        false,
-			expected:    "This is a test.\n\nThis is another test.\n",
-		}),
-		Entry("should deduplicate newline characters", testCase{
-			input:       "This is a test.\n\n\nThis is another test.\n",
-			deduplicate: true,
-			trim:        false,
-			expected:    "This is a test.\nThis is another test.\n",
+		Entry("should dedup newline characters and trim spaces", testCase{
+			input:    "\n This is a test.\n\n\n\nThis is another test\n\n  ",
+			expected: "This is a test.\nThis is another test",
 		}),
-		Entry("should trim leading and trailing newline characters", testCase{
-			input:       "\nThis is a test.\n\nThis is another test\n\n",
-			deduplicate: false,
-			trim:        true,
-			expected:    "This is a test.\n\nThis is another test",
-		}),
-		Entry("should deduplicate and trim newline characters", testCase{
-			input:       "\nThis is a test.\n\n\nThis is another test\n",
-			deduplicate: true,
-			trim:        true,
-			expected:    "This is a test.\nThis is another test",
-		}),
-	)
-})
-
-var _ = Describe("Dedup", func() {
-	type testCase struct {
-		input    string
-		expected string
-	}
-	DescribeTable("should", func(given testCase) {
-		actual := string(dedupFn([]byte(given.input), '\n', '\n'))
-		Expect(actual).To(Equal(given.expected))
-	},
-		Entry("should deduplicate newline characters", testCase{
-			input:    "This is a test.\n\n\n\nThis is another test.\n",
-			expected: "This is a test.\nThis is another test.\n",
+		Entry("should dedup newline characters and trim spaces", testCase{
+			input:    "\nThis is a test.\n \nThis is another test\n",
+			expected: "This is a test.\n \nThis is another test",
 		}),
 	)
 })