fix lints

Author: cpanato

.golangci.yml

@@ -1,7 +1,6 @@
 linters:
   enable:
   - asciicheck
-  - deadcode
   - depguard
   - errcheck
   - errorlint
@@ -17,6 +16,7 @@ linters:
   - tparallel
   - unconvert
   - unparam
+  - unused
   - whitespace
 output:
   uniq-by-line: false

go.mod

@@ -3,7 +3,7 @@ module github.com/cpanato/github_actions_exporter
 go 1.19
 
 require (
-	github.com/go-kit/kit v0.12.0
+	github.com/go-kit/log v0.2.0
 	github.com/google/go-github/v47 v47.1.0
 	github.com/prometheus/client_golang v1.13.0
 	github.com/prometheus/common v0.37.0
@@ -18,7 +18,6 @@ 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/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect

go.sum

@@ -65,8 +65,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=

internal/server/billing_metrics_exporter.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 	"time"
 
-	"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/google/go-github/v47/github"
 	"golang.org/x/oauth2"
 )

internal/server/server.go

@@ -7,9 +7,10 @@ import (
 	"net"
 	"net/http"
 	"strings"
+	"time"
 
-	"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/promhttp"
 	"github.com/prometheus/common/version"
 )
@@ -39,7 +40,8 @@ func NewServer(logger log.Logger, opts Opts) *Server {
 	mux := http.NewServeMux()
 
 	httpServer := &http.Server{
-		Handler: mux,
+		Handler:           mux,
+		ReadHeaderTimeout: 10 * time.Second,
 	}
 
 	billingExporter := NewBillingMetricsExporter(logger, opts)

internal/server/server_test.go

@@ -2,14 +2,14 @@ package server_test
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"testing"
 	"time"
 
 	"github.com/cpanato/github_actions_exporter/internal/server"
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/google/go-github/v47/github"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -42,7 +42,7 @@ func Test_Server_MetricsRouteWithNoMetrics(t *testing.T) {
 
 	assert.Equal(t, 200, res.StatusCode)
 
-	payload, err := ioutil.ReadAll(res.Body)
+	payload, err := io.ReadAll(res.Body)
 	require.NoError(t, err)
 	assert.NotNil(t, payload)
 }
@@ -105,7 +105,7 @@ func Test_Server_MetricsRouteAfterWorkflowJob(t *testing.T) {
 
 	assert.Equal(t, 200, metricsRes.StatusCode)
 
-	payload, err := ioutil.ReadAll(metricsRes.Body)
+	payload, err := io.ReadAll(metricsRes.Body)
 	require.NoError(t, err)
 	assert.Contains(t, string(payload), `workflow_job_duration_seconds_bucket{org="someone",repo="some-repo",runner_group="runner-group",state="in_progress",le="10.541350399999995"} 1`)
 	assert.Contains(t, string(payload), `workflow_job_duration_seconds_total{conclusion="success",org="someone",repo="some-repo",runner_group="runner-group",status="completed"} 10`)

internal/server/workflow_metrics_exporter.go

@@ -7,14 +7,14 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"math"
 	"net/http"
 	"strings"
 
 	"github.com/cpanato/github_actions_exporter/model"
-	"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/google/go-github/v47/github"
 )
 
@@ -36,7 +36,7 @@ func NewWorkflowMetricsExporter(logger log.Logger, opts Opts) *WorkflowMetricsEx
 
 // handleGHWebHook responds to POST /gh_event, when receive a event from GitHub.
 func (c *WorkflowMetricsExporter) HandleGHWebHook(w http.ResponseWriter, r *http.Request) {
-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		_ = level.Error(c.Logger).Log("msg", "error reading body: %v", err)
 		w.WriteHeader(http.StatusInternalServerError)
@@ -63,7 +63,7 @@ func (c *WorkflowMetricsExporter) HandleGHWebHook(w http.ResponseWriter, r *http
 	eventType := r.Header.Get("X-GitHub-Event")
 	switch eventType {
 	case "ping":
-		pingEvent := model.PingEventFromJSON(ioutil.NopCloser(bytes.NewBuffer(buf)))
+		pingEvent := model.PingEventFromJSON(io.NopCloser(bytes.NewBuffer(buf)))
 		if pingEvent == nil {
 			_ = level.Info(c.Logger).Log("msg", "ping event", "hookID", pingEvent.GetHookID())
 			w.WriteHeader(http.StatusBadRequest)
@@ -73,11 +73,11 @@ func (c *WorkflowMetricsExporter) HandleGHWebHook(w http.ResponseWriter, r *http
 		_, _ = w.Write([]byte(`{"status": "honk"}`))
 		return
 	case "workflow_job":
-		event := model.WorkflowJobEventFromJSON(ioutil.NopCloser(bytes.NewBuffer(buf)))
+		event := model.WorkflowJobEventFromJSON(io.NopCloser(bytes.NewBuffer(buf)))
 		_ = level.Info(c.Logger).Log("msg", "got workflow_job event", "org", event.GetRepo().GetOwner().GetLogin(), "repo", event.GetRepo().GetName(), "runId", event.GetWorkflowJob().GetRunID(), "action", event.GetAction())
 		go c.CollectWorkflowJobEvent(event)
 	case "workflow_run":
-		event := model.WorkflowRunEventFromJSON(ioutil.NopCloser(bytes.NewBuffer(buf)))
+		event := model.WorkflowRunEventFromJSON(io.NopCloser(bytes.NewBuffer(buf)))
 		_ = level.Info(c.Logger).Log("msg", "got workflow_run event", "org", event.GetRepo().GetOwner().GetLogin(), "repo", event.GetRepo().GetName(), "workflow_name", event.GetWorkflow().GetName(), "runNumber", event.GetWorkflowRun().GetRunNumber(), "action", event.GetAction())
 		go c.CollectWorkflowRunEvent(event)
 	default:

internal/server/workflow_metrics_exporter_test.go

@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/cpanato/github_actions_exporter/internal/server"
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/google/go-github/v47/github"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -694,7 +694,7 @@ func (o *TestPrometheusObserver) assetWorkflowJobObservation(expected workflowJo
 	}
 }
 
-func (o *TestPrometheusObserver) assertWorkflowJobStatusCount(expected workflowJobStatusCount, timeout time.Duration) {
+func (o *TestPrometheusObserver) assertWorkflowJobStatusCount(expected workflowJobStatusCount, timeout time.Duration) { //nolint: unparam
 	select {
 	case <-time.After(timeout):
 		o.t.Fatal("expected observation but none occurred")

main.go

@@ -9,7 +9,7 @@ import (
 	"syscall"
 
 	"github.com/cpanato/github_actions_exporter/internal/server"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/promlog"
 	"github.com/prometheus/common/promlog/flag"
@@ -81,7 +81,7 @@ func main() {
 
 func validateFlags(token string) error {
 	if token == "" {
-		return errors.New("Please configure the GitHub Webhook Token")
+		return errors.New("please configure the GitHub Webhook Token")
 	}
 	return nil
 }