Added unit annotation supports onto tsmon in go.

server/internal/logdog/collector/collector.go

 // Copyright 2016 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package collector
 
 import (
         "bytes"
         "time"
 
         "github.com/golang/protobuf/proto"
         "github.com/luci/luci-go/common/clock"
         "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/errors"
         "github.com/luci/luci-go/common/logdog/butlerproto"
         "github.com/luci/luci-go/common/logdog/types"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/parallel"
         "github.com/luci/luci-go/common/proto/logdog/logpb"
         "github.com/luci/luci-go/common/tsmon/distribution"
         "github.com/luci/luci-go/common/tsmon/field"
         "github.com/luci/luci-go/common/tsmon/metric"
+        tsmon_types "github.com/luci/luci-go/common/tsmon/types"
         "github.com/luci/luci-go/server/internal/logdog/collector/coordinator"
         "github.com/luci/luci-go/server/logdog/storage"
         "golang.org/x/net/context"
 )
 
 const (
         // DefaultMaxMessageWorkers is the default number of concurrent worker
         // goroutones to employ for a single message.
         DefaultMaxMessageWorkers = 4
 )
 
 var (
         // tsBundles tracks the total number of logpb.ButlerLogBundle entries that
         // have been submitted for collection.
         tsBundles = metric.NewCounter("logdog/collector/bundles",
-                "The number of individual log entry bundles that have been ingested.")
+                "The number of individual log entry bundles that have been ingested.",
+                tsmon_types.MetricMetadata{})
         // tsLogs tracks the number of logpb.LogEntry entries that have been
         // written to intermediate storage.
         tsLogs = metric.NewCounter("logdog/collector/logs",
-                "The number of individual log entries that have been ingested.")
+                "The number of individual log entries that have been ingested.",
+                tsmon_types.MetricMetadata{})
 
         // tsBundleSize tracks the size, in bytes, of a given log bundle.
         tsBundleSize = metric.NewCumulativeDistribution("logdog/collector/bundle/size",
                 "The size (in bytes) of the bundle.",
+                tsmon_types.MetricMetadata{Units: tsmon_types.Bytes},
                 distribution.DefaultBucketer)
         // tsBundleEntriesPerBundle tracks the number of ButlerLogBundle.Entry entries
         // in each bundle that have been collected.
         tsBundleEntriesPerBundle = metric.NewCumulativeDistribution("logdog/collector/bundle/entries_per_bundle",
                 "The number of log bundle entries per bundle.",
+                tsmon_types.MetricMetadata{},
                 distribution.DefaultBucketer)
 
         // tsBundleEntries tracks the total number of ButlerLogBundle.Entry entries
         // that have been collected.
         //
         // The "stream" field is the type of log stream for each tracked bundle entry.
         tsBundleEntries = metric.NewCounter("logdog/collector/bundle/entries",
                 "The number of Butler bundle entries pulled.",
+                tsmon_types.MetricMetadata{},
                 field.String("stream"))
         // tsBundleEntryLogs tracks the number of LogEntry ingested per bundle.
         //
         // The "stream" field is the type of log stream.
         tsBundleEntryLogs = metric.NewCumulativeDistribution("logdog/collector/bundle/entry/logs",
                 "The number of log entries per bundle.",
+                tsmon_types.MetricMetadata{},
                 distribution.DefaultBucketer,
                 field.String("stream"))
         tsBundleEntryProcessingTime = metric.NewCumulativeDistribution("logdog/collector/bundle/entry/processing_time_ms",
                 "The amount of time in milliseconds that a bundle entry takes to process.",
+                tsmon_types.MetricMetadata{Units: tsmon_types.Milliseconds},
                 distribution.DefaultBucketer,
                 field.String("stream"))
 )
 
 // Collector is a stateful object responsible for ingesting LogDog logs,
 // registering them with a Coordinator, and stowing them in short-term storage
 // for streaming and processing.
 //
 // A Collector's Close should be called when finished to release any internal
 // resources.
@@ skipping 358 matching lines @@
                 }
         })
 }
 
 func streamType(desc *logpb.LogStreamDescriptor) string {
         if desc == nil {
                 return "UNKNOWN"
         }
         return desc.StreamType.String()
 }