From 9c98df2b379b3aedccda77d9ba9937d70388ac42 Mon Sep 17 00:00:00 2001
From: "Matt T. Proud" <matt.proud@gmail.com>
Date: Fri, 25 Jan 2013 10:18:09 +0100
Subject: [PATCH] Update dependents.

---
 main.go                         |  9 ++++-----
 retrieval/target.go             | 11 +----------
 retrieval/targetmanager.go      |  5 +++--
 retrieval/targetmanager_test.go |  5 +++--
 retrieval/targetpool.go         |  7 ++++---
 5 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/main.go b/main.go
index 5771d2e156..d57f228149 100644
--- a/main.go
+++ b/main.go
@@ -20,6 +20,7 @@ import (
 	"github.com/matttproud/prometheus/api"
 	"github.com/matttproud/prometheus/config"
 	"github.com/matttproud/prometheus/retrieval"
+	"github.com/matttproud/prometheus/retrieval/format"
 	"github.com/matttproud/prometheus/rules"
 	"github.com/matttproud/prometheus/rules/ast"
 	"github.com/matttproud/prometheus/storage/metric/leveldb"
@@ -58,7 +59,7 @@ func main() {
 
 	defer persistence.Close()
 
-	scrapeResults := make(chan retrieval.Result, 4096)
+	scrapeResults := make(chan format.Result, 4096)
 
 	targetManager := retrieval.NewTargetManager(scrapeResults, 1)
 	targetManager.AddTargetsFromConfig(conf)
@@ -85,12 +86,10 @@ func main() {
 	for {
 		select {
 		case scrapeResult := <-scrapeResults:
-			//fmt.Printf("scrapeResult -> %s\n", scrapeResult)
-			for _, sample := range scrapeResult.Samples {
-				persistence.AppendSample(&sample)
+			if scrapeResult.Err == nil {
+				persistence.AppendSample(&scrapeResult.Sample)
 			}
 		case ruleResult := <-ruleResults:
-			//fmt.Printf("ruleResult -> %s\n", ruleResult)
 			for _, sample := range ruleResult.Samples {
 				persistence.AppendSample(sample)
 			}
diff --git a/retrieval/target.go b/retrieval/target.go
index 1a1c5f4694..435b73854c 100644
--- a/retrieval/target.go
+++ b/retrieval/target.go
@@ -17,7 +17,6 @@ import (
 	"github.com/matttproud/golang_instrumentation/metrics"
 	"github.com/matttproud/prometheus/model"
 	"github.com/matttproud/prometheus/retrieval/format"
-	"io/ioutil"
 	"net/http"
 	"time"
 )
@@ -115,8 +114,6 @@ func NewTarget(address string, interval, deadline time.Duration, baseLabels mode
 }
 
 func (t *target) Scrape(earliest time.Time, results chan format.Result) (err error) {
-	result := Result{}
-
 	defer func() {
 		futureState := t.state
 
@@ -133,7 +130,6 @@ func (t *target) Scrape(earliest time.Time, results chan format.Result) (err err
 	done := make(chan bool)
 
 	request := func() {
-		ti := time.Now()
 		resp, err := http.Get(t.Address())
 		if err != nil {
 			return
@@ -141,12 +137,7 @@ func (t *target) Scrape(earliest time.Time, results chan format.Result) (err err
 
 		defer resp.Body.Close()
 
-		raw, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			return
-		}
-
-		processor, err := format.DefaultRegistry.ProcessForRequest(resp.Header)
+		processor, err := format.DefaultRegistry.ProcessorForRequestHeader(resp.Header)
 		if err != nil {
 			return
 		}
diff --git a/retrieval/targetmanager.go b/retrieval/targetmanager.go
index f0f404ddf1..bfe5f4cacd 100644
--- a/retrieval/targetmanager.go
+++ b/retrieval/targetmanager.go
@@ -17,6 +17,7 @@ import (
 	"container/heap"
 	"github.com/matttproud/prometheus/config"
 	"github.com/matttproud/prometheus/model"
+	"github.com/matttproud/prometheus/retrieval/format"
 	"log"
 	"time"
 )
@@ -32,10 +33,10 @@ type TargetManager interface {
 type targetManager struct {
 	requestAllowance chan bool
 	pools            map[time.Duration]*TargetPool
-	results          chan Result
+	results          chan format.Result
 }
 
-func NewTargetManager(results chan Result, requestAllowance int) TargetManager {
+func NewTargetManager(results chan format.Result, requestAllowance int) TargetManager {
 	return &targetManager{
 		requestAllowance: make(chan bool, requestAllowance),
 		results:          results,
diff --git a/retrieval/targetmanager_test.go b/retrieval/targetmanager_test.go
index 40e50dee6c..62c19fe258 100644
--- a/retrieval/targetmanager_test.go
+++ b/retrieval/targetmanager_test.go
@@ -14,6 +14,7 @@
 package retrieval
 
 import (
+	"github.com/matttproud/prometheus/retrieval/format"
 	"github.com/matttproud/prometheus/utility/test"
 	"testing"
 	"time"
@@ -34,7 +35,7 @@ func (t fakeTarget) Interval() time.Duration {
 	return t.interval
 }
 
-func (t *fakeTarget) Scrape(e time.Time, r chan Result) error {
+func (t *fakeTarget) Scrape(e time.Time, r chan format.Result) error {
 	t.scrapeCount++
 
 	return nil
@@ -52,7 +53,7 @@ func (t *fakeTarget) scheduledFor() (time time.Time) {
 }
 
 func testTargetManager(t test.Tester) {
-	results := make(chan Result, 5)
+	results := make(chan format.Result, 5)
 	targetManager := NewTargetManager(results, 3)
 
 	target1GroupA := &fakeTarget{
diff --git a/retrieval/targetpool.go b/retrieval/targetpool.go
index 4f4ed54843..fed9ea8cfc 100644
--- a/retrieval/targetpool.go
+++ b/retrieval/targetpool.go
@@ -2,6 +2,7 @@ package retrieval
 
 import (
 	"container/heap"
+	"github.com/matttproud/prometheus/retrieval/format"
 	"log"
 	"time"
 )
@@ -44,7 +45,7 @@ func (p TargetPool) Swap(i, j int) {
 	p.targets[i], p.targets[j] = p.targets[j], p.targets[i]
 }
 
-func (p *TargetPool) Run(results chan Result, interval time.Duration) {
+func (p *TargetPool) Run(results chan format.Result, interval time.Duration) {
 	ticker := time.Tick(interval)
 
 	for {
@@ -62,14 +63,14 @@ func (p TargetPool) Stop() {
 	p.done <- true
 }
 
-func (p *TargetPool) runSingle(earliest time.Time, results chan Result, t Target) {
+func (p *TargetPool) runSingle(earliest time.Time, results chan format.Result, t Target) {
 	p.manager.acquire()
 	defer p.manager.release()
 
 	t.Scrape(earliest, results)
 }
 
-func (p *TargetPool) runIteration(results chan Result) {
+func (p *TargetPool) runIteration(results chan format.Result) {
 	for i := 0; i < p.Len(); i++ {
 		target := heap.Pop(p).(Target)
 		if target == nil {