fix: added more unit tests

Author: tushar-signoz

pkg/querybuilder/collision.go

@@ -198,6 +198,7 @@ func AdjustKey(key *telemetrytypes.TelemetryFieldKey, keys map[string][]*telemet
 		if !key.Equal(matchingKey) {
 			actions = append(actions, fmt.Sprintf("Adjusting key %s to %s", key, matchingKey))
 		}
+		key.Name = matchingKey.Name
 		key.FieldContext = matchingKey.FieldContext
 		key.FieldDataType = matchingKey.FieldDataType
 		key.JSONDataType = matchingKey.JSONDataType
@@ -274,10 +275,6 @@ func AdjustKeysForAliasExpressions[T any](query *qbtypes.QueryBuilderQuery[T], r
 		For example, if user is using `body.count` as an alias for aggregation and
 		Uses it in orderBy, upstream code will convert it to just `count` with fieldContext as Body
 		But we need to adjust it back to `body.count` with fieldContext as unspecified
-
-		NOTE: One ambiguity here is that if user specified alias `body.count` is also a valid field then we're not sure
-		what user meant. Here we take a call that we chose alias over fieldName because if user specifically wants to order by
-		that field, a different alias can be chosen.
 	*/
 	actions := []string{}
 	if requestType != qbtypes.RequestTypeRaw && requestType != qbtypes.RequestTypeRawStream {

pkg/querybuilder/collision_test.go

@@ -299,7 +299,7 @@ func TestAdjustKey(t *testing.T) {
 			},
 			expectedKey: telemetrytypes.TelemetryFieldKey{
 				Name:          "trace_id",
-				FieldContext:  telemetrytypes.FieldContextLog, // Use intrinsic field context
+				FieldContext:  telemetrytypes.FieldContextLog,     // Use intrinsic field context
 				FieldDataType: telemetrytypes.FieldDataTypeString, // Use intrinsic field data type
 			},
 			expectedActions: []string{
@@ -364,14 +364,43 @@ func TestAdjustKey(t *testing.T) {
 			expectedKey: telemetrytypes.TelemetryFieldKey{
 				Name:          "custom_field",
 				FieldContext:  telemetrytypes.FieldContextAttribute, // Use attribute field context
-				FieldDataType: telemetrytypes.FieldDataTypeString, // Use attribute field data type
+				FieldDataType: telemetrytypes.FieldDataTypeString,   // Use attribute field data type
 				Materialized:  true,
 			},
 			expectedActions: []string{
 				"Adjusting key name=custom_field to name=custom_field,context=attribute,datatype=string,materialized=true",
 			},
 			description: "Single matching attribute key should use its properties",
 		},
+		{
+			name: "non-intrinsic field with attribute prefix as matching key",
+			key: telemetrytypes.TelemetryFieldKey{
+				Name:          "custom_field",
+				FieldContext:  telemetrytypes.FieldContextLog,
+				FieldDataType: telemetrytypes.FieldDataTypeUnspecified,
+			},
+			keys: map[string][]*telemetrytypes.TelemetryFieldKey{
+				"log.custom_field": {
+					{
+						Name:          "log.custom_field",
+						FieldContext:  telemetrytypes.FieldContextAttribute,
+						FieldDataType: telemetrytypes.FieldDataTypeString,
+						Materialized:  true,
+					},
+				},
+			},
+			intrinsicOrCalculatedField: nil,
+			expectedKey: telemetrytypes.TelemetryFieldKey{
+				Name:          "log.custom_field",
+				FieldContext:  telemetrytypes.FieldContextAttribute, // Use attribute field context
+				FieldDataType: telemetrytypes.FieldDataTypeString,   // Use attribute field data type
+				Materialized:  true,
+			},
+			expectedActions: []string{
+				"Adjusting key name=custom_field,context=log to name=log.custom_field,context=attribute,datatype=string,materialized=true",
+			},
+			description: "Single matching attribute key should use its properties",
+		},
 		{
 			name: "non-intrinsic field with no matching attribute keys",
 			key: telemetrytypes.TelemetryFieldKey{