Updated moniroting/proxy and cloudtail/client with tsmon's unit annotation supports.

go/src/infra/monitoring/proxy/pubsub.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package main
 
 import (
         "flag"
         "fmt"
         "net/http"
         "time"
 
         "github.com/luci/luci-go/common/auth"
         "github.com/luci/luci-go/common/clock"
         "github.com/luci/luci-go/common/errors"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/tsmon/distribution"
         "github.com/luci/luci-go/common/tsmon/field"
         "github.com/luci/luci-go/common/tsmon/metric"
+        "github.com/luci/luci-go/common/tsmon/types"
         "golang.org/x/net/context"
         "google.golang.org/cloud"
         "google.golang.org/cloud/pubsub"
 )
 
 const (
         // The maximum number of items that can be pulled from a subscription at once.
         maxSubscriptionPullSize = 100
 )
 
 var (
         // OAuth2 scopes to generate.
         pubsubScopes = []string{
                 pubsub.ScopePubSub,
                 auth.OAuthScopeEmail,
         }
 
         // Error returned by pullAckMessages to indicate that no messages were available.
         errNoMessages = errors.New("pubsub: no messages")
 
         messageCount = metric.NewCounter("mon_proxy/pubsub/message",
                 "Count of messages pulled from pub/sub, by worker",
+                types.MetricMetadata{},
                 field.Int("worker"))
         ackCount = metric.NewCounter("mon_proxy/pubsub/ack",
                 "Count of messages Ack'd, by success/failure",
+                types.MetricMetadata{},
                 field.String("result"))
         pullDurationMetric = metric.NewCumulativeDistribution("mon_proxy/pubsub/pull_duration",
                 "Time taken to Pull messages from pub/sub, in milliseconds",
+                types.MetricMetadata{Units: types.Milliseconds},
                 distribution.DefaultBucketer)
         ackDurationMetric = metric.NewCumulativeDistribution("mon_proxy/pubsub/ack_duration",
                 "Time taken to Ack messages to pub/sub, in milliseconds",
+                types.MetricMetadata{Units: types.Milliseconds},
                 distribution.DefaultBucketer)
 )
 
 // pubsubConfig is the set of configuration parameters for a pubsubClient.
 type pubsubConfig struct {
         project      string // The project name.
         topic        string // The topic name.
         subscription string // The subscription name.
         create       bool
         batchSize    int // The number of elements to pull from a subscription per batch.
@@ skipping 286 matching lines @@
         case nil:
                 return nil
 
         case context.Canceled:
                 return err
 
         default:
                 return errors.WrapTransient(err)
         }
 }