things

trentm · May 17, 2021 · c082fde · c082fde
1 parent 703344d
commit c082fde
Show file tree

Hide file tree

Showing 9 changed files with 649 additions and 111 deletions.
diff --git a/cmd/ecslog/config.go b/cmd/ecslog/config.go
@@ -70,7 +70,7 @@ func (c *config) GetString(key string) (val string, ok bool) {
 	return
 }
 
-func configFilePath() string {
+func globalConfigFilePath() string {
 	var homeEnvVar string
 	if runtime.GOOS == "windows" {
 		homeEnvVar = "UserProfile"
@@ -85,12 +85,12 @@ func configFilePath() string {
 }
 
 func loadConfig() (*config, error) {
-	cfgPath := configFilePath()
+	cfgPath := globalConfigFilePath()
 	if cfgPath == "" {
 		return &config{}, nil
 	}
 
-	tree, err := toml.LoadFile(cfgPath)
+	globalTree, err := toml.LoadFile(cfgPath)
 	if err != nil {
 		if os.IsNotExist(err) {
 			// No config file. No worries.
@@ -99,5 +99,29 @@ func loadConfig() (*config, error) {
 		return nil, fmt.Errorf("error loading '%s': %s", cfgPath, err)
 	}
 
+	localTree, err := toml.LoadFile(".")
+	if err != nil || localTree == nil {
+		return &config{globalTree}, nil
+	}
+	merged := merge(localTree.ToMap(), globalTree.ToMap())
+	tree, err := toml.TreeFromMap(merged)
+	if err != nil {
+		return nil, err
+	}
 	return &config{tree}, nil
 }
+
+func merge(base, overrides map[string]interface{}) map[string]interface{} {
+	for key, override := range overrides {
+		if value, ok := base[key]; ok {
+			nestedBase, baseKeyIsMap := value.(map[string]interface{})
+			nestedOverrides, overrideIsMap := override.(map[string]interface{})
+			if baseKeyIsMap && overrideIsMap {
+				base[key] = merge(nestedBase, nestedOverrides)
+			}
+		} else {
+			base[key] = override
+		}
+	}
+	return base
+}
diff --git a/cmd/ecslog/main.go b/cmd/ecslog/main.go
@@ -5,6 +5,8 @@ package main
 
 import (
 	"fmt"
+	"github.com/trentm/go-ecslog/internal/ghlink"
+	"io"
 	"os"
 	"regexp"
 
@@ -43,10 +45,12 @@ var flagColor = flags.Bool("color", false,
 	`Colorize output. Without this option, coloring will be
 done if stdout is a TTY.`)
 var flagNoColor = flags.Bool("no-color", false, "Force no coloring of output.")
-var flagColorScheme = flags.StringP("color-scheme", "c", "default",
+var flagColorScheme = flags.StringP("color-scheme", "c", "",
 	"Color scheme to use, if colorizing.") // hidden
 var flagExcludeFields = flags.StringP("exclude-fields", "x", "",
 	"Comma-separated list of fields to exclude from the output.")
+var flagIncludeFields = flags.StringP("include-fields", "i", "",
+	"Comma-separated list of fields to include in the output. Opposite of exclude-fields.")
 
 func printError(msg string) {
 	fmt.Fprintf(os.Stderr, "ecslog: error: %s\n", msg)
@@ -128,6 +132,10 @@ func main() {
 		shouldColorize = "no"
 	}
 
+	if (*flagFormatName == "experimental" || *flagFormatName == "apm") && *flagColorScheme == "" {
+		flagColorScheme = flagFormatName
+	}
+
 	formatName := "default"
 	if *flagFormatName != "" {
 		formatName = *flagFormatName
@@ -136,6 +144,9 @@ func main() {
 			formatName = cfgFormat
 		}
 	}
+	if *flagColorScheme == "" {
+		flagColorScheme = &formatName
+	}
 
 	maxLineLen := -1
 	if cfgMaxLineLen, ok := cfg.GetInt("maxLineLen"); ok {
@@ -144,19 +155,34 @@ func main() {
 
 	commaSplitter := regexp.MustCompile(`\s*,\s*`)
 	excludeFields := commaSplitter.Split(*flagExcludeFields, -1)
+	includeFields := commaSplitter.Split(*flagIncludeFields, -1)
 
 	r, err := ecslog.NewRenderer(
 		shouldColorize,
 		*flagColorScheme,
 		formatName,
 		maxLineLen,
 		excludeFields,
+		includeFields,
 	)
 	if err != nil {
 		printError(err.Error())
 		printUsage()
 		os.Exit(1)
 	}
+
+	remoteName, ok := cfg.GetString("remote_name")
+	if !ok {
+		remoteName = "elastic"
+	}
+
+	// assume that logs are piped from a process running from a directory that is a Git repo
+	// because that is a very wild assumption, if there is an error we just ignore it and move on
+	resolver, err := ghlink.NewResolver(remoteName, ".")
+	if err == nil {
+		r.LinkResolver = resolver
+	}
+
 	// TODO: warn (err?) if flagLevel is an unknown level (per levelValFromName)
 	r.SetLevelFilter(*flagLevel)
 	err = r.SetKQLFilter(*flagKQL)
@@ -167,31 +193,30 @@ func main() {
 	}
 	r.SetStrictFilter(*flagStrict)
 
+	var inputs = make(map[string]io.Reader)
 	if len(flags.Args()) == 0 {
-		f = os.Stdin
-		err = r.RenderFile(f, os.Stdout)
-		if err != nil {
-			errs = append(errs, err)
-		}
+		inputs["stdin"] = os.Stdin
 	} else {
 		for _, logPath := range flags.Args() {
 			f, err = os.Open(logPath)
 			if err != nil {
 				errs = append(errs, err)
-				continue
+			} else {
+				inputs[f.Name()] = f
 			}
-			err = r.RenderFile(f, os.Stdout)
-			if err != nil {
-				errs = append(errs, err)
-			}
-			f.Close()
+			defer f.Close()
 		}
 	}
 
-	if len(errs) > 0 {
-		for _, err = range errs {
-			printError(err.Error())
+	if len(errs) == 0 {
+		err = r.RenderFile(inputs, os.Stdout)
+		if err != nil {
+			errs = append(errs, err)
 		}
+	}
+
+	for _, err = range errs {
+		printError(err.Error())
 		os.Exit(1)
 	}
 }
diff --git a/go.mod b/go.mod
@@ -8,4 +8,5 @@ require (
 	github.com/pelletier/go-toml v1.8.1
 	github.com/spf13/pflag v1.0.5
 	github.com/valyala/fastjson v1.6.3
+	gopkg.in/src-d/go-git.v4 v4.13.1
 )
diff --git a/go.sum b/go.sum
@@ -1,16 +1,87 @@
+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
+github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
+github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
+github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY=
+github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
 github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM=
 github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
+github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/valyala/fastjson v1.6.3 h1:tAKFnnwmeMGPbwJ7IwxcTPCNr3uIzoIj3/Fh90ra4xc=
 github.com/valyala/fastjson v1.6.3/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
+github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70=
+github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
+golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg=
+gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=
+gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg=
+gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
+gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE=
+gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8=
+gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
+gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
diff --git a/internal/ansipainter/ansipainter.go b/internal/ansipainter/ansipainter.go
@@ -184,9 +184,50 @@ var DefaultPainter = New(map[string][]Attribute{
 	"fatal":         {BgRed},
 })
 
+var ExperimentalPainter = New(map[string][]Attribute{
+	"timestamp":  {Faint},
+	"selector":   {Bold},
+	"src":        {Italic},
+	"src_link":   {Italic, Underline},
+	"trace":      {Faint},
+	"debug":      {Faint},
+	"info":       {FgCyan},
+	"warn":       {FgYellow},
+	"warning":    {FgYellow},
+	"error":      {FgRed},
+	"fatal":      {FgRed},
+	"filename":   {FgMagenta},
+	"jsonString": {FgGreen},
+	"jsonNumber": {FgBlue},
+	"jsonTrue":   {FgBlue},
+	"jsonFalse":  {FgBlue},
+	"jsonNull":   {FgBlue},
+})
+
+var APMPainter = New(map[string][]Attribute{
+	"apm_beat":    {FgMagenta},
+	"apm_service": {Bold},
+	"apm_meta":    {Italic},
+	"apm_event":   {Bold},
+	"timestamp":   {Faint},
+	"trace":       {Faint},
+	"debug":       {Faint},
+	"info":        {FgCyan},
+	"warn":        {FgYellow},
+	"error":       {FgRed},
+	"fatal":       {FgRed},
+	"jsonString":  {FgGreen},
+	"jsonNumber":  {FgBlue},
+	"jsonTrue":    {FgBlue},
+	"jsonFalse":   {FgBlue},
+	"jsonNull":    {FgBlue},
+})
+
 // PainterFromName maps known painter name to an ANSIPainter.
 var PainterFromName = map[string]*ANSIPainter{
-	"bunyan":      BunyanPainter,
-	"pino-pretty": PinoPrettyPainter,
-	"default":     DefaultPainter,
+	"bunyan":       BunyanPainter,
+	"pino-pretty":  PinoPrettyPainter,
+	"default":      DefaultPainter,
+	"experimental": ExperimentalPainter,
+	"apm":          APMPainter,
 }