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

go/src/infra/tools/cloudtail/client.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 cloudtail
 
 import (
         "encoding/json"
         "fmt"
         "net/http"
         "os"
         "time"
 
         "github.com/luci/luci-go/common/logging"
         "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"
         cloudlog "google.golang.org/api/logging/v1beta3"
 )
 
 // DefaultResourceType is used by NewClient if ClientOptions doesn't specify
 // ResourceType.
 const DefaultResourceType = "machine"
 
 // Entry is a single log entry. It can be a text message, or a JSONish struct.
 type Entry struct {
@@ skipping 43 matching lines @@
         // LogID identifies what sort of log this is. Must be set.
         LogID string
 
         // Debug is true to print log entries to stdout instead of sending them.
         Debug bool
 }
 
 var (
         entriesCounter = metric.NewCounter("cloudtail/log_entries",
                 "Log entries processed",
+                types.MetricMetadata{},
                 field.String("log"),
                 field.String("resource_type"),
                 field.String("resource_id"),
                 field.String("severity"))
         writesCounter = metric.NewCounter("cloudtail/api_writes",
                 "Writes to Cloud Logging API",
+                types.MetricMetadata{},
                 field.String("log"),
                 field.String("resource_type"),
                 field.String("resource_id"),
                 field.String("result"))
 )
 
 // NewClient returns new object that knows how to push log entries to a single
 // log in Cloud Logging.
 func NewClient(opts ClientOptions) (Client, error) {
         if opts.Logger == nil {
@@ skipping 88 matching lines @@
                 entriesCounter.Add(c.ctx, 1, c.opts.LogID, c.opts.ResourceType, c.opts.ResourceID, metadata.Severity)
         }
         if err := c.writeFunc(c.opts.ProjectID, c.opts.LogID, &req); err != nil {
                 writesCounter.Add(c.ctx, 1, c.opts.LogID, c.opts.ResourceType, c.opts.ResourceID, "failure")
                 return err
         }
 
         writesCounter.Add(c.ctx, 1, c.opts.LogID, c.opts.ResourceType, c.opts.ResourceID, "success")
         return nil
 }