Skip to content
This repository has been archived by the owner on Oct 3, 2023. It is now read-only.

Batch time series with different label values into same request. #119

Merged
merged 2 commits into from
Apr 1, 2019
Merged

Batch time series with different label values into same request. #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d675aa
Batch timeseries with different label values into same request.
rghetia Apr 1, 2019
2c7315a
fixed one more review comment.
rghetia Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions metrics_proto.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import (
"errors"
"fmt"
"path"
"sort"
"strings"

"github.com/golang/protobuf/ptypes/timestamp"
"go.opencensus.io/stats"
Expand Down Expand Up @@ -117,6 +119,20 @@ func (se *statsExporter) handleMetricsProtoUpload(payloads []*metricProtoPayload
return nil
}

// metricSignature creates a unique signature consisting of a
// metric's type and its lexicographically sorted label values
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one last comment request. Since you've created the issue, please add it here to finally make this comment:

// metricSignature creates a unique signature consisting of a
// metric's type and its lexicographically sorted label values.
// See https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver/issues/120
func metricSignature(metric *googlemetricpb.Metric) string {

// See https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver/issues/120
func metricSignature(metric *googlemetricpb.Metric) string {
labels := metric.GetLabels()
labelValues := make([]string, 0, len(labels))

for _, labelValue := range labels {
labelValues = append(labelValues, labelValue)
}
sort.Strings(labelValues)
return fmt.Sprintf("%s:%s", metric.GetType(), strings.Join(labelValues, ","))
}

func (se *statsExporter) combineTimeSeriesToCreateTimeSeriesRequest(ts []*monitoringpb.TimeSeries) (ctsreql []*monitoringpb.CreateTimeSeriesRequest) {
if len(ts) == 0 {
return nil
Expand All @@ -139,10 +155,10 @@ func (se *statsExporter) combineTimeSeriesToCreateTimeSeriesRequest(ts []*monito
seenMetrics := make(map[string]struct{})

for _, tti := range ts {
signature := tti.Metric.GetType()
if _, alreadySeen := seenMetrics[signature]; !alreadySeen {
key := metricSignature(tti.Metric)
if _, alreadySeen := seenMetrics[key]; !alreadySeen {
uniqueTimeSeries = append(uniqueTimeSeries, tti)
seenMetrics[signature] = struct{}{}
seenMetrics[key] = struct{}{}
} else {
nonUniqueTimeSeries = append(nonUniqueTimeSeries, tti)
}
Expand Down
29 changes: 21 additions & 8 deletions metrics_proto_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,11 +397,17 @@ func TestCombineTimeSeriesAndDeduplication(t *testing.T) {
{
Metric: &googlemetricpb.Metric{
Type: "a/b/c",
Labels: map[string]string{
"k1": "v1",
},
},
},
{
Metric: &googlemetricpb.Metric{
Type: "a/b/c",
Labels: map[string]string{
"k1": "v2",
},
},
},
{
Expand All @@ -412,6 +418,9 @@ func TestCombineTimeSeriesAndDeduplication(t *testing.T) {
{
Metric: &googlemetricpb.Metric{
Type: "a/b/c",
Labels: map[string]string{
"k1": "v1",
},
},
},
{
Expand All @@ -427,26 +436,27 @@ func TestCombineTimeSeriesAndDeduplication(t *testing.T) {
{
Metric: &googlemetricpb.Metric{
Type: "a/b/c",
Labels: map[string]string{
"k1": "v1",
},
},
},
{
Metric: &googlemetricpb.Metric{
Type: "A/b/c",
Type: "a/b/c",
Labels: map[string]string{
"k1": "v2",
},
},
},
{
Metric: &googlemetricpb.Metric{
Type: "X/Y/Z",
Type: "A/b/c",
},
},
},
},
{
Name: monitoring.MetricProjectPath(se.o.ProjectID),
TimeSeries: []*monitoringpb.TimeSeries{
{
Metric: &googlemetricpb.Metric{
Type: "a/b/c",
Type: "X/Y/Z",
},
},
},
Expand All @@ -457,6 +467,9 @@ func TestCombineTimeSeriesAndDeduplication(t *testing.T) {
{
Metric: &googlemetricpb.Metric{
Type: "a/b/c",
Labels: map[string]string{
"k1": "v1",
},
},
},
},
Expand Down
53 changes: 4 additions & 49 deletions stats_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,6 @@ func TestExporter_makeReq(t *testing.T) {
},
},
},
},
},
{
Name: monitoring.MetricProjectPath("proj-id"),
TimeSeries: []*monitoringpb.TimeSeries{
{
Metric: &metricpb.Metric{
Type: "custom.googleapis.com/opencensus/example.com/views/testview",
Expand Down Expand Up @@ -218,11 +213,6 @@ func TestExporter_makeReq(t *testing.T) {
},
},
},
},
},
{
Name: monitoring.MetricProjectPath("proj-id"),
TimeSeries: []*monitoringpb.TimeSeries{
{
Metric: &metricpb.Metric{
Type: "external.googleapis.com/example.com/views/testview",
Expand Down Expand Up @@ -293,11 +283,6 @@ func TestExporter_makeReq(t *testing.T) {
},
},
},
},
},
{
Name: monitoring.MetricProjectPath("proj-id"),
TimeSeries: []*monitoringpb.TimeSeries{
{
Metric: &metricpb.Metric{
Type: "custom.googleapis.com/opencensus/example.com/views/testview",
Expand Down Expand Up @@ -364,11 +349,6 @@ func TestExporter_makeReq(t *testing.T) {
},
},
},
},
},
{
Name: monitoring.MetricProjectPath("proj-id"),
TimeSeries: []*monitoringpb.TimeSeries{
{
Metric: &metricpb.Metric{
Type: "custom.googleapis.com/opencensus/lasttestview",
Expand Down Expand Up @@ -542,21 +522,21 @@ func TestExporter_makeReq_batching(t *testing.T) {
name: "4 vds; 3 limit",
iter: 2,
limit: 3,
wantReqs: 4,
wantReqs: 3,
wantTotal: 4,
},
{
name: "4 vds; 4 limit",
iter: 2,
limit: 4,
wantReqs: 4,
wantReqs: 2,
wantTotal: 4,
},
{
name: "4 vds; 5 limit",
iter: 2,
limit: 5,
wantReqs: 4,
wantReqs: 2,
wantTotal: 4,
},
}
Expand Down Expand Up @@ -996,11 +976,6 @@ func TestExporter_makeReq_withCustomMonitoredResource(t *testing.T) {
},
},
},
},
},
{
Name: monitoring.MetricProjectPath("proj-id"),
TimeSeries: []*monitoringpb.TimeSeries{
{
Metric: &metricpb.Metric{
Type: "custom.googleapis.com/opencensus/testview",
Expand Down Expand Up @@ -1074,11 +1049,6 @@ func TestExporter_makeReq_withCustomMonitoredResource(t *testing.T) {
},
},
},
},
},
{
Name: monitoring.MetricProjectPath("proj-id"),
TimeSeries: []*monitoringpb.TimeSeries{
{
Metric: &metricpb.Metric{
Type: "custom.googleapis.com/opencensus/testview",
Expand Down Expand Up @@ -1154,11 +1124,6 @@ func TestExporter_makeReq_withCustomMonitoredResource(t *testing.T) {
},
},
},
},
},
{
Name: monitoring.MetricProjectPath("proj-id"),
TimeSeries: []*monitoringpb.TimeSeries{
{
Metric: &metricpb.Metric{
Type: "custom.googleapis.com/opencensus/testview",
Expand Down Expand Up @@ -1232,11 +1197,6 @@ func TestExporter_makeReq_withCustomMonitoredResource(t *testing.T) {
},
},
},
},
},
{
Name: monitoring.MetricProjectPath("proj-id"),
TimeSeries: []*monitoringpb.TimeSeries{
{
Metric: &metricpb.Metric{
Type: "custom.googleapis.com/opencensus/testview",
Expand Down Expand Up @@ -1303,11 +1263,6 @@ func TestExporter_makeReq_withCustomMonitoredResource(t *testing.T) {
},
},
},
},
},
{
Name: monitoring.MetricProjectPath("proj-id"),
TimeSeries: []*monitoringpb.TimeSeries{
{
Metric: &metricpb.Metric{
Type: "custom.googleapis.com/opencensus/testview",
Expand Down Expand Up @@ -1414,7 +1369,7 @@ func TestExporter_customContext(t *testing.T) {
if ctx.Err() != context.DeadlineExceeded {
t.Errorf("expected context to time out; got %v", ctx.Err())
}
if timedOut != 3 {
if timedOut != 2 {
t.Errorf("expected two functions to time out; got %d", timedOut)
}
}
Expand Down