Add Butler global tags.

logdog/client/cmd/logdog_butler/main.go

 // Copyright 2015 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 main
 
 import (
         "bytes"
         "flag"
         "fmt"
@@ skipping 14 matching lines @@
         "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/errors"
         "github.com/luci/luci-go/common/flag/multiflag"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/logging/gologger"
         "github.com/luci/luci-go/common/runtime/paniccatcher"
         "github.com/luci/luci-go/common/runtime/profiling"
         grpcLogging "github.com/luci/luci-go/grpc/logging"
         "github.com/luci/luci-go/logdog/client/butler"
         "github.com/luci/luci-go/logdog/client/butler/output"
+        "github.com/luci/luci-go/logdog/client/butlerlib/streamproto"
         "github.com/luci/luci-go/logdog/common/types"
 )
 
 const (
         // flagErrorReturnCode is returned when there is an error with the Butler's
         // command-line configuration.
         configErrorReturnCode = 2
 
         // runtimeErrorReturnCode is returned when the execution fails due to a Butler
         // error. This is intended to help differentiate Butler errors from
@@ skipping 13 matching lines @@
 
         project             config.ProjectName
         prefix              types.StreamName
         coordinatorHost     string
         outputWorkers       int
         outputConfig        outputConfigFlag
         ioKeepAliveInterval clockflag.Duration
 
         authFlags authcli.Flags
 
+        globalTags   streamproto.TagMap
         maxBufferAge clockflag.Duration
         noBufferLogs bool
 
         prof profiling.Profiler
 
         client *http.Client
 
         // ncCtx is a context that will not be cancelled when cancelFunc is called.
         ncCtx      context.Context
         cancelFunc func()
@@ skipping 16 matching lines @@
         fs.Var(&a.project, "project",
                 "The log prefix's project name (required).")
         fs.Var(&a.prefix, "prefix",
                 "Prefix to apply to all stream names.")
         fs.StringVar(&a.coordinatorHost, "coordinator-host", "",
                 "The Coordinator host to pass on to subprocesses.")
         fs.Var(&a.outputConfig, "output",
                 "The output name and configuration. Specify 'help' for more information.")
         fs.IntVar(&a.outputWorkers, "output-workers", butler.DefaultOutputWorkers,
                 "The maximum number of parallel output dispatches.")
+        fs.Var(&a.globalTags, "tag",
+                "Specify key[=value] tags to be applied to all log streams. Individual treams may override. Can "+
+                        "be specified multiple times.")
         fs.Var(&a.maxBufferAge, "output-max-buffer-age",
                 "Send buffered messages if they've been held for longer than this period.")
         fs.BoolVar(&a.noBufferLogs, "output-no-buffer", false,
                 "If true, dispatch logs immediately. Setting this flag simplifies output at the expense "+
                         "of wire-format efficiency.")
         fs.Var(&a.ioKeepAliveInterval, "io-keepalive-stderr",
                 "If supplied, periodically write messages to STDERR if data is received on any Butler stream.")
 }
 
 func (a *application) authenticator(ctx context.Context) (*auth.Authenticator, error) {
@@ skipping 21 matching lines @@
         a.prof.Logger = log.Get(a)
         if err := a.prof.Start(); err != nil {
                 return fmt.Errorf("failed to start Profiler: %v", err)
         }
         defer a.prof.Stop()
 
         // Instantiate our Butler.
         butlerOpts := butler.Config{
                 Project:             a.project,
                 Prefix:              a.prefix,
+                GlobalTags:          a.globalTags,
                 MaxBufferAge:        time.Duration(a.maxBufferAge),
                 BufferLogs:          !a.noBufferLogs,
                 Output:              out,
                 OutputWorkers:       a.outputWorkers,
                 TeeStdout:           os.Stdout,
                 TeeStderr:           os.Stderr,
                 IOKeepAliveInterval: time.Duration(a.ioKeepAliveInterval),
                 IOKeepAliveWriter:   os.Stderr,
         }
         b, err := butler.New(a, butlerOpts)
@@ skipping 188 matching lines @@
 
         paniccatcher.Do(func() {
                 rc = mainImpl(ctx, os.Args[1:])
         }, func(p *paniccatcher.Panic) {
                 log.Fields{
                         "panic.error": p.Reason,
                 }.Errorf(ctx, "Panic caught in main:\n%s", p.Stack)
                 rc = runtimeErrorReturnCode
         })
 }