Butler: fix global tags applied to empty map.

logdog/client/butler/butler_test.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 butler
 
 import (
         "bytes"
         "errors"
         "fmt"
         "io"
+        "io/ioutil"
         "sync"
         "testing"
+        "time"
 
         "github.com/luci/luci-go/common/clock/testclock"
+        "github.com/luci/luci-go/common/proto/google"
         . "github.com/luci/luci-go/common/testing/assertions"
         "github.com/luci/luci-go/logdog/api/logpb"
         "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"
+
+        "golang.org/x/net/context"
+
         . "github.com/smartystreets/goconvey/convey"
-        "golang.org/x/net/context"
 )
 
 type testOutput struct {
         sync.Mutex
 
         err      error
         maxSize  int
         streams  map[string][]*logpb.LogEntry
         terminal map[string]struct{}
         closed   bool
@@ skipping 359 matching lines @@
 
                                 So(teeStdout.String(), ShouldEqual, "Hello, STDOUT")
                                 So(to.logs("stdout"), shouldHaveTextLogs, "Hello, STDOUT")
                                 So(to.isTerminal("stdout"), ShouldBeTrue)
 
                                 So(teeStderr.String(), ShouldEqual, "Hello, STDERR")
                                 So(to.logs("stderr"), shouldHaveTextLogs, "Hello, STDERR")
                                 So(to.isTerminal("stderr"), ShouldBeTrue)
                         })
 
+                        Convey(`Can apply global tags.`, func() {
+                                conf.GlobalTags = streamproto.TagMap{
+                                        "foo": "bar",
+                                        "baz": "qux",
+                                }
+                                props := streamproto.Properties{
+                                        LogStreamDescriptor: &logpb.LogStreamDescriptor{
+                                                Name:        "stdout",
+                                                ContentType: "test/data",
+                                                Timestamp:   google.NewTimestamp(time.Date(2016, 1, 1, 0, 0, 0, 0, time.UTC)),
+                                        },
+                                }
+
+                                b := mkb(c, conf)
+                                defer func() {
+                                        b.Activate()
+                                        b.Wait()
+                                }()
+
+                                Convey(`Applies global tags, but allows the stream to override.`, func() {
+                                        props.Tags = map[string]string{
+                                                "baz": "override",
+                                        }
+
+                                        So(b.AddStream(ioutil.NopCloser(&bytes.Buffer{}), &props), ShouldBeNil)
+                                        So(b.bundler.GetStreamDescs(), ShouldResemble, map[string]*logpb.LogStreamDescriptor{
+                                                "stdout": {
+                                                        Name:        "stdout",
+                                                        ContentType: "test/data",
+                                                        Timestamp:   props.Timestamp,
+                                                        Tags: map[string]string{
+                                                                "foo": "bar",
+                                                                "baz": "override",
+                                                        },
+                                                },
+                                        })
+                                })
+
+                                Convey(`Will apply global tags if the stream has none (nil).`, func() {
+                                        So(b.AddStream(ioutil.NopCloser(&bytes.Buffer{}), &props), ShouldBeNil)
+                                        So(b.bundler.GetStreamDescs(), ShouldResemble, map[string]*logpb.LogStreamDescriptor{
+                                                "stdout": {
+                                                        Name:        "stdout",
+                                                        ContentType: "test/data",
+                                                        Timestamp:   props.Timestamp,
+                                                        Tags: map[string]string{
+                                                                "foo": "bar",
+                                                                "baz": "qux",
+                                                        },
+                                                },
+                                        })
+                                })
+                        })
+
                         Convey(`Run with 256 streams, stream{0..256} will deplete and finish.`, func() {
                                 b := mkb(c, conf)
                                 streams := make([]*testStream, 256)
                                 for i := range streams {
                                         streams[i] = newTestStream(func(p *streamproto.Properties) {
                                                 p.Name = fmt.Sprintf("stream%d", i)
                                         })
                                 }
 
                                 for _, s := range streams {
@@ skipping 127 matching lines @@
                         tss.onNext = func() {
                                 panic("test panic")
                         }
 
                         b := mkb(c, conf)
                         b.AddStreamServer(tss)
                         So(b.Wait(), ShouldErrLike, "test panic")
                 })
         })
 }