Skip to content

Commit cf27289

Browse files
authored
revert: "fix(json, structured metadata): correctly handle escaping in json parsing API" (#17071)
1 parent 243b155 commit cf27289

File tree

3 files changed

+3
-414
lines changed

3 files changed

+3
-414
lines changed

‎pkg/loghttp/entry.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,9 @@ func (e *Entry) UnmarshalJSON(data []byte) error {
9292
return nil
9393
}
9494
if dataType == jsonparser.String || t != jsonparser.Number {
95-
// Use ParseString to properly decode escape sequences like \n
96-
val, err := jsonparser.ParseString(value)
97-
if err != nil {
98-
return err
99-
}
10095
structuredMetadata = append(structuredMetadata, labels.Label{
10196
Name: string(key),
102-
Value: val,
97+
Value: string(value),
10398
})
10499
return nil
105100
}
@@ -235,7 +230,7 @@ func (EntryEncoder) Encode(ptr unsafe.Pointer, stream *jsoniter.Stream) {
235230
stream.WriteMore()
236231
}
237232
stream.WriteObjectField(lbl.Name)
238-
stream.WriteStringWithHTMLEscaped(lbl.Value)
233+
stream.WriteString(lbl.Value)
239234
}
240235
stream.WriteObjectEnd()
241236
}

0 commit comments

Comments
 (0)