From cf3e6ae084c13e6ce73c881a783815e1b26ec6f2 Mon Sep 17 00:00:00 2001
From: Bernerd Schaefer <bj.schaefer@gmail.com>
Date: Fri, 26 Apr 2013 14:27:42 +0200
Subject: [PATCH] Add LabelSet helper to fix go 1.0.3 build

---
 retrieval/format/processor.go      | 14 ++++++++++++++
 retrieval/format/processor0_0_2.go | 14 +++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/retrieval/format/processor.go b/retrieval/format/processor.go
index aee63950b..86c28de32 100644
--- a/retrieval/format/processor.go
+++ b/retrieval/format/processor.go
@@ -33,3 +33,17 @@ type ProcessorFunc func(io.ReadCloser, time.Time, model.LabelSet, chan Result) e
 func (f ProcessorFunc) Process(stream io.ReadCloser, timestamp time.Time, baseLabels model.LabelSet, results chan Result) error {
 	return f(stream, timestamp, baseLabels, results)
 }
+
+// Helper function to convert map[string]string into model.LabelSet.
+//
+// NOTE: This should be deleted when support for go 1.0.3 is removed; 1.1 is
+//       smart enough to unmarshal JSON objects into model.LabelSet directly.
+func LabelSet(labels map[string]string) model.LabelSet {
+	labelset := make(model.LabelSet, len(labels))
+
+	for k, v := range labels {
+		labelset[model.LabelName(k)] = model.LabelValue(v)
+	}
+
+	return labelset
+}
diff --git a/retrieval/format/processor0_0_2.go b/retrieval/format/processor0_0_2.go
index 7f18cb7dd..207063f61 100644
--- a/retrieval/format/processor0_0_2.go
+++ b/retrieval/format/processor0_0_2.go
@@ -25,8 +25,8 @@ import (
 var Processor002 ProcessorFunc = func(stream io.ReadCloser, timestamp time.Time, baseLabels model.LabelSet, results chan Result) error {
 	// container for telemetry data
 	var entities []struct {
-		BaseLabels model.LabelSet `json:"baseLabels"`
-		Docstring  string         `json:"docstring"`
+		BaseLabels map[string]string `json:"baseLabels"`
+		Docstring  string            `json:"docstring"`
 		Metric     struct {
 			Type   string          `json:"type"`
 			Values json.RawMessage `json:"value"`
@@ -35,13 +35,13 @@ var Processor002 ProcessorFunc = func(stream io.ReadCloser, timestamp time.Time,
 
 	// concrete type for histogram values
 	type histogram struct {
-		Labels model.LabelSet               `json:"labels"`
+		Labels map[string]string            `json:"labels"`
 		Values map[string]model.SampleValue `json:"value"`
 	}
 
 	// concrete type for counter and gauge values
 	type counter struct {
-		Labels model.LabelSet    `json:"labels"`
+		Labels map[string]string `json:"labels"`
 		Value  model.SampleValue `json:"value"`
 	}
 
@@ -52,7 +52,7 @@ var Processor002 ProcessorFunc = func(stream io.ReadCloser, timestamp time.Time,
 	}
 
 	for _, entity := range entities {
-		entityLabels := baseLabels.Merge(entity.BaseLabels)
+		entityLabels := baseLabels.Merge(LabelSet(entity.BaseLabels))
 
 		switch entity.Metric.Type {
 		case "counter", "gauge":
@@ -66,7 +66,7 @@ var Processor002 ProcessorFunc = func(stream io.ReadCloser, timestamp time.Time,
 			}
 
 			for _, counter := range values {
-				labels := entityLabels.Merge(counter.Labels)
+				labels := entityLabels.Merge(LabelSet(counter.Labels))
 
 				results <- Result{
 					Sample: model.Sample{
@@ -89,7 +89,7 @@ var Processor002 ProcessorFunc = func(stream io.ReadCloser, timestamp time.Time,
 
 			for _, histogram := range values {
 				for percentile, value := range histogram.Values {
-					labels := entityLabels.Merge(histogram.Labels)
+					labels := entityLabels.Merge(LabelSet(histogram.Labels))
 					labels[model.LabelName("percentile")] = model.LabelValue(percentile)
 
 					results <- Result{