Issue 623854: Support unit annotations in ts_mon metrics

go/src/infra/monitoring/proxy/main.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 (
         "errors"
         "flag"
         "fmt"
         "net/http"
         "os"
         "os/signal"
         "runtime"
         "sync"
         "time"
 
         "github.com/luci/luci-go/common/auth"
         "github.com/luci/luci-go/common/clock"
         luciErrors "github.com/luci/luci-go/common/errors"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/logging/gologger"
         "github.com/luci/luci-go/common/parallel"
         "github.com/luci/luci-go/common/tsmon"
         "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/pubsub"
 )
 
 const (
         // noMessageDelay is the amount of time to sleep after receiving no messages.
         noMessageDelay = 1 * time.Second
 
         // maxMessageSize is the maximum size of a message that the proxy will
         // forward. Messages larger than this will be discarded by policy.
         maxMessageSize = 1024 * 512
 )
 
 var (
         sentCount = metric.NewCounter("mon_proxy/endpoint/sent",
                 "Count of messages proxied to the endpoint",
+                types.MetricMetadata{},

[Sergey Berezin, 2016/07/06 22:01:24]

I'd split the go changes into a separate CL. The reason is, luci-go is pinned in
infra.git, and you first need to land the Go CL, and only then modify the go
code in infra.git, together with the pin roll (in top-level DEPS file).

IIUC, the Python change is independent from the Go change, so they can land
separately.

[ddoman, 2016/07/07 05:06:39]

Done.

                 field.String("result"))
         sentDuration = metric.NewCumulativeDistribution("mon_proxy/endpoint/duration",
                 "Time taken to send messages to the endpoint, in milliseconds",
+                types.MetricMetadata{Units: types.Milliseconds},
                 distribution.DefaultBucketer)
 )
 
 func init() {
         // Increase idle connections per host, since we connect to basically two
         // hosts.
         if t, ok := http.DefaultTransport.(*http.Transport); ok {
                 t.MaxIdleConnsPerHost = 10000
         }
 }
@@ skipping 325 matching lines @@
                 log.Errorf(log.SetError(ctx, err), "Error during application execution.")
                 return 1
         }
 
         return 0
 }
 
 func main() {
         os.Exit(mainImpl(os.Args[1:]))
 }