New logger for the Traefik logs

integration/access_log_test.go

@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/go-check/check"
+	"github.com/rs/zerolog/log"
 	"github.com/traefik/traefik/v2/integration/try"
-	"github.com/traefik/traefik/v2/pkg/log"
 	"github.com/traefik/traefik/v2/pkg/middlewares/accesslog"
 	checker "github.com/vdemeester/shakers"
 )
@@ -54,7 +54,7 @@ func (s *AccessLogSuite) TestAccessLog(c *check.C) {
 	defer func() {
 		traefikLog, err := os.ReadFile(traefikTestLogFile)
 		c.Assert(err, checker.IsNil)
-		log.WithoutContext().Info(string(traefikLog))
+		log.Info().Msg(string(traefikLog))
 	}()
 
 	err := cmd.Start()
@@ -262,7 +262,7 @@ func digestParts(resp *http.Response) map[string]string {
 func getMD5(data string) string {
 	digest := md5.New()
 	if _, err := digest.Write([]byte(data)); err != nil {
-		log.WithoutContext().Error(err)
+		log.Error().Err(err).Send()
 	}
 	return fmt.Sprintf("%x", digest.Sum(nil))
 }
@@ -270,7 +270,7 @@ func getMD5(data string) string {
 func getCnonce() string {
 	b := make([]byte, 8)
 	if _, err := io.ReadFull(rand.Reader, b); err != nil {
-		log.WithoutContext().Error(err)
+		log.Error().Err(err).Send()
 	}
 	return fmt.Sprintf("%x", b)[:16]
 }

integration/fake_dns_server.go

@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/miekg/dns"
-	"github.com/traefik/traefik/v2/pkg/log"
+	"github.com/rs/zerolog/log"
 )
 
 type handler struct {
@@ -17,14 +17,12 @@ type handler struct {
 // Simplified version of the Challenge Test Server from Boulder
 // https://github.com/letsencrypt/boulder/blob/a6597b9f120207eff192c3e4107a7e49972a0250/test/challtestsrv/dnsone.go#L40
 func (s *handler) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
-	logger := log.WithoutContext()
-
 	m := new(dns.Msg)
 	m.SetReply(r)
 	m.Compress = false
 
 	for _, q := range r.Question {
-		logger.Infof("Query -- [%s] %s", q.Name, dns.TypeToString[q.Qtype])
+		log.Info().Msgf("Query -- [%s] %s", q.Name, dns.TypeToString[q.Qtype])
 
 		switch q.Qtype {
 		case dns.TypeA:
@@ -94,7 +92,7 @@ func (s *handler) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
 	m.Ns = append(m.Ns, auth)
 
 	if err := w.WriteMsg(m); err != nil {
-		logger.Fatalf("Failed to write message %v", err)
+		log.Fatal().Err(err).Msg("Failed to write message")
 	}
 }
 
@@ -106,9 +104,9 @@ func startFakeDNSServer(traefikIP string) *dns.Server {
 	}
 
 	go func() {
-		log.WithoutContext().Infof("Start a fake DNS server.")
+		log.Info().Msg("Start a fake DNS server.")
 		if err := srv.ListenAndServe(); err != nil {
-			log.WithoutContext().Fatalf("Failed to set udp listener %v", err)
+			log.Fatal().Err(err).Msg("Failed to set udp listener")
 		}
 	}()
 

integration/fixtures/acme/acme_base.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/acme/acme_domains.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/acme/acme_multiple_resolvers.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/acme/acme_store_domains.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/acme/acme_tcp.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/consul/simple.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints.web]
   address = ":8000"

integration/fixtures/consul_catalog/connect.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/consul_catalog/connect_by_default.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/consul_catalog/connect_not_aware.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/consul_catalog/default_not_exposed.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/consul_catalog/simple.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/consul_catalog/simple_watch.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/custom_ping_termination_status_code.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
 
@@ -13,4 +14,4 @@
       requestAcceptGraceTimeout = "10s"
 
 [ping]
-    terminatingStatusCode = 204
+    terminatingStatusCode = 204

integration/fixtures/docker/minimal.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/docker/simple.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/error_pages/error.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/error_pages/simple.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/etcd/simple.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints.web]
   address = ":8000"

integration/fixtures/file/56-simple-panic.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/file/directory.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/file/simple-hosts.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/file/simple.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/grpc/config.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [serversTransport]
   rootCAs = [ """{{ .CertContent }}""" ]

integration/fixtures/grpc/config_h2c.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/grpc/config_h2c_termination.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.websecure]

integration/fixtures/grpc/config_insecure.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [serversTransport]
   insecureSkipVerify = true

integration/fixtures/grpc/config_retry.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [serversTransport]
   rootCAs = [ """{{ .CertContent }}""" ]

integration/fixtures/headers/basic.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/headers/cors.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/headers/secure.toml

@@ -7,6 +7,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/headers/secure_multiple.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/healthcheck/multiple-entrypoints.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.http1]

integration/fixtures/healthcheck/multiple-routers-one-same-service.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web1]

integration/fixtures/healthcheck/port_overload.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/healthcheck/propagate.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/healthcheck/propagate_no_healthcheck.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/healthcheck/reload_with_healthcheck.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/healthcheck/reload_without_healthcheck.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/healthcheck/simple.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/http/simple.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/https/clientca/https_1ca1config.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.websecure]

integration/fixtures/https/clientca/https_2ca1config.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.websecure]
@@ -49,4 +50,4 @@
 
 [tls.options]
   [tls.options.default.clientAuth]
-    caFiles = ["fixtures/https/clientca/ca1and2.crt"]
+    caFiles = ["fixtures/https/clientca/ca1and2.crt"]

integration/fixtures/https/clientca/https_2ca2config.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.websecure]

integration/fixtures/https/dynamic_https_sni.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.websecure]

integration/fixtures/https/dynamic_https_sni_default_cert.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.websecure]

integration/fixtures/https/https_domain_fronting.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints.websecure]
   address = ":4443"

integration/fixtures/https/https_redirect.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/https/https_sni.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.websecure]

integration/fixtures/https/https_sni_case_insensitive_dynamic.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.websecure]

integration/fixtures/https/https_sni_default_cert.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.websecure]

integration/fixtures/https/https_sni_strict.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.websecure]

integration/fixtures/https/https_tls_options.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.websecure]

integration/fixtures/https/rootcas/https.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [serversTransport]
   # Use certificate in net/internal/testcert.go

integration/fixtures/https/rootcas/https_with_file.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [serversTransport]
   # Use certificate in net/internal/testcert.go

integration/fixtures/k8s_crd.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [api]
 

integration/fixtures/k8s_crd_label_selector.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [api]
 

integration/fixtures/k8s_default.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [api]
   insecure = true

integration/fixtures/k8s_gateway.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [api]
   insecure = true

integration/fixtures/k8s_ingress_label_selector.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [api]
   insecure = true

integration/fixtures/k8s_ingressclass.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [api]
   insecure = true

integration/fixtures/marathon/simple.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/mirror.toml

@@ -7,6 +7,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
 

integration/fixtures/multiple_provider.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/multiprovider.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [api]
   insecure = true

integration/fixtures/proxy-protocol/with.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/proxy-protocol/without.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/ratelimit/simple.toml

@@ -7,6 +7,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/redis/simple.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints.web]
   address = ":8000"

integration/fixtures/reqacceptgrace.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
 

integration/fixtures/rest/simple.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/rest/simple_secure.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/retry/backoff.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/router_errors.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.websecure]

integration/fixtures/service_errors.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.websecure]
@@ -34,4 +35,4 @@
   [http.services.service2]
     [http.services.service2.loadBalancer]
       [[http.services.service2.loadBalancer.servers]]
-        url = "http://127.0.0.1:9010"
+        url = "http://127.0.0.1:9010"

integration/fixtures/simple_auth.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/simple_contenttype.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]
@@ -58,4 +59,4 @@
 autoDetect=true
 
 [http.middlewares.noautodetect.contentType]
-autoDetect=false
+autoDetect=false

integration/fixtures/simple_stats.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/simple_web.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/tcp/catch-all-no-tls-with-https.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.tcp]

integration/fixtures/tcp/catch-all-no-tls.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.tcp]

integration/fixtures/tcp/mixed.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.tcp]

integration/fixtures/tcp/multi-tls-options.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.tcp]

integration/fixtures/tcp/non-tls-fallback.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.tcp]

integration/fixtures/tcp/non-tls.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.tcp]

integration/fixtures/tcp/service_errors.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.websecure]

integration/fixtures/tcp/wrr.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.tcp]

integration/fixtures/throttling/simple.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/timeout/forwarding_timeouts.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [serversTransport.forwardingTimeouts]
   dialTimeout = "300ms"

integration/fixtures/timeout/keepalive.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [serversTransport.forwardingTimeouts]
   idleConnTimeout = "{{ .IdleConnTimeout }}"

integration/fixtures/tracing/simple-jaeger-collector.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [api]
   insecure = true

integration/fixtures/tracing/simple-jaeger.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [api]
   insecure = true

integration/fixtures/tracing/simple-zipkin.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [api]
   insecure = true

integration/fixtures/udp/service_errors.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.websecure]

integration/fixtures/udp/wrr.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.udp]

integration/fixtures/websocket/config.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
   [entryPoints.web]

integration/fixtures/websocket/config_https.toml

@@ -4,6 +4,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [serversTransport]
   insecureSkipVerify=true

integration/fixtures/wrr.toml

@@ -7,6 +7,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]
 

integration/fixtures/wrr_sticky.toml

@@ -7,6 +7,7 @@
 
 [log]
   level = "DEBUG"
+  noColor = true
 
 [entryPoints]