mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-12 06:17:27 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Remove work-around that required copying all bytes of a scrape.

Browse source 
Now that the subtle bug in matttproud/golang_protobuf_extensions is
fixed, we do not need to copy the bytes of a scrape into a buffer
first before starting to parse it.

Change-Id: Ib73ecae16173ddd219cda56388a8f853332f8853
This commit is contained in:
Bjoern Rabenstein 2014-07-02 20:43:15 +02:00
parent 74de633a3a
commit bacc31d5cc
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
retrieval/target.go
View file

@ -14,7 +14,6 @@
package retrieval package retrieval
import ( import (
"bytes"
"fmt" "fmt"
"net/http" "net/http"
"os" "os"
@ -264,14 +263,6 @@ func (t *target) scrape(timestamp clientmodel.Timestamp, ingester extraction.Ing
baseLabels[baseLabel] = baseValue baseLabels[baseLabel] = baseValue
} }
// N.B. - It is explicitly required to extract the entire payload before
// attempting to deserialize, as the underlying reader will interpret
// pending data as a truncated message.
buf := new(bytes.Buffer)
if _, err := buf.ReadFrom(resp.Body); err != nil {
return err
}
i := &MergeLabelsIngester{ i := &MergeLabelsIngester{
Labels: baseLabels, Labels: baseLabels,
CollisionPrefix: clientmodel.ExporterLabelPrefix, CollisionPrefix: clientmodel.ExporterLabelPrefix,
@ -281,7 +272,7 @@ func (t *target) scrape(timestamp clientmodel.Timestamp, ingester extraction.Ing
processOptions := &extraction.ProcessOptions{ processOptions := &extraction.ProcessOptions{
Timestamp: timestamp, Timestamp: timestamp,
} }
return processor.ProcessSingle(buf, i, processOptions) return processor.ProcessSingle(resp.Body, i, processOptions)
} }
func (t *target) State() TargetState { func (t *target) State() TargetState {