@@ -106,11 +106,33 @@ func TestSample(t *testing.T) {
106106 },
107107 createFn : func (t * testing.T ) func (context.Context , * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
108108 return func (_ context.Context , req * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
109- if req .TimeSeries [0 ].Points [0 ].Value .GetDistributionValue ().BucketCounts [0 ] == 1 {
110- return & emptypb.Empty {}, nil
109+ want := & monitoringpb.CreateTimeSeriesRequest {
110+ Name : "projects/foo" ,
111+ TimeSeries : []* monitoringpb.TimeSeries {
112+ & monitoringpb.TimeSeries {
113+ Metric : & metricpb.Metric {
114+ Type : "custom.googleapis.com/go-metrics/foo_bar" ,
115+ },
116+ MetricKind : metric .MetricDescriptor_CUMULATIVE ,
117+ Points : []* monitoringpb.Point {
118+ & monitoringpb.Point {
119+ Value : & monitoringpb.TypedValue {
120+ Value : & monitoringpb.TypedValue_DistributionValue {
121+ DistributionValue : & distributionpb.Distribution {
122+ BucketCounts : []int64 {1 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 },
123+ Count : 1 ,
124+ },
125+ },
126+ },
127+ },
128+ },
129+ },
130+ },
111131 }
112- t .Errorf ("unexpected CreateTimeSeriesRequest\n want: %s\n got: %v" , "bucket 0 count 1" , req )
113- return nil , errors .New ("unexpected CreateTimeSeriesRequest" )
132+ if diff := diffCreateMsg (want , req ); diff != "" {
133+ t .Errorf ("unexpected CreateTimeSeriesRequest (-want +got):\n %s" , diff )
134+ }
135+ return & emptypb.Empty {}, nil
114136 }
115137 },
116138 },
@@ -163,11 +185,33 @@ func TestSample(t *testing.T) {
163185 },
164186 createFn : func (t * testing.T ) func (context.Context , * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
165187 return func (_ context.Context , req * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
166- if req .TimeSeries [0 ].Points [0 ].Value .GetDistributionValue ().BucketCounts [0 ] == 3 {
167- return & emptypb.Empty {}, nil
188+ want := & monitoringpb.CreateTimeSeriesRequest {
189+ Name : "projects/foo" ,
190+ TimeSeries : []* monitoringpb.TimeSeries {
191+ & monitoringpb.TimeSeries {
192+ Metric : & metricpb.Metric {
193+ Type : "custom.googleapis.com/go-metrics/foo_bar" ,
194+ },
195+ MetricKind : metric .MetricDescriptor_CUMULATIVE ,
196+ Points : []* monitoringpb.Point {
197+ & monitoringpb.Point {
198+ Value : & monitoringpb.TypedValue {
199+ Value : & monitoringpb.TypedValue_DistributionValue {
200+ DistributionValue : & distributionpb.Distribution {
201+ BucketCounts : []int64 {3 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 },
202+ Count : 3 ,
203+ },
204+ },
205+ },
206+ },
207+ },
208+ },
209+ },
168210 }
169- t .Errorf ("unexpected CreateTimeSeriesRequest\n want: %s\n got: %v" , "bucket 0 count 3" , req )
170- return nil , errors .New ("unexpected CreateTimeSeriesRequest" )
211+ if diff := diffCreateMsg (want , req ); diff != "" {
212+ t .Errorf ("unexpected CreateTimeSeriesRequest (-want +got):\n %s" , diff )
213+ }
214+ return & emptypb.Empty {}, nil
171215 }
172216 },
173217 },
@@ -178,11 +222,30 @@ func TestSample(t *testing.T) {
178222 },
179223 createFn : func (t * testing.T ) func (context.Context , * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
180224 return func (_ context.Context , req * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
181- if req .TimeSeries [0 ].Points [0 ].Value .GetDoubleValue () == 1.0 {
182- return & emptypb.Empty {}, nil
225+ want := & monitoringpb.CreateTimeSeriesRequest {
226+ Name : "projects/foo" ,
227+ TimeSeries : []* monitoringpb.TimeSeries {
228+ & monitoringpb.TimeSeries {
229+ Metric : & metricpb.Metric {
230+ Type : "custom.googleapis.com/go-metrics/foo_bar_counter" ,
231+ },
232+ MetricKind : metric .MetricDescriptor_GAUGE ,
233+ Points : []* monitoringpb.Point {
234+ & monitoringpb.Point {
235+ Value : & monitoringpb.TypedValue {
236+ Value : & monitoringpb.TypedValue_DoubleValue {
237+ DoubleValue : 1.0 ,
238+ },
239+ },
240+ },
241+ },
242+ },
243+ },
183244 }
184- t .Errorf ("unexpected CreateTimeSeriesRequest\n want: %s\n got: %v" , "value 1.0" , req )
185- return nil , errors .New ("unexpected CreateTimeSeriesRequest" )
245+ if diff := diffCreateMsg (want , req ); diff != "" {
246+ t .Errorf ("unexpected CreateTimeSeriesRequest (-want +got):\n %s" , diff )
247+ }
248+ return & emptypb.Empty {}, nil
186249 }
187250 },
188251 },
@@ -195,11 +258,30 @@ func TestSample(t *testing.T) {
195258 },
196259 createFn : func (t * testing.T ) func (context.Context , * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
197260 return func (_ context.Context , req * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
198- if req .TimeSeries [0 ].Points [0 ].Value .GetDoubleValue () == 3.0 {
199- return & emptypb.Empty {}, nil
261+ want := & monitoringpb.CreateTimeSeriesRequest {
262+ Name : "projects/foo" ,
263+ TimeSeries : []* monitoringpb.TimeSeries {
264+ & monitoringpb.TimeSeries {
265+ Metric : & metricpb.Metric {
266+ Type : "custom.googleapis.com/go-metrics/foo_bar_counter" ,
267+ },
268+ MetricKind : metric .MetricDescriptor_GAUGE ,
269+ Points : []* monitoringpb.Point {
270+ & monitoringpb.Point {
271+ Value : & monitoringpb.TypedValue {
272+ Value : & monitoringpb.TypedValue_DoubleValue {
273+ DoubleValue : 3.0 ,
274+ },
275+ },
276+ },
277+ },
278+ },
279+ },
200280 }
201- t .Errorf ("unexpected CreateTimeSeriesRequest\n want: %s\n got: %v" , "value 3.0" , req )
202- return nil , errors .New ("unexpected CreateTimeSeriesRequest" )
281+ if diff := diffCreateMsg (want , req ); diff != "" {
282+ t .Errorf ("unexpected CreateTimeSeriesRequest (-want +got):\n %s" , diff )
283+ }
284+ return & emptypb.Empty {}, nil
203285 }
204286 },
205287 },
@@ -210,11 +292,30 @@ func TestSample(t *testing.T) {
210292 },
211293 createFn : func (t * testing.T ) func (context.Context , * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
212294 return func (_ context.Context , req * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
213- if req .TimeSeries [0 ].Points [0 ].Value .GetDoubleValue () == 50.0 {
214- return & emptypb.Empty {}, nil
295+ want := & monitoringpb.CreateTimeSeriesRequest {
296+ Name : "projects/foo" ,
297+ TimeSeries : []* monitoringpb.TimeSeries {
298+ & monitoringpb.TimeSeries {
299+ Metric : & metricpb.Metric {
300+ Type : "custom.googleapis.com/go-metrics/foo_bar_gauge" ,
301+ },
302+ MetricKind : metric .MetricDescriptor_GAUGE ,
303+ Points : []* monitoringpb.Point {
304+ & monitoringpb.Point {
305+ Value : & monitoringpb.TypedValue {
306+ Value : & monitoringpb.TypedValue_DoubleValue {
307+ DoubleValue : 50.0 ,
308+ },
309+ },
310+ },
311+ },
312+ },
313+ },
215314 }
216- t .Errorf ("unexpected CreateTimeSeriesRequest\n want: %s\n got: %v" , "value 50.0" , req )
217- return nil , errors .New ("unexpected CreateTimeSeriesRequest" )
315+ if diff := diffCreateMsg (want , req ); diff != "" {
316+ t .Errorf ("unexpected CreateTimeSeriesRequest (-want +got):\n %s" , diff )
317+ }
318+ return & emptypb.Empty {}, nil
218319 }
219320 },
220321 },
@@ -227,11 +328,30 @@ func TestSample(t *testing.T) {
227328 },
228329 createFn : func (t * testing.T ) func (context.Context , * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
229330 return func (_ context.Context , req * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
230- if req .TimeSeries [0 ].Points [0 ].Value .GetDoubleValue () == 50.0 {
231- return & emptypb.Empty {}, nil
331+ want := & monitoringpb.CreateTimeSeriesRequest {
332+ Name : "projects/foo" ,
333+ TimeSeries : []* monitoringpb.TimeSeries {
334+ & monitoringpb.TimeSeries {
335+ Metric : & metricpb.Metric {
336+ Type : "custom.googleapis.com/go-metrics/foo_bar_gauge" ,
337+ },
338+ MetricKind : metric .MetricDescriptor_GAUGE ,
339+ Points : []* monitoringpb.Point {
340+ & monitoringpb.Point {
341+ Value : & monitoringpb.TypedValue {
342+ Value : & monitoringpb.TypedValue_DoubleValue {
343+ DoubleValue : 50.0 ,
344+ },
345+ },
346+ },
347+ },
348+ },
349+ },
232350 }
233- t .Errorf ("unexpected CreateTimeSeriesRequest\n want: %s\n got: %v" , "value 50.0" , req )
234- return nil , errors .New ("unexpected CreateTimeSeriesRequest" )
351+ if diff := diffCreateMsg (want , req ); diff != "" {
352+ t .Errorf ("unexpected CreateTimeSeriesRequest (-want +got):\n %s" , diff )
353+ }
354+ return & emptypb.Empty {}, nil
235355 }
236356 },
237357 },
@@ -244,11 +364,30 @@ func TestSample(t *testing.T) {
244364 },
245365 createFn : func (t * testing.T ) func (context.Context , * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
246366 return func (_ context.Context , req * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
247- if req .TimeSeries [0 ].Points [0 ].Value .GetDoubleValue () == 52.0 {
248- return & emptypb.Empty {}, nil
367+ want := & monitoringpb.CreateTimeSeriesRequest {
368+ Name : "projects/foo" ,
369+ TimeSeries : []* monitoringpb.TimeSeries {
370+ & monitoringpb.TimeSeries {
371+ Metric : & metricpb.Metric {
372+ Type : "custom.googleapis.com/go-metrics/foo_bar_gauge" ,
373+ },
374+ MetricKind : metric .MetricDescriptor_GAUGE ,
375+ Points : []* monitoringpb.Point {
376+ & monitoringpb.Point {
377+ Value : & monitoringpb.TypedValue {
378+ Value : & monitoringpb.TypedValue_DoubleValue {
379+ DoubleValue : 52.0 ,
380+ },
381+ },
382+ },
383+ },
384+ },
385+ },
249386 }
250- t .Errorf ("unexpected CreateTimeSeriesRequest\n want: %s\n got: %v" , "value 52.0" , req )
251- return nil , errors .New ("unexpected CreateTimeSeriesRequest" )
387+ if diff := diffCreateMsg (want , req ); diff != "" {
388+ t .Errorf ("unexpected CreateTimeSeriesRequest (-want +got):\n %s" , diff )
389+ }
390+ return & emptypb.Empty {}, nil
252391 }
253392 },
254393 },
@@ -329,12 +468,36 @@ func TestExtract(t *testing.T) {
329468 },
330469 createFn : func (t * testing.T ) func (context.Context , * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
331470 return func (_ context.Context , req * monitoringpb.CreateTimeSeriesRequest ) (* emptypb.Empty , error ) {
332- metric := req .TimeSeries [0 ].GetMetric ()
333- if metric .GetType () == "custom.googleapis.com/go-metrics/foo" && metric .GetLabels ()["method" ] == "bar" && req .TimeSeries [0 ].Points [0 ].Value .GetDistributionValue ().BucketCounts [0 ] == 1 {
334- return & emptypb.Empty {}, nil
471+ want := & monitoringpb.CreateTimeSeriesRequest {
472+ Name : "projects/foo" ,
473+ TimeSeries : []* monitoringpb.TimeSeries {
474+ & monitoringpb.TimeSeries {
475+ Metric : & metricpb.Metric {
476+ Type : "custom.googleapis.com/go-metrics/foo" ,
477+ Labels : map [string ]string {
478+ "method" : "bar" ,
479+ },
480+ },
481+ MetricKind : metric .MetricDescriptor_CUMULATIVE ,
482+ Points : []* monitoringpb.Point {
483+ & monitoringpb.Point {
484+ Value : & monitoringpb.TypedValue {
485+ Value : & monitoringpb.TypedValue_DistributionValue {
486+ DistributionValue : & distributionpb.Distribution {
487+ BucketCounts : []int64 {1 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 },
488+ Count : 1 ,
489+ },
490+ },
491+ },
492+ },
493+ },
494+ },
495+ },
335496 }
336- t .Errorf ("unexpected CreateTimeSeriesRequest\n want: %s\n got: %v" , "bucket 0 count 1" , req )
337- return nil , errors .New ("unexpected CreateTimeSeriesRequest" )
497+ if diff := diffCreateMsg (want , req ); diff != "" {
498+ t .Errorf ("unexpected CreateTimeSeriesRequest (-want +got):\n %s" , diff )
499+ }
500+ return & emptypb.Empty {}, nil
338501 }
339502 },
340503 },
0 commit comments