goimports: imports reformatting

cgroup/cgroup.go

@@ -2,14 +2,15 @@ package cgroup
 
 import (
 	"fmt"
-	"github.com/coroot/coroot-node-agent/common"
-	"github.com/coroot/coroot-node-agent/flags"
-	"k8s.io/klog/v2"
 	"os"
 	"path"
 	"regexp"
 	"strings"
 	"time"
+
+	"github.com/coroot/coroot-node-agent/common"
+	"github.com/coroot/coroot-node-agent/flags"
+	"k8s.io/klog/v2"
 )
 
 var (

cgroup/cgroup_linux.go

@@ -1,9 +1,10 @@
 package cgroup
 
 import (
+	"runtime"
+
 	"github.com/vishvananda/netns"
 	"golang.org/x/sys/unix"
-	"runtime"
 )
 
 func Init() error {

cgroup/cgroup_test.go

@@ -1,9 +1,10 @@
 package cgroup
 
 import (
-	"github.com/stretchr/testify/assert"
 	"path"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNewFromProcessCgroupFile(t *testing.T) {

cgroup/cpu_test.go

@@ -1,9 +1,10 @@
 package cgroup
 
 import (
-	"github.com/stretchr/testify/assert"
 	"path"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCgroup_CpuStat(t *testing.T) {

cgroup/io.go

@@ -2,10 +2,11 @@ package cgroup
 
 import (
 	"io/ioutil"
-	"k8s.io/klog/v2"
 	"path"
 	"strconv"
 	"strings"
+
+	"k8s.io/klog/v2"
 )
 
 type IOStat struct {

cgroup/io_test.go

@@ -1,9 +1,10 @@
 package cgroup
 
 import (
-	"github.com/stretchr/testify/assert"
 	"path"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCgroup_IOStat(t *testing.T) {

cgroup/memory_test.go

@@ -1,9 +1,10 @@
 package cgroup
 
 import (
-	"github.com/stretchr/testify/assert"
 	"path"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCgroup_MemoryStat(t *testing.T) {

cgroup/utils.go

@@ -2,9 +2,10 @@ package cgroup
 
 import (
 	"io/ioutil"
-	"k8s.io/klog/v2"
 	"strconv"
 	"strings"
+
+	"k8s.io/klog/v2"
 )
 
 func readVariablesFromFile(filePath string) (map[string]uint64, error) {

common/net.go

@@ -1,11 +1,12 @@
 package common
 
 import (
+	"strconv"
+	"strings"
+
 	"github.com/coroot/coroot-node-agent/flags"
 	"inet.af/netaddr"
 	"k8s.io/klog/v2"
-	"strconv"
-	"strings"
 )
 
 var (

common/net_test.go

@@ -1,9 +1,10 @@
 package common
 
 import (
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"inet.af/netaddr"
-	"testing"
 )
 
 func TestConnectionFilter(t *testing.T) {

common/otel_test.go

@@ -1,8 +1,9 @@
 package common
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestContainerIdToServiceName(t *testing.T) {

common/volumes_test.go

@@ -1,8 +1,9 @@
 package common
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestParseKubernetesVolumeSource(t *testing.T) {

containers/cilium.go

@@ -1,6 +1,8 @@
 package containers
 
 import (
+	"path/filepath"
+
 	"github.com/cilium/cilium/pkg/bpf"
 	"github.com/cilium/cilium/pkg/defaults"
 	"github.com/cilium/cilium/pkg/loadbalancer"
@@ -11,7 +13,6 @@ import (
 	"github.com/coroot/coroot-node-agent/proc"
 	"inet.af/netaddr"
 	"k8s.io/klog/v2"
-	"path/filepath"
 )
 
 var (

containers/conntrack.go

@@ -1,12 +1,13 @@
 package containers
 
 import (
+	"syscall"
+
 	"github.com/coroot/coroot-node-agent/common"
 	"github.com/florianl/go-conntrack"
 	"github.com/vishvananda/netns"
 	"inet.af/netaddr"
 	"k8s.io/klog/v2"
-	"syscall"
 )
 
 type Conntrack struct {

containers/containerd.go

@@ -4,6 +4,9 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strings"
+	"time"
+
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/oci"
 	"github.com/containerd/containerd/pkg/cri/constants"
@@ -11,8 +14,6 @@ import (
 	"github.com/coroot/coroot-node-agent/proc"
 	"github.com/coroot/logparser"
 	"k8s.io/klog/v2"
-	"strings"
-	"time"
 )
 
 const containerdTimeout = 30 * time.Second

containers/crio.go

@@ -5,14 +5,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/coroot/coroot-node-agent/common"
-	"github.com/coroot/coroot-node-agent/proc"
-	"github.com/coroot/logparser"
-	"k8s.io/klog/v2"
 	"net"
 	"net/http"
 	"os"
 	"time"
+
+	"github.com/coroot/coroot-node-agent/common"
+	"github.com/coroot/coroot-node-agent/proc"
+	"github.com/coroot/logparser"
+	"k8s.io/klog/v2"
 )
 
 const crioTimeout = 30 * time.Second

containers/dockerd.go

@@ -3,16 +3,17 @@ package containers
 import (
 	"context"
 	"fmt"
+	"os"
+	"path"
+	"strings"
+	"time"
+
 	"github.com/coroot/coroot-node-agent/common"
 	"github.com/coroot/coroot-node-agent/proc"
 	"github.com/coroot/logparser"
 	"github.com/docker/docker/client"
 	"github.com/vishvananda/netns"
 	"inet.af/netaddr"
-	"os"
-	"path"
-	"strings"
-	"time"
 )
 
 const dockerdTimeout = 30 * time.Second

containers/journald.go

@@ -2,6 +2,7 @@ package containers
 
 import (
 	"fmt"
+
 	"github.com/coroot/coroot-node-agent/cgroup"
 	"github.com/coroot/coroot-node-agent/logs"
 	"github.com/coroot/coroot-node-agent/proc"

containers/jvm.go

@@ -3,14 +3,15 @@ package containers
 import (
 	"bytes"
 	"fmt"
+	"path/filepath"
+	"strconv"
+	"time"
+
 	"github.com/coroot/coroot-node-agent/common"
 	"github.com/coroot/coroot-node-agent/proc"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/xin053/hsperfdata"
 	"k8s.io/klog/v2"
-	"path/filepath"
-	"strconv"
-	"time"
 )
 
 func isJvm(cmdline []byte) bool {

containers/l7.go

@@ -1,11 +1,12 @@
 package containers
 
 import (
+	"time"
+
 	"github.com/coroot/coroot-node-agent/ebpftracer/l7"
 	"github.com/prometheus/client_golang/prometheus"
 	"inet.af/netaddr"
 	"k8s.io/klog/v2"
-	"time"
 )
 
 type L7Metrics struct {

containers/registry.go

@@ -3,6 +3,11 @@ package containers
 import (
 	"bytes"
 	"fmt"
+	"os"
+	"regexp"
+	"strings"
+	"time"
+
 	"github.com/coroot/coroot-node-agent/cgroup"
 	"github.com/coroot/coroot-node-agent/common"
 	"github.com/coroot/coroot-node-agent/ebpftracer"
@@ -11,10 +16,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/vishvananda/netns"
 	"k8s.io/klog/v2"
-	"os"
-	"regexp"
-	"strings"
-	"time"
 )
 
 var (

containers/taskstats.go

@@ -2,8 +2,9 @@ package containers
 
 import (
 	"fmt"
-	"github.com/mdlayher/taskstats"
 	"sync"
+
+	"github.com/mdlayher/taskstats"
 )
 
 var (

ebpftracer/init.go

@@ -1,9 +1,10 @@
 package ebpftracer
 
 import (
+	"strings"
+
 	"github.com/coroot/coroot-node-agent/proc"
 	"k8s.io/klog/v2"
-	"strings"
 )
 
 type file struct {

ebpftracer/l7/http2.go

@@ -2,12 +2,13 @@ package l7
 
 import (
 	"encoding/binary"
-	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/hpack"
 	"net/http"
 	"strconv"
 	"strings"
 	"time"
+
+	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/hpack"
 )
 
 const (

ebpftracer/l7/l7_test.go

@@ -3,9 +3,10 @@ package l7
 import (
 	"bytes"
 	"encoding/binary"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"go.mongodb.org/mongo-driver/bson"
-	"testing"
 )
 
 func TestParseHttp(t *testing.T) {

ebpftracer/l7/mongo.go

@@ -2,6 +2,7 @@ package l7
 
 import (
 	"encoding/binary"
+
 	"go.mongodb.org/mongo-driver/bson"
 )
 

ebpftracer/tls.go

@@ -7,15 +7,16 @@ import (
 	"debug/elf"
 	"errors"
 	"fmt"
+	"os"
+	"regexp"
+	"strings"
+
 	"github.com/cilium/ebpf/link"
 	"github.com/coroot/coroot-node-agent/proc"
 	"golang.org/x/arch/arm64/arm64asm"
 	"golang.org/x/arch/x86/x86asm"
 	"golang.org/x/mod/semver"
 	"k8s.io/klog/v2"
-	"os"
-	"regexp"
-	"strings"
 )
 
 const (

ebpftracer/tracer.go

@@ -5,6 +5,12 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+	"os"
+	"runtime"
+	"strconv"
+	"strings"
+	"time"
+
 	"github.com/cilium/ebpf"
 	"github.com/cilium/ebpf/link"
 	"github.com/cilium/ebpf/perf"
@@ -15,11 +21,6 @@ import (
 	"golang.org/x/sys/unix"
 	"inet.af/netaddr"
 	"k8s.io/klog/v2"
-	"os"
-	"runtime"
-	"strconv"
-	"strings"
-	"time"
 )
 
 const MaxPayloadSize = 1024

ebpftracer/tracer_test.go

@@ -5,12 +5,6 @@ package ebpftracer
 import (
 	"bytes"
 	"fmt"
-	"github.com/containerd/cgroups"
-	cgroupsV2 "github.com/containerd/cgroups/v2"
-	"github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/sys/unix"
 	"net"
 	"os"
 	"os/exec"
@@ -20,6 +14,13 @@ import (
 	"syscall"
 	"testing"
 	"time"
+
+	"github.com/containerd/cgroups"
+	cgroupsV2 "github.com/containerd/cgroups/v2"
+	"github.com/opencontainers/runtime-spec/specs-go"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/sys/unix"
 )
 
 func skipIfNotVM(t *testing.T) {

logs/journald_reader.go

@@ -2,12 +2,13 @@ package logs
 
 import (
 	"fmt"
-	"github.com/coreos/go-systemd/v22/sdjournal"
-	"github.com/coroot/logparser"
-	"k8s.io/klog/v2"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/coreos/go-systemd/v22/sdjournal"
+	"github.com/coroot/logparser"
+	"k8s.io/klog/v2"
 )
 
 type JournaldReader struct {

logs/otel.go

@@ -2,6 +2,9 @@ package logs
 
 import (
 	"context"
+	"os"
+	"time"
+
 	otel "github.com/agoda-com/opentelemetry-logs-go"
 	"github.com/agoda-com/opentelemetry-logs-go/exporters/otlp/otlplogs"
 	"github.com/agoda-com/opentelemetry-logs-go/exporters/otlp/otlplogs/otlplogshttp"
@@ -13,8 +16,6 @@ import (
 	"go.opentelemetry.io/otel/sdk/resource"
 	semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
 	"k8s.io/klog/v2"
-	"os"
-	"time"
 )
 
 var otelLogger otelLogs.Logger

logs/tail_reader.go

@@ -3,12 +3,13 @@ package logs
 import (
 	"bufio"
 	"context"
-	"github.com/coroot/logparser"
 	"io"
-	"k8s.io/klog/v2"
 	"os"
 	"strings"
 	"time"
+
+	"github.com/coroot/logparser"
+	"k8s.io/klog/v2"
 )
 
 var (

logs/tail_reader_test.go

@@ -1,12 +1,13 @@
 package logs
 
 import (
-	"github.com/coroot/logparser"
-	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"os"
 	"testing"
 	"time"
+
+	"github.com/coroot/logparser"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTailReader(t *testing.T) {

node/cpu_test.go

@@ -1,8 +1,9 @@
 package node
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNode_cpu(t *testing.T) {

node/disk.go

@@ -1,12 +1,13 @@
 package node
 
 import (
-	"k8s.io/klog/v2"
 	"os"
 	"path"
 	"regexp"
 	"strconv"
 	"strings"
+
+	"k8s.io/klog/v2"
 )
 
 var blockDevice = regexp.MustCompile(`^(dm-\d+|(s|h|xv|v)d[a-z]|md\d+|nvme\d+n\d+|rbd\d+)`)

node/disk_test.go

@@ -1,9 +1,10 @@
 package node
 
 import (
-	"github.com/stretchr/testify/assert"
 	"sort"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGetNodeDisks(t *testing.T) {

node/memory.go

@@ -2,10 +2,11 @@ package node
 
 import (
 	"io/ioutil"
-	"k8s.io/klog/v2"
 	"path"
 	"strconv"
 	"strings"
+
+	"k8s.io/klog/v2"
 )
 
 func memoryInfo(procRoot string) (MemoryStat, error) {

node/memory_test.go

@@ -1,8 +1,9 @@
 package node
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNode_memory(t *testing.T) {

node/metadata/aws.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"github.com/coroot/coroot-node-agent/proc"
 	"io"
-	"k8s.io/klog/v2"
 	"net"
 	"net/http"
+
+	"github.com/coroot/coroot-node-agent/proc"
+	"k8s.io/klog/v2"
 )
 
 const awsInstanceMetadataURL = "http://169.254.169.254/latest"

node/metadata/azure.go

@@ -2,8 +2,9 @@ package metadata
 
 import (
 	"encoding/json"
-	"k8s.io/klog/v2"
 	"net/http"
+
+	"k8s.io/klog/v2"
 )
 
 const (

node/metadata/digital_ocean.go

@@ -2,8 +2,9 @@ package metadata
 
 import (
 	"io"
-	"k8s.io/klog/v2"
 	"net/http"
+
+	"k8s.io/klog/v2"
 )
 
 const doInstanceMetadataURL = "http://169.254.169.254/metadata/v1/"

node/metadata/gcp.go

@@ -1,9 +1,10 @@
 package metadata
 
 import (
+	"strings"
+
 	gcp "cloud.google.com/go/compute/metadata"
 	"k8s.io/klog/v2"
-	"strings"
 )
 
 func getGcpMetadata() *CloudMetadata {

node/metadata/hetzner.go

@@ -1,9 +1,10 @@
 package metadata
 
 import (
+	"net/http"
+
 	"gopkg.in/yaml.v2"
 	"k8s.io/klog/v2"
-	"net/http"
 )
 
 const hetznerInstanceMetadataURL = "http://169.254.169.254/hetzner/v1/metadata"

node/metadata/metadata.go

@@ -2,11 +2,12 @@ package metadata
 
 import (
 	"fmt"
-	"k8s.io/klog/v2"
 	"net/http"
 	"os"
 	"strings"
 	"time"
+
+	"k8s.io/klog/v2"
 )
 
 const metadataServiceTimeout = 5 * time.Second

node/net.go

@@ -1,11 +1,12 @@
 package node
 
 import (
+	"regexp"
+
 	"github.com/coroot/coroot-node-agent/proc"
 	"github.com/vishvananda/netlink"
 	"golang.org/x/sys/unix"
 	"inet.af/netaddr"
-	"regexp"
 )
 
 var netDeviceFilterRe = regexp.MustCompile(`^(enp\d+s\d+(f\d+)?|eth\d+|eno\d+|ens\d+|em\d+|bond\d+|p\d+p\d+|enx[0-9a-f]{12})`)

node/net_test.go

@@ -1,8 +1,9 @@
 package node
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNetDeviceFilter(t *testing.T) {

node/uptime_test.go

@@ -1,8 +1,9 @@
 package node
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNode_uptime(t *testing.T) {

pinger/pinger.go

@@ -5,6 +5,12 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+	"net"
+	"os"
+	"strings"
+	"syscall"
+	"time"
+
 	"github.com/coroot/coroot-node-agent/proc"
 	"github.com/vishvananda/netns"
 	"golang.org/x/net/icmp"
@@ -12,11 +18,6 @@ import (
 	"golang.org/x/sys/unix"
 	"inet.af/netaddr"
 	"k8s.io/klog/v2"
-	"net"
-	"os"
-	"strings"
-	"syscall"
-	"time"
 )
 
 const (

proc/net.go

@@ -5,9 +5,10 @@ import (
 	"bytes"
 	"encoding/binary"
 	"encoding/hex"
-	"inet.af/netaddr"
 	"net"
 	"os"
+
+	"inet.af/netaddr"
 )
 
 const (

proc/ns.go

@@ -1,11 +1,12 @@
 package proc
 
 import (
+	"runtime"
+
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netns"
 	"golang.org/x/sys/unix"
 	"inet.af/netaddr"
-	"runtime"
 )
 
 func GetNetNs(pid uint32) (netns.NsHandle, error) {

proc/proc_test.go

@@ -1,10 +1,11 @@
 package proc
 
 import (
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"inet.af/netaddr"
-	"testing"
 )
 
 func init() {

profiling/profiling.go

@@ -3,6 +3,15 @@ package profiling
 import (
 	"bytes"
 	"fmt"
+	"hash/fnv"
+	"io"
+	"net/http"
+	"net/url"
+	"os"
+	"strconv"
+	"sync"
+	"time"
+
 	"github.com/coroot/coroot-node-agent/common"
 	"github.com/coroot/coroot-node-agent/containers"
 	"github.com/go-kit/log"
@@ -14,15 +23,7 @@ import (
 	"github.com/grafana/pyroscope/ebpf/symtab/elf"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/prometheus/model/labels"
-	"hash/fnv"
-	"io"
 	"k8s.io/klog/v2"
-	"net/http"
-	"net/url"
-	"os"
-	"strconv"
-	"sync"
-	"time"
 )
 
 const (

tracing/tracing.go

@@ -3,6 +3,9 @@ package tracing
 import (
 	"context"
 	"fmt"
+	"os"
+	"time"
+
 	"github.com/coroot/coroot-node-agent/ebpftracer/l7"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
@@ -15,8 +18,6 @@ import (
 	"go.opentelemetry.io/otel/trace"
 	"inet.af/netaddr"
 	"k8s.io/klog/v2"
-	"os"
-	"time"
 )
 
 const (