Add some more fields to cloudtail metrics to make them more useful.

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"
@@ skipping 57 matching lines @@
         ResourceID string
 
         // 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/entries", field.String("severity"))
-        writesCounter  = metric.NewCounter("cloudtail/writes", field.String("result"))
+        entriesCounter = metric.NewCounter("cloudtail/log_entries",
+                field.String("log"),
+                field.String("resource_type"),
+                field.String("resource_id"),
+                field.String("severity"))
+        writesCounter = metric.NewCounter("cloudtail/api_writes",
+                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 {
                 opts.Logger = logging.Null()
         }
         if opts.ProjectID == "" {
                 return nil, fmt.Errorf("no ProjectID is provided")
@@ skipping 72 matching lines @@
                 }
                 if !e.Timestamp.IsZero() {
                         metadata.Timestamp = e.Timestamp.UTC().Format(time.RFC3339Nano)
                 }
                 req.Entries[i] = &cloudlog.LogEntry{
                         InsertId:      e.InsertID,
                         Metadata:      metadata,
                         TextPayload:   e.TextPayload,
                         StructPayload: e.StructPayload,
                 }
-                entriesCounter.Add(c.ctx, 1, metadata.Severity)
+                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, "failure")
+                writesCounter.Add(c.ctx, 1, c.opts.LogID, c.opts.ResourceType, c.opts.ResourceID, "failure")
                 return err
         }
 
-        writesCounter.Add(c.ctx, 1, "success")
+        writesCounter.Add(c.ctx, 1, c.opts.LogID, c.opts.ResourceType, c.opts.ResourceID, "success")
         return nil
 }