Fixed errors by golangci-lint, and bump up passenger (#31)

.devcontainer/devcontainer.json

@@ -29,7 +29,7 @@
 	// Uncomment the next line if you want to keep your containers running after VS Code shuts down.
 	// "shutdownAction": "none",
 	// Uncomment the next line to run commands after the container is created - for example installing curl.
-	"postCreateCommand": "cd /tmp && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.45.2",
+	"postCreateCommand": "cd /tmp && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.46.1",
 	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
 	// "remoteUser": "vscode"
 }

.devcontainer/docker-compose.yml

@@ -44,7 +44,7 @@ services:
     depends_on:
       - passenger-app
   passenger-app:
-    image: ghcr.io/rakutentech/passenger-go-exporter/passenger-app:6.0.10
+    image: ghcr.io/rakutentech/passenger-go-exporter/passenger-app:6.0.14
     ports:
       - 3000:3000
     environment:

.github/workflows/e2e.yaml

@@ -13,9 +13,9 @@ jobs:
     strategy:
       matrix:
         passenger-version:
-          - 6.0.8
-          - 6.0.9
-          - 6.0.10
+          - 6.0.12
+          - 6.0.13
+          - 6.0.14
     steps:
     - uses: actions/checkout@v2
     - uses: engineerd/[email protected]

go.mod

@@ -3,7 +3,6 @@ module github.com/rakutentech/passenger-go-exporter
 go 1.18
 
 require (
-	github.com/go-kit/kit v0.12.0
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/prometheus/client_golang v1.12.1
 	github.com/prometheus/common v0.34.0
@@ -13,11 +12,12 @@ require (
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )
 
+require github.com/go-kit/log v0.2.0
+
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-kit/log v0.2.0 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect

go.sum

@@ -63,8 +63,6 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4=
-github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw=
 github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=

logging/logger.go

@@ -5,7 +5,7 @@
 package logging
 
 import (
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/common/promlog"
 )
 

logging/logger_test.go

@@ -7,7 +7,7 @@ package logging
 import (
 	"testing"
 
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/stretchr/testify/assert"
 )
 

main.go

@@ -10,7 +10,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/rakutentech/passenger-go-exporter/logging"

metric/collector.go

@@ -7,8 +7,8 @@ package metric
 import (
 	"strings"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/rakutentech/passenger-go-exporter/logging"
 	"github.com/rakutentech/passenger-go-exporter/passenger"

test/kubernetes/example/kustomization.yaml

@@ -3,7 +3,7 @@ bases:
 images:
   - name: example
     newName: ghcr.io/rakutentech/passenger-go-exporter/passenger-app
-    newTag: 6.0.13
+    newTag: 6.0.14
   - name: passenger-exporter
     newName: ghcr.io/rakutentech/passenger-go-exporter 
     newTag: v1.2.3