From 9bf4f0ae67c9a1191037667784ed4c67e747b89d Mon Sep 17 00:00:00 2001
From: Marc Sanmiquel <marcsanmiquel@gmail.com>
Date: Mon, 2 Dec 2024 09:49:59 +0100
Subject: [PATCH] fix(pyroscope): allow slashes in tag name (#2172)

---
 CHANGELOG.md                                  |   2 +
 internal/component/pyroscope/write/parser.go  |   2 +-
 .../component/pyroscope/write/parser_test.go  | 150 ++++++++++++++++++
 3 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 internal/component/pyroscope/write/parser_test.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cde80b2370..c29697cf92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,8 @@ v1.5.1
 - `loki.source.podlogs`: Fixed a bug which prevented clustering from working and caused duplicate logs to be sent.
   The bug only happened when no `selector` or `namespace_selector` blocks were specified in the Alloy configuration. (@ptodev)
 
+- Fixed an issue in the `pyroscope.write` component to allow slashes in application names in the same way it is done in the Pyroscope push API (@marcsanmi)
+
 v1.5.0
 -----------------
 
diff --git a/internal/component/pyroscope/write/parser.go b/internal/component/pyroscope/write/parser.go
index 385a241862..3bd97583b3 100644
--- a/internal/component/pyroscope/write/parser.go
+++ b/internal/component/pyroscope/write/parser.go
@@ -192,7 +192,7 @@ func validateAppName(n string) error {
 }
 
 func isAppNameRuneAllowed(r rune) bool {
-	return r == '-' || r == '.' || isTagKeyRuneAllowed(r)
+	return r == '-' || r == '.' || r == '/' || isTagKeyRuneAllowed(r)
 }
 
 func isTagKeyReserved(k string) bool {
diff --git a/internal/component/pyroscope/write/parser_test.go b/internal/component/pyroscope/write/parser_test.go
new file mode 100644
index 0000000000..66cd6e9cd0
--- /dev/null
+++ b/internal/component/pyroscope/write/parser_test.go
@@ -0,0 +1,150 @@
+package write
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestParseKey(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected *Key
+		wantErr  bool
+	}{
+		{
+			name:  "basic app name",
+			input: "simple-app",
+			expected: &Key{
+				labels: map[string]string{
+					"__name__": "simple-app",
+				},
+			},
+		},
+		{
+			name:  "app name with slashes and tags",
+			input: "my/service/name{environment=prod,version=1.0}",
+			expected: &Key{
+				labels: map[string]string{
+					"__name__":    "my/service/name",
+					"environment": "prod",
+					"version":     "1.0",
+				},
+			},
+		},
+		{
+			name:  "multiple slashes and special characters",
+			input: "app/service/v1.0-beta/component{region=us-west}",
+			expected: &Key{
+				labels: map[string]string{
+					"__name__": "app/service/v1.0-beta/component",
+					"region":   "us-west",
+				},
+			},
+		},
+		{
+			name:    "empty app name",
+			input:   "{}",
+			wantErr: true,
+		},
+		{
+			name:    "invalid characters in tag key",
+			input:   "my/service/name{invalid@key=value}",
+			wantErr: true,
+		},
+		{
+			name:  "whitespace handling",
+			input: "my/service/name{ tag1 = value1 , tag2 = value2 }",
+			expected: &Key{
+				labels: map[string]string{
+					"__name__": "my/service/name",
+					"tag1":     "value1",
+					"tag2":     "value2",
+				},
+			},
+		},
+		{
+			name:  "dots in service name",
+			input: "my/service.name/v1.0{environment=prod}",
+			expected: &Key{
+				labels: map[string]string{
+					"__name__":    "my/service.name/v1.0",
+					"environment": "prod",
+				},
+			},
+		},
+		{
+			name:  "app name with slashes",
+			input: "my/service/name{}",
+			expected: &Key{
+				labels: map[string]string{
+					"__name__": "my/service/name",
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := ParseKey(tt.input)
+
+			if tt.wantErr {
+				assert.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+			assert.Equal(t, tt.expected, got)
+		})
+	}
+}
+
+func TestKey_Normalized(t *testing.T) {
+	tests := []struct {
+		name     string
+		key      *Key
+		expected string
+	}{
+		{
+			name: "simple normalization",
+			key: &Key{
+				labels: map[string]string{
+					"__name__": "my/service/name",
+				},
+			},
+			expected: "my/service/name{}",
+		},
+		{
+			name: "normalization with tags",
+			key: &Key{
+				labels: map[string]string{
+					"__name__":    "my/service/name",
+					"environment": "prod",
+					"version":     "1.0",
+				},
+			},
+			expected: "my/service/name{environment=prod,version=1.0}",
+		},
+		{
+			name: "tags should be sorted",
+			key: &Key{
+				labels: map[string]string{
+					"__name__": "my/service/name",
+					"c":        "3",
+					"b":        "2",
+					"a":        "1",
+				},
+			},
+			expected: "my/service/name{a=1,b=2,c=3}",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := tt.key.Normalized()
+			assert.Equal(t, tt.expected, got)
+		})
+	}
+}