RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-26 08:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add LabelSet helper to fix go 1.0.3 build

Browse Source
This commit is contained in:
Bernerd Schaefer 2013-04-26 14:27:42 +02:00
parent dfd5c9ce28
commit cf3e6ae084
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
retrieval/format/processor.go
View File

@ -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 { func (f ProcessorFunc) Process(stream io.ReadCloser, timestamp time.Time, baseLabels model.LabelSet, results chan Result) error {
return f(stream, timestamp, baseLabels, results) 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
}

14
retrieval/format/processor0_0_2.go
View File

@ -25,8 +25,8 @@ import (
var Processor002 ProcessorFunc = func(stream io.ReadCloser, timestamp time.Time, baseLabels model.LabelSet, results chan Result) error { var Processor002 ProcessorFunc = func(stream io.ReadCloser, timestamp time.Time, baseLabels model.LabelSet, results chan Result) error {
// container for telemetry data // container for telemetry data
var entities []struct { var entities []struct {
BaseLabels model.LabelSet `json:"baseLabels"` BaseLabels map[string]string `json:"baseLabels"`
Docstring string `json:"docstring"` Docstring string `json:"docstring"`
Metric struct { Metric struct {
Type string `json:"type"` Type string `json:"type"`
Values json.RawMessage `json:"value"` Values json.RawMessage `json:"value"`
@ -35,13 +35,13 @@ var Processor002 ProcessorFunc = func(stream io.ReadCloser, timestamp time.Time,
// concrete type for histogram values // concrete type for histogram values
type histogram struct { type histogram struct {
Labels model.LabelSet `json:"labels"` Labels map[string]string `json:"labels"`
Values map[string]model.SampleValue `json:"value"` Values map[string]model.SampleValue `json:"value"`
} }
// concrete type for counter and gauge values // concrete type for counter and gauge values
type counter struct { type counter struct {
Labels model.LabelSet `json:"labels"` Labels map[string]string `json:"labels"`
Value model.SampleValue `json:"value"` Value model.SampleValue `json:"value"`
} }
@ -52,7 +52,7 @@ var Processor002 ProcessorFunc = func(stream io.ReadCloser, timestamp time.Time,
} }
for _, entity := range entities { for _, entity := range entities {
entityLabels := baseLabels.Merge(entity.BaseLabels) entityLabels := baseLabels.Merge(LabelSet(entity.BaseLabels))
switch entity.Metric.Type { switch entity.Metric.Type {
case "counter", "gauge": case "counter", "gauge":
@ -66,7 +66,7 @@ var Processor002 ProcessorFunc = func(stream io.ReadCloser, timestamp time.Time,
} }
for _, counter := range values { for _, counter := range values {
labels := entityLabels.Merge(counter.Labels) labels := entityLabels.Merge(LabelSet(counter.Labels))
results <- Result{ results <- Result{
Sample: model.Sample{ Sample: model.Sample{
@ -89,7 +89,7 @@ var Processor002 ProcessorFunc = func(stream io.ReadCloser, timestamp time.Time,
for _, histogram := range values { for _, histogram := range values {
for percentile, value := range histogram.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) labels[model.LabelName("percentile")] = model.LabelValue(percentile)
results <- Result{ results <- Result{