Added unit annotation supports onto tsmon in go.

server/internal/logdog/archivist/archivist.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 archivist
 
 import (
         "bytes"
         "encoding/hex"
         "fmt"
         "io"
         "time"
 
         "github.com/golang/protobuf/proto"
         "golang.org/x/net/context"
 
         "github.com/luci/luci-go/common/api/logdog_coordinator/services/v1"
         "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/gcloud/gs"
         "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/logdog/archive"
         "github.com/luci/luci-go/server/logdog/storage"
 )
 
 const (
         tsEntriesField = "entries"
         tsIndexField   = "index"
         tsDataField    = "data"
 
         // If the archive dispatch is within this range of the current time, we will
         // avoid archival.
         dispatchThreshold = 5 * time.Minute
 )
 
 var (
         // tsCount counts the raw number of archival tasks that this instance has
         // processed, regardless of success/failure.
         tsCount = metric.NewCounter("logdog/archivist/archive/count",
                 "The number of archival tasks processed.",
+                tsmon_types.MetricMetadata{},
                 field.Bool("successful"))
 
         // tsSize tracks the archive binary file size distribution of completed
         // archives.
         //
         // The "archive" field is the specific type of archive (entries, index, data)
         // that is being tracked.
         //
         // The "stream" field is the type of log stream that is being archived.
         tsSize = metric.NewCumulativeDistribution("logdog/archivist/archive/size",
                 "The size (in bytes) of each archive file.",
+                tsmon_types.MetricMetadata{Units: tsmon_types.Bytes},
                 distribution.DefaultBucketer,
                 field.String("archive"),
                 field.String("stream"))
 
         // tsTotalBytes tracks the cumulative total number of bytes that have
         // been archived by this instance.
         //
         // The "archive" field is the specific type of archive (entries, index, data)
         // that is being tracked.
         //
         // The "stream" field is the type of log stream that is being archived.
         tsTotalBytes = metric.NewCounter("logdog/archivist/archive/total_bytes",
                 "The total number of archived bytes.",
+                tsmon_types.MetricMetadata{Units: tsmon_types.Bytes},
                 field.String("archive"),
                 field.String("stream"))
 
         // tsLogEntries tracks the number of log entries per individual
         // archival.
         //
         // The "stream" field is the type of log stream that is being archived.
         tsLogEntries = metric.NewCumulativeDistribution("logdog/archivist/archive/log_entries",
                 "The total number of log entries per archive.",
+                tsmon_types.MetricMetadata{},
                 distribution.DefaultBucketer,
                 field.String("stream"))
 
         // tsTotalLogEntries tracks the total number of log entries that have
         // been archived by this instance.
         //
         // The "stream" field is the type of log stream that is being archived.
         tsTotalLogEntries = metric.NewCounter("logdog/archivist/archive/total_log_entries",
                 "The total number of log entries.",
+                tsmon_types.MetricMetadata{},
                 field.String("stream"))
 )
 
 // Task is a single archive task.
 type Task interface {
         // UniqueID returns a task-unique value. Other tasks, and other retries of
         // this task, should (try to) not reuse this ID.
         UniqueID() string
 
         // Task is the archive task to execute.
@@ skipping 673 matching lines @@
         return e.inner
 }
 
 func isFailure(err error) bool {
         if err == nil {
                 return false
         }
         _, ok := err.(*statusErrorWrapper)
         return !ok
 }