Merge pull request #18 from snabble/activate_tracing

Activate tracing by default

Author: J-Rocke

.travis.yml

@@ -1,17 +1,20 @@
 language: go
 go:
 - 1.17.x
+before_install:
+- go install honnef.co/go/tools/cmd/staticcheck@latest
 script:
 - go vet github.com/snabble/go-logging/...
 - go test --cover github.com/snabble/go-logging/...
+- staticcheck ./...
 
 notifications:
   email: false
   slack:
-    on_success: :change
-    on_failure: :always
+    on_success: change
+    on_failure: always
     rooms:
-      secure: LNfAWkWtOCKxkcaZEoh2k3zBHpZaI0Ty+VKumDuzpU2m3NYH7AxDgrFAJLZOGdAyBvMtV2K8STSVQWTLA3lNmU5m7WVFKm17J58jle3tsk2gvYIMsGOsKFy+MSmjMm4HH1NSdkFwYrAQeSvZjEywQ5qv/geJwDvIEsuppA5JCCZ6xG1GgjcptUoiSVQn7sNgz5IHCI99RjUjeRvvPlTRqFTBd4JcQvZ46jkKGccQ10+KsH1AfQ/Ay8Ns0LJKEhsmivOgakdjpSgMjnsiWhAstLoKMI/W7kCd7fP/ff8btI+zhMby75kVdgsUTnbN15Dkr8Najf6LPQ47MfFYunKTDEZhZSdXt5C0N9DwD8BpOlnzeYlmyQ3gphoF5R2a279QNIMAaOO6DUAJpcFGvsiRkjz7VRlBzZFXHNr4Sk1D+JHzISHEM1llW/m01jeEtA6TFx0raaX95To0ygl4if+WmjmfJFDrlVJUhAVxRG7ERGG1KvBzrM43Gv4L3QQr8i5Anlntbba4DfSvP5KWQAdX3JWo7feQEktH/waZ4OzKbPqGQZ5jxBhG35Sz/2o/6nUebUlaDJjMahUrddpPGcp1xlKhF5QMTK/o9kYOEy+AmYsTthAMziq41BGwTqqgqUwaLDdUOrmC3cEZWOt5spwJjzOu7FQqlu9qXXjayzsPEbg=
+      - secure: LNfAWkWtOCKxkcaZEoh2k3zBHpZaI0Ty+VKumDuzpU2m3NYH7AxDgrFAJLZOGdAyBvMtV2K8STSVQWTLA3lNmU5m7WVFKm17J58jle3tsk2gvYIMsGOsKFy+MSmjMm4HH1NSdkFwYrAQeSvZjEywQ5qv/geJwDvIEsuppA5JCCZ6xG1GgjcptUoiSVQn7sNgz5IHCI99RjUjeRvvPlTRqFTBd4JcQvZ46jkKGccQ10+KsH1AfQ/Ay8Ns0LJKEhsmivOgakdjpSgMjnsiWhAstLoKMI/W7kCd7fP/ff8btI+zhMby75kVdgsUTnbN15Dkr8Najf6LPQ47MfFYunKTDEZhZSdXt5C0N9DwD8BpOlnzeYlmyQ3gphoF5R2a279QNIMAaOO6DUAJpcFGvsiRkjz7VRlBzZFXHNr4Sk1D+JHzISHEM1llW/m01jeEtA6TFx0raaX95To0ygl4if+WmjmfJFDrlVJUhAVxRG7ERGG1KvBzrM43Gv4L3QQr8i5Anlntbba4DfSvP5KWQAdX3JWo7feQEktH/waZ4OzKbPqGQZ5jxBhG35Sz/2o/6nUebUlaDJjMahUrddpPGcp1xlKhF5QMTK/o9kYOEy+AmYsTthAMziq41BGwTqqgqUwaLDdUOrmC3cEZWOt5spwJjzOu7FQqlu9qXXjayzsPEbg=
 env:
   global:
   - GOPRIVATE="github.com/snabble/*"

helper.go

@@ -22,7 +22,10 @@ func init() {
 	_ = Set("info", false)
 }
 
-var DefaultLogConfig = LogConfig{EnableTraces: false, EnableTextLogging: false}
+var DefaultLogConfig = LogConfig{
+	EnableTraces:      true,
+	EnableTextLogging: false,
+}
 
 type LogConfig struct {
 	EnableTraces      bool
@@ -31,7 +34,7 @@ type LogConfig struct {
 
 // Set creates a new Logger with the matching specification
 func Set(level string, textLogging bool) error {
-	config := &LogConfig{EnableTraces: false, EnableTextLogging: textLogging}
+	config := &LogConfig{EnableTraces: true, EnableTextLogging: textLogging}
 	return SetWithConfig(level, config)
 }
 
@@ -297,7 +300,7 @@ func logApplicationLifecycleEvent(appName string, eventName string, err error) {
 	}
 }
 
-// ServerClosed logs the clos of an server
+// ServerClosed logs the closing of an server
 func ServerClosed(appName string) {
 	fields := logrus.Fields{
 		"type":  "application",

logstash_formatter.go

@@ -79,8 +79,10 @@ func (f *LogstashFormatter) FormatWithPrefix(entry *logrus.Entry, prefix string)
 	}
 
 	spanContext := trace.SpanContextFromContext(entry.Context)
-	fields["trace"] = spanContext.TraceID()
-	fields["span"] = spanContext.SpanID()
+	if spanContext.IsValid() {
+		fields["trace"] = spanContext.TraceID()
+		fields["span"] = spanContext.SpanID()
+	}
 
 	serialized, err := json.Marshal(fields)
 	if err != nil {