Browse code

daemon/logger: remove // import comments

These comments were added to enforce using the correct import path for
our packages ("github.com/docker/docker", not "github.com/moby/moby").
However, when working in go module mode (not GOPATH / vendor), they have
no effect, so their impact is limited.

Remove these imports in preparation of migrating our code to become an
actual go module.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2025/05/30 19:32:03
Showing 61 changed files
... ...
@@ -1,4 +1,4 @@
1
-package logger // import "github.com/docker/docker/daemon/logger"
1
+package logger
2 2
 
3 3
 import (
4 4
 	"context"
... ...
@@ -1,4 +1,4 @@
1
-package logger // import "github.com/docker/docker/daemon/logger"
1
+package logger
2 2
 
3 3
 import (
4 4
 	"context"
... ...
@@ -1,5 +1,5 @@
1 1
 // Package awslogs provides the logdriver for forwarding container logs to Amazon CloudWatch Logs
2
-package awslogs // import "github.com/docker/docker/daemon/logger/awslogs"
2
+package awslogs
3 3
 
4 4
 import (
5 5
 	"context"
... ...
@@ -1,4 +1,4 @@
1
-package awslogs // import "github.com/docker/docker/daemon/logger/awslogs"
1
+package awslogs
2 2
 
3 3
 import (
4 4
 	"context"
... ...
@@ -1,4 +1,4 @@
1
-package awslogs // import "github.com/docker/docker/daemon/logger/awslogs"
1
+package awslogs
2 2
 
3 3
 import (
4 4
 	"context"
... ...
@@ -1,4 +1,4 @@
1
-package logger // import "github.com/docker/docker/daemon/logger"
1
+package logger
2 2
 
3 3
 import (
4 4
 	"bytes"
... ...
@@ -1,4 +1,4 @@
1
-package logger // import "github.com/docker/docker/daemon/logger"
1
+package logger
2 2
 
3 3
 import (
4 4
 	"bytes"
... ...
@@ -10,7 +10,7 @@
10 10
 //
11 11
 // Each container log message generates an ETW event that also contains:
12 12
 // the container name and ID, the timestamp, and the stream type.
13
-package etwlogs // import "github.com/docker/docker/daemon/logger/etwlogs"
13
+package etwlogs
14 14
 
15 15
 import (
16 16
 	"context"
... ...
@@ -1,4 +1,4 @@
1
-package logger // import "github.com/docker/docker/daemon/logger"
1
+package logger
2 2
 
3 3
 import (
4 4
 	"fmt"
... ...
@@ -1,6 +1,6 @@
1 1
 // Package fluentd provides the log driver for forwarding server logs
2 2
 // to fluentd endpoints.
3
-package fluentd // import "github.com/docker/docker/daemon/logger/fluentd"
3
+package fluentd
4 4
 
5 5
 import (
6 6
 	"context"
... ...
@@ -1,4 +1,5 @@
1
-package fluentd // import "github.com/docker/docker/daemon/logger/fluentd"
1
+package fluentd
2
+
2 3
 import (
3 4
 	"context"
4 5
 	"net"
... ...
@@ -1,4 +1,4 @@
1
-package gcplogs // import "github.com/docker/docker/daemon/logger/gcplogs"
1
+package gcplogs
2 2
 
3 3
 import (
4 4
 	"context"
... ...
@@ -1,6 +1,6 @@
1 1
 // Package gelf provides the log driver for forwarding server logs to
2 2
 // endpoints that support the Graylog Extended Log Format.
3
-package gelf // import "github.com/docker/docker/daemon/logger/gelf"
3
+package gelf
4 4
 
5 5
 import (
6 6
 	"compress/flate"
... ...
@@ -1,6 +1,6 @@
1 1
 //go:build linux
2 2
 
3
-package gelf // import "github.com/docker/docker/daemon/logger/gelf"
3
+package gelf
4 4
 
5 5
 import (
6 6
 	"net"
... ...
@@ -1,3 +1,3 @@
1 1
 // Package journald provides the log driver for forwarding server logs
2 2
 // to endpoints that receive the systemd format.
3
-package journald // import "github.com/docker/docker/daemon/logger/journald"
3
+package journald
... ...
@@ -1,6 +1,6 @@
1 1
 // Package export implements a serializer for the systemd Journal Export Format
2 2
 // as documented at https://systemd.io/JOURNAL_EXPORT_FORMATS/
3
-package export // import "github.com/docker/docker/daemon/logger/journald/internal/export"
3
+package export
4 4
 
5 5
 import (
6 6
 	"encoding/binary"
... ...
@@ -7,7 +7,7 @@
7 7
 // The systemd-journal-remote command reads serialized journal entries in the
8 8
 // Journal Export Format and writes them to journal files. This format is
9 9
 // well-documented and straightforward to generate.
10
-package fake // import "github.com/docker/docker/daemon/logger/journald/internal/fake"
10
+package fake
11 11
 
12 12
 import (
13 13
 	"bytes"
... ...
@@ -1,3 +1,3 @@
1 1
 // Package sdjournal provides a Go interface to the systemd journal read API by
2 2
 // wrapping the libsystemd C library.
3
-package sdjournal // import "github.com/docker/docker/daemon/logger/journald/internal/sdjournal"
3
+package sdjournal
... ...
@@ -1,6 +1,6 @@
1 1
 //go:build linux && cgo && !static_build && journald
2 2
 
3
-package sdjournal // import "github.com/docker/docker/daemon/logger/journald/internal/sdjournal"
3
+package sdjournal
4 4
 
5 5
 // #cgo pkg-config: libsystemd
6 6
 // #include <stdlib.h>
... ...
@@ -1,6 +1,6 @@
1 1
 //go:build linux
2 2
 
3
-package journald // import "github.com/docker/docker/daemon/logger/journald"
3
+package journald
4 4
 
5 5
 import (
6 6
 	"fmt"
... ...
@@ -1,6 +1,6 @@
1 1
 //go:build linux
2 2
 
3
-package journald // import "github.com/docker/docker/daemon/logger/journald"
3
+package journald
4 4
 
5 5
 import (
6 6
 	"testing"
... ...
@@ -1,6 +1,6 @@
1 1
 //go:build linux && cgo && !static_build && journald
2 2
 
3
-package journald // import "github.com/docker/docker/daemon/logger/journald"
3
+package journald
4 4
 
5 5
 import (
6 6
 	"context"
... ...
@@ -1,6 +1,6 @@
1 1
 //go:build linux && cgo && !static_build && journald
2 2
 
3
-package journald // import "github.com/docker/docker/daemon/logger/journald"
3
+package journald
4 4
 
5 5
 import (
6 6
 	"sync"
... ...
@@ -1,7 +1,7 @@
1 1
 // Package jsonfilelog provides the default Logger implementation for
2 2
 // Docker logging. This logger logs to files on the host server in the
3 3
 // JSON format.
4
-package jsonfilelog // import "github.com/docker/docker/daemon/logger/jsonfilelog"
4
+package jsonfilelog
5 5
 
6 6
 import (
7 7
 	"bytes"
... ...
@@ -1,4 +1,4 @@
1
-package jsonfilelog // import "github.com/docker/docker/daemon/logger/jsonfilelog"
1
+package jsonfilelog
2 2
 
3 3
 import (
4 4
 	"bytes"
... ...
@@ -1,4 +1,4 @@
1
-package jsonlog // import "github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog"
1
+package jsonlog
2 2
 
3 3
 import (
4 4
 	"time"
... ...
@@ -1,4 +1,4 @@
1
-package jsonlog // import "github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog"
1
+package jsonlog
2 2
 
3 3
 import (
4 4
 	"bytes"
... ...
@@ -1,4 +1,4 @@
1
-package jsonlog // import "github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog"
1
+package jsonlog
2 2
 
3 3
 import (
4 4
 	"bytes"
... ...
@@ -1,4 +1,4 @@
1
-package jsonlog // import "github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog"
1
+package jsonlog
2 2
 
3 3
 import (
4 4
 	"time"
... ...
@@ -1,4 +1,4 @@
1
-package jsonlog // import "github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog"
1
+package jsonlog
2 2
 
3 3
 import (
4 4
 	"testing"
... ...
@@ -1,4 +1,4 @@
1
-package jsonfilelog // import "github.com/docker/docker/daemon/logger/jsonfilelog"
1
+package jsonfilelog
2 2
 
3 3
 import (
4 4
 	"context"
... ...
@@ -1,4 +1,4 @@
1
-package jsonfilelog // import "github.com/docker/docker/daemon/logger/jsonfilelog"
1
+package jsonfilelog
2 2
 
3 3
 import (
4 4
 	"bufio"
... ...
@@ -6,4 +6,4 @@
6 6
 // backwards (such as is the case when tailing a file)
7 7
 //
8 8
 // Example log message format: [22][This is a log message.][22][28][This is another log message.][28]
9
-package local // import "github.com/docker/docker/daemon/logger/local"
9
+package local
... ...
@@ -1,4 +1,4 @@
1
-package local // import "github.com/docker/docker/daemon/logger/local"
1
+package local
2 2
 
3 3
 import (
4 4
 	"encoding/binary"
... ...
@@ -5,7 +5,7 @@
5 5
 // factory, which holds the contextual instance information that
6 6
 // allows multiple loggers of the same type to perform different
7 7
 // actions, such as logging to different locations.
8
-package logger // import "github.com/docker/docker/daemon/logger"
8
+package logger
9 9
 
10 10
 import (
11 11
 	"context"
... ...
@@ -1,4 +1,4 @@
1
-package logger // import "github.com/docker/docker/daemon/logger"
1
+package logger
2 2
 
3 3
 import (
4 4
 	"github.com/docker/docker/api/types/backend"
... ...
@@ -1,4 +1,4 @@
1
-package loggertest // import "github.com/docker/docker/daemon/logger/loggertest"
1
+package loggertest
2 2
 
3 3
 import (
4 4
 	"context"
... ...
@@ -1,4 +1,4 @@
1
-package cache // import "github.com/docker/docker/daemon/logger/loggerutils/cache"
1
+package cache
2 2
 
3 3
 import (
4 4
 	"context"
... ...
@@ -1,4 +1,4 @@
1
-package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils"
1
+package loggerutils
2 2
 
3 3
 import (
4 4
 	"context"
... ...
@@ -1,4 +1,4 @@
1
-package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils"
1
+package loggerutils
2 2
 
3 3
 import (
4 4
 	"bytes"
... ...
@@ -1,4 +1,4 @@
1
-package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils"
1
+package loggerutils
2 2
 
3 3
 import (
4 4
 	"testing"
... ...
@@ -1,7 +1,7 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2 2
 //go:build go1.23
3 3
 
4
-package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils"
4
+package loggerutils
5 5
 
6 6
 import (
7 7
 	"compress/gzip"
... ...
@@ -1,6 +1,6 @@
1 1
 //go:build race
2 2
 
3
-package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils"
3
+package loggerutils
4 4
 
5 5
 import (
6 6
 	"context"
... ...
@@ -1,4 +1,4 @@
1
-package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils"
1
+package loggerutils
2 2
 
3 3
 import (
4 4
 	"bufio"
... ...
@@ -1,4 +1,4 @@
1
-package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils"
1
+package loggerutils
2 2
 
3 3
 import (
4 4
 	"io"
... ...
@@ -1,4 +1,4 @@
1
-package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils"
1
+package loggerutils
2 2
 
3 3
 import (
4 4
 	"io"
... ...
@@ -1,4 +1,4 @@
1
-package logger // import "github.com/docker/docker/daemon/logger"
1
+package logger
2 2
 
3 3
 import (
4 4
 	"fmt"
... ...
@@ -1,4 +1,4 @@
1
-package logger // import "github.com/docker/docker/daemon/logger"
1
+package logger
2 2
 
3 3
 import (
4 4
 	gometrics "github.com/docker/go-metrics"
... ...
@@ -1,4 +1,4 @@
1
-package logger // import "github.com/docker/docker/daemon/logger"
1
+package logger
2 2
 
3 3
 import (
4 4
 	"fmt"
... ...
@@ -1,6 +1,6 @@
1 1
 //go:build linux || freebsd
2 2
 
3
-package logger // import "github.com/docker/docker/daemon/logger"
3
+package logger
4 4
 
5 5
 import (
6 6
 	"context"
... ...
@@ -1,6 +1,6 @@
1 1
 //go:build !linux && !freebsd
2 2
 
3
-package logger // import "github.com/docker/docker/daemon/logger"
3
+package logger
4 4
 
5 5
 import (
6 6
 	"errors"
... ...
@@ -1,4 +1,4 @@
1
-package logger // import "github.com/docker/docker/daemon/logger"
1
+package logger
2 2
 
3 3
 import (
4 4
 	"errors"
... ...
@@ -1,4 +1,4 @@
1
-package logger // import "github.com/docker/docker/daemon/logger"
1
+package logger
2 2
 
3 3
 import (
4 4
 	"context"
... ...
@@ -1,4 +1,4 @@
1
-package logger // import "github.com/docker/docker/daemon/logger"
1
+package logger
2 2
 
3 3
 import (
4 4
 	"context"
... ...
@@ -1,6 +1,6 @@
1 1
 // Package splunk provides the log driver for forwarding server logs to
2 2
 // Splunk HTTP Event Collector endpoint.
3
-package splunk // import "github.com/docker/docker/daemon/logger/splunk"
3
+package splunk
4 4
 
5 5
 import (
6 6
 	"bytes"
... ...
@@ -1,4 +1,4 @@
1
-package splunk // import "github.com/docker/docker/daemon/logger/splunk"
1
+package splunk
2 2
 
3 3
 import (
4 4
 	"compress/gzip"
... ...
@@ -1,4 +1,4 @@
1
-package splunk // import "github.com/docker/docker/daemon/logger/splunk"
1
+package splunk
2 2
 
3 3
 import (
4 4
 	"compress/gzip"
... ...
@@ -1,5 +1,5 @@
1 1
 // Package syslog provides the logdriver for forwarding server logs to syslog endpoints.
2
-package syslog // import "github.com/docker/docker/daemon/logger/syslog"
2
+package syslog
3 3
 
4 4
 import (
5 5
 	"crypto/tls"
... ...
@@ -1,4 +1,4 @@
1
-package syslog // import "github.com/docker/docker/daemon/logger/syslog"
1
+package syslog
2 2
 
3 3
 import (
4 4
 	"log"
... ...
@@ -1,4 +1,4 @@
1
-package templates // import "github.com/docker/docker/daemon/logger/templates"
1
+package templates
2 2
 
3 3
 import (
4 4
 	"bytes"
... ...
@@ -1,4 +1,4 @@
1
-package templates // import "github.com/docker/docker/daemon/logger/templates"
1
+package templates
2 2
 
3 3
 import (
4 4
 	"bytes"