Kitchen: always emit annotations if teeing.

go/src/infra/tools/kitchen/cook_logdog.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 main
 
 import (
         "flag"
         "fmt"
         "io"
@@ skipping 73 matching lines @@
                 &p.serviceAccountJSONPath,
                 "logdog-service-account-json-path",
                 "",
                 "If specified, use the service account JSON file at this path. Otherwise, autodetect.")
 }
 
 func (p *cookLogDogParams) active() bool {
         return p.host != "" || p.project != "" || p.prefix != ""
 }
 
+// emitAnnotations returns true if the cook command should emit additional
+// annotations.
+//
+// If we're streaming solely to LogDog, it makes no sense to emit extra
+// annotations, since nothing will consume them; however, if we're tee-ing, we
+// will continue to emit additional annotations in case something is looking
+// at the tee'd output.
+//
+// Note that this could create an incongruity between the LogDog-emitted
+// annotations and the annotations in the STDOUT stream.
+func (p *cookLogDogParams) emitAnnotations() bool {
+        return p.tee || !p.active()
+}
+
 func (p *cookLogDogParams) validate() error {
         if p.project == "" {
                 return fmt.Errorf("a LogDog project must be supplied (-logdog-project)")
         }
         return nil
 }
 
 func (p *cookLogDogParams) getPrefix(env environ.Env) (types.StreamName, error) {
         if p.prefix != "" {
                 return p.prefix, nil
@@ skipping 301 matching lines @@
 // callbackReadCloser invokes a callback method when closed.
 type callbackReadCloser struct {
         io.ReadCloser
         callback func()
 }
 
 func (c *callbackReadCloser) Close() error {
         defer c.callback()
         return c.ReadCloser.Close()
 }