[exporter/loki] Don't auto-promote tenant attribute (open-telemetry#27446)

Fixes open-telemetry#21045

Signed-off-by: Juraci Paixão Kröhling <[email protected]>

---------

Signed-off-by: Juraci Paixão Kröhling <[email protected]>

Author: jpkrohling

.chloggen/27446-loki-auto-promote-tenant-attribute.yaml

@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: lokiexporter
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: The tenant attribute is now not automatically promoted to a label.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [21045]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: To add tenant attributes (resource/record) to labels, use the label hints explicitly.
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [user]

exporter/lokiexporter/exporter_test.go

@@ -160,12 +160,12 @@ func TestLogsToLokiRequestWithGroupingByTenant(t *testing.T) {
 				label string
 			}{
 				"1": {
-					label: `{exporter="OTLP", tenant_id="1"}`,
-					line:  `{"attributes":{"http.status":200}}`,
+					label: `{exporter="OTLP"}`,
+					line:  `{"attributes":{"http.status":200,"tenant.id":"1"}}`,
 				},
 				"2": {
-					label: `{exporter="OTLP", tenant_id="2"}`,
-					line:  `{"attributes":{"http.status":200}}`,
+					label: `{exporter="OTLP"}`,
+					line:  `{"attributes":{"http.status":200,"tenant.id":"2"}}`,
 				},
 			},
 		},
@@ -224,12 +224,12 @@ func TestLogsToLokiRequestWithGroupingByTenant(t *testing.T) {
 				label string
 			}{
 				"1": {
-					label: `{exporter="OTLP", tenant_id="1"}`,
-					line:  `{"attributes":{"http.status":200}}`,
+					label: `{exporter="OTLP"}`,
+					line:  `{"attributes":{"http.status":200,"tenant.id":"11"},"resources":{"tenant.id":"1"}}`,
 				},
 				"2": {
-					label: `{exporter="OTLP", tenant_id="2"}`,
-					line:  `{"attributes":{"http.status":200}}`,
+					label: `{exporter="OTLP"}`,
+					line:  `{"attributes":{"http.status":200,"tenant.id":"22"},"resources":{"tenant.id":"2"}}`,
 				},
 			},
 		},

pkg/translator/loki/convert.go

@@ -55,18 +55,6 @@ func convertAttributesAndMerge(logAttrs pcommon.Map, resAttrs pcommon.Map, defau
 		out = out.Merge(labels)
 	}
 
-	// get tenant hint from resource attributes, fallback to record attributes
-	// if it is not found
-	if resourcesToLabel, found := resAttrs.Get(hintTenant); !found {
-		if attributesToLabel, found := logAttrs.Get(hintTenant); found {
-			labels := convertAttributesToLabels(logAttrs, attributesToLabel)
-			out = out.Merge(labels)
-		}
-	} else {
-		labels := convertAttributesToLabels(resAttrs, resourcesToLabel)
-		out = out.Merge(labels)
-	}
-
 	return out
 }
 

pkg/translator/loki/logs_to_loki_test.go

@@ -48,10 +48,10 @@ func TestLogsToLokiRequestWithGroupingByTenant(t *testing.T) {
 					PushRequest: &push.PushRequest{
 						Streams: []push.Stream{
 							{
-								Labels: `{exporter="OTLP", tenant_id="1"}`,
+								Labels: `{exporter="OTLP"}`,
 								Entries: []push.Entry{
 									{
-										Line: `{"attributes":{"http.status":200}}`,
+										Line: `{"attributes":{"http.status":200,"tenant.id":"1"}}`,
 									},
 								}},
 						},
@@ -61,10 +61,10 @@ func TestLogsToLokiRequestWithGroupingByTenant(t *testing.T) {
 					PushRequest: &push.PushRequest{
 						Streams: []push.Stream{
 							{
-								Labels: `{exporter="OTLP", tenant_id="2"}`,
+								Labels: `{exporter="OTLP"}`,
 								Entries: []push.Entry{
 									{
-										Line: `{"attributes":{"http.status":200}}`,
+										Line: `{"attributes":{"http.status":200,"tenant.id":"2"}}`,
 									},
 								},
 							},
@@ -100,10 +100,10 @@ func TestLogsToLokiRequestWithGroupingByTenant(t *testing.T) {
 					PushRequest: &push.PushRequest{
 						Streams: []push.Stream{
 							{
-								Labels: `{exporter="OTLP", tenant_id="11"}`,
+								Labels: `{exporter="OTLP"}`,
 								Entries: []push.Entry{
 									{
-										Line: `{"attributes":{"http.status":200}}`,
+										Line: `{"attributes":{"http.status":200},"resources":{"tenant.id":"11"}}`,
 									},
 								}},
 						},
@@ -113,10 +113,10 @@ func TestLogsToLokiRequestWithGroupingByTenant(t *testing.T) {
 					PushRequest: &push.PushRequest{
 						Streams: []push.Stream{
 							{
-								Labels: `{exporter="OTLP", tenant_id="12"}`,
+								Labels: `{exporter="OTLP"}`,
 								Entries: []push.Entry{
 									{
-										Line: `{"attributes":{"http.status":200}}`,
+										Line: `{"attributes":{"http.status":200},"resources":{"tenant.id":"12"}}`,
 									},
 								},
 							},
@@ -186,10 +186,10 @@ func TestLogsToLokiRequestWithGroupingByTenant(t *testing.T) {
 					PushRequest: &push.PushRequest{
 						Streams: []push.Stream{
 							{
-								Labels: `{exporter="OTLP", tenant_id="21"}`,
+								Labels: `{exporter="OTLP"}`,
 								Entries: []push.Entry{
 									{
-										Line: `{"attributes":{"http.status":200}}`,
+										Line: `{"attributes":{"http.status":200,"tenant.id":"31"},"resources":{"tenant.id":"21"}}`,
 									},
 								}},
 						},
@@ -199,10 +199,10 @@ func TestLogsToLokiRequestWithGroupingByTenant(t *testing.T) {
 					PushRequest: &push.PushRequest{
 						Streams: []push.Stream{
 							{
-								Labels: `{exporter="OTLP", tenant_id="22"}`,
+								Labels: `{exporter="OTLP"}`,
 								Entries: []push.Entry{
 									{
-										Line: `{"attributes":{"http.status":200}}`,
+										Line: `{"attributes":{"http.status":200,"tenant.id":"32"},"resources":{"tenant.id":"22"}}`,
 									},
 								},
 							},