github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-11-21 14:44:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "lib/protoparser/opentelemetry/firehose: escape requestID before returning it to user (#6451)"

Browse source 
This reverts commit cd1aca217c.

Reason for revert: this commit has no sense, since the firehose response has application/json content-type,
so it must contain JSON-encoded timestamp and requestId fields according to https://docs.aws.amazon.com/firehose/latest/dev/httpdeliveryrequestresponse.html#responseformat .
HTML-escaping the requestId field may break the response, so the client couldn't correctly recognize the html-escaped requestId.

Updates https://github.com/VictoriaMetrics/VictoriaMetrics/pull/6451
This commit is contained in:
Aliaksandr Valialkin 2024-07-16 09:43:47 +02:00
parent 88e02b6352
commit 7a3394bbe1
No known key found for this signature in database
GPG key ID: 52C003EE2BCDB9EB
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/protoparser/opentelemetry/firehose/http.go
View file

@ -2,7 +2,6 @@ package firehose
import ( import (
"fmt" "fmt"
"html"
"net/http" "net/http"
"time" "time"
) )
@ -13,12 +12,11 @@ import (
func WriteSuccessResponse(w http.ResponseWriter, r *http.Request) { func WriteSuccessResponse(w http.ResponseWriter, r *http.Request) {
requestID := r.Header.Get("X-Amz-Firehose-Request-Id") requestID := r.Header.Get("X-Amz-Firehose-Request-Id")
if requestID == "" { if requestID == "" {
// This isn't an AWS firehose request - just return an empty response in this case. // This isn't a AWS firehose request - just return an empty response in this case.
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
return return
} }
requestID = html.EscapeString(requestID)
body := fmt.Sprintf(`{"requestId":%q,"timestamp":%d}`, requestID, time.Now().UnixMilli()) body := fmt.Sprintf(`{"requestId":%q,"timestamp":%d}`, requestID, time.Now().UnixMilli())
h := w.Header() h := w.Header()