Remove log filtering and add stringsetflag.

common/logging/fields.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package logging
 
 import (
         "bytes"
         "fmt"
         "sort"
@@ skipping 44 matching lines @@
                 ret[k] = v
         }
         for k, v := range other {
                 ret[k] = v
         }
         return ret
 }
 
 // SortedEntries processes a Fields object, pruning invisible fields, placing
 // the ErrorKey field first, and then sorting the remaining fields by key.
-//
-// If prune is true, internally-used field keys will be pruned from the output
-// if present.
-func (f Fields) SortedEntries(prune bool) (s []*FieldEntry) {
+func (f Fields) SortedEntries() (s []*FieldEntry) {
         if len(f) == 0 {
                 return nil
         }
         s = make([]*FieldEntry, 0, len(f))
         for k, v := range f {
-                if !(prune && k == FilterOnKey) {
-                        s = append(s, &FieldEntry{k, v})
-                }
+                s = append(s, &FieldEntry{k, v})
         }
         sort.Sort(fieldEntrySlice(s))
         return
 }
 
-// FieldString returns a string describing the contents of f in a sorted,
+// String returns a string describing the contents of f in a sorted,
 // dictionary-like format.
-//
-// If prune is true, pruned fields will be omitted from the resulting string.
-func (f Fields) FieldString(prune bool) string {
+func (f Fields) String() string {
         b := bytes.Buffer{}
         b.WriteRune('{')
-        for idx, e := range f.SortedEntries(prune) {
+        for idx, e := range f.SortedEntries() {
                 if idx > 0 {
                         b.WriteString(", ")
                 }
                 b.WriteString(e.String())
         }
         b.WriteRune('}')
         return b.String()
 }
 
-// String returns a full string representation of Fields. This should not be
-// used for logging otuput, as it doesn't prune fields.
-func (f Fields) String() string {
-        return f.FieldString(false)
-}
-
 // Debugf is a shorthand method to call the current logger's Errorf method.
 func (f Fields) Debugf(c context.Context, fmt string, args ...interface{}) {
         Get(SetFields(c, f)).LogCall(Debug, 1, fmt, args)
 }
 
 // Infof is a shorthand method to call the current logger's Errorf method.
 func (f Fields) Infof(c context.Context, fmt string, args ...interface{}) {
         Get(SetFields(c, f)).LogCall(Info, 1, fmt, args)
 }
 
@@ skipping 77 matching lines @@
 // GetFields returns the current Fields.
 //
 // This method is used for logger implementations with the understanding that
 // the returned fields must not be mutated.
 func GetFields(c context.Context) Fields {
         if ret, ok := c.Value(fieldsKey).(Fields); ok {
                 return ret
         }
         return nil
 }