chore: Coroot rebase and Security Fixes

.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: Continuous Integration
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  GO:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+      - run: sudo apt install -y libsystemd-dev
+      - name: gofmt -l .
+        run: files=$(gofmt -l .); if [[ -n "$files" ]]; then echo "$files"; exit 1; fi
+      - name: goimports -l .
+        run: |
+          go install golang.org/x/tools/cmd/goimports@latest
+          files=$(goimports -l .); if [[ -n "$files" ]]; then echo "$files"; exit 1; fi
+      - run: go vet ./...
+      - run: go test ./...
+      - run: go build -mod=readonly .

.github/workflows/docker-publish.yml → .github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Docker Image
+name: Release
 
 on:
   release:
@@ -16,35 +16,27 @@ jobs:
       packages: write
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
 
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v1
+      - uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract Docker metadata
+      - uses: docker/metadata-action@v5
         id: meta
-        uses: docker/metadata-action@v3
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64,linux/arm64

CONTRIBUTING.md

@@ -0,0 +1,36 @@
+# Contributing
+
+Thank you for your interest in contributing to Coroot!
+Below are some basic guidelines.
+
+
+## Requirements
+* Linux ≥v4.16 (amd64, arm64)
+* Go v1.21
+
+
+## Running
+```shell
+sudo go run main.go
+```
+
+```shell
+curl http://127.0.0.1:80/metrics
+```
+
+## Pull Request Checklist
+
+* Branch from the main branch and, if needed, rebase to the current main branch before submitting your pull request. If it doesn't merge cleanly with main you may be asked to rebase your changes.
+* Commits should be as small as possible, while ensuring that each commit is correct independently (i.e., each commit should compile and pass tests).
+* Add tests relevant to the fixed bug or new feature.
+* Use `make lint` to run linters and ensure formatting is correct.
+* Run the unit tests suite `make test`.
+
+
+## eBPF
+
+If you are changing eBPF code, you need to generate the `ebpftracer/ebpf.go` file:
+```shell
+cd ebpftracer
+make build
+```

Dockerfile

@@ -1,15 +1,14 @@
-FROM golang:1.19-bullseye AS builder
+FROM golang:1.21-bullseye AS builder
 RUN apt update && apt install -y libsystemd-dev
-COPY go.mod /tmp/src/
-COPY go.sum /tmp/src/
-WORKDIR /tmp/src/
+WORKDIR /tmp/src
+COPY go.mod .
+COPY go.sum .
 RUN go mod download
-COPY . /tmp/src/
-RUN CGO_ENABLED=1 go test ./...
+COPY . .
 ARG VERSION=unknown
-RUN CGO_ENABLED=1 go install -mod=readonly -ldflags "-X main.version=$VERSION" /tmp/src
+RUN CGO_ENABLED=1 go build -mod=readonly -ldflags "-X main.version=$VERSION" -o coroot-node-agent .
 
-FROM debian:bullseye
+FROM debian:bullseye-slim
 RUN apt update && apt install -y ca-certificates && apt clean
-COPY --from=builder /go/bin/coroot-node-agent /usr/bin/coroot-node-agent
+COPY --from=builder /tmp/src/coroot-node-agent /usr/bin/coroot-node-agent
 ENTRYPOINT ["coroot-node-agent"]

Dockerfile.alpine

@@ -0,0 +1,32 @@
+FROM --platform=linux/amd64 golang:1.22-alpine as build-stage
+
+# Set destination for COPY
+WORKDIR /app
+RUN apk add --no-cache --update go gcc g++ bash git
+RUN echo "unicode=\"YES\"" >> /etc/rc.conf && \
+    apk add --no-cache --virtual .build_deps \
+        autoconf file libc-dev make pkgconf python3 py3-pip ninja \
+        util-linux pciutils usbutils coreutils binutils findutils grep \
+        build-base abuild binutils binutils-doc gcc-doc gperf libcap libcap-dev \
+        valgrind-dev libmount && pip3 install meson --break-system-packages
+
+RUN cd /tmp && git clone https://github.com/systemd/systemd
+
+# RUN cd /tmp/systemd && \
+#     meson build && \
+#     ninja build
+
+RUN apk add elogind-dev
+
+# Download Go modules
+COPY go.mod go.sum ./
+RUN go mod download
+COPY ./ ./
+ARG VERSION=unknown
+RUN CGO_ENABLED=1 go build -mod=readonly -ldflags "-X main.version=$VERSION" -o coroot-node-agent .
+
+FROM --platform=linux/amd64 alpine:3.19 AS release-stage
+WORKDIR /app
+COPY --from=build-stage /app/coroot-node-agent /app/coroot-node-agent
+RUN chmod +x /app/coroot-node-agent
+CMD ["/app/coroot-node-agent"]

Makefile

@@ -0,0 +1,29 @@
+.PHONY: all
+all: lint test
+
+.PHONY: test
+test: go-test
+
+.PHONY: lint
+lint: go-mod go-vet go-fmt go-imports
+
+.PHONY: go-mod
+go-mod:
+	go mod tidy
+
+.PHONY: go-vet
+go-vet:
+	go vet ./...
+
+.PHONY: go-fmt
+go-fmt:
+	gofmt -w .
+
+.PHONY: go-imports
+go-imports:
+	go install golang.org/x/tools/cmd/goimports@latest
+	goimports -w .
+
+.PHONY: go-test
+go-test:
+	go test ./...

README.md

@@ -94,6 +94,9 @@ The best way to turn metrics to answers about app issues is to use [Coroot](http
 
 A live demo of Coroot is available at [community-demo.coroot.com](https://community-demo.coroot.com)
 
+## Contributing
+To start contributing, check out our [Contributing Guide](https://github.com/coroot/coroot-node-agent/blob/main/CONTRIBUTING.md).
+
 ## License
 
 Coroot-node-agent is licensed under the [Apache License, Version 2.0](https://github.com/coroot/coroot-node-agent/blob/main/LICENSE).

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/api.go

@@ -0,0 +1,13 @@
+package common
+
+import (
+	"github.com/coroot/coroot-node-agent/flags"
+)
+
+func AuthHeaders() map[string]string {
+	res := map[string]string{}
+	if apiKey := *flags.ApiKey; apiKey != "" {
+		res["X-Api-Key"] = apiKey
+	}
+	return res
+}

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) {