various minor updates and cleanup (#37)

flashbots · Sep 25, 2024 · f76a268 · f76a268
1 parent bc5b69e
commit f76a268
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.21
+          go-version: ^1.22
         id: go
 
       - name: Check out code into the Go module directory
@@ -30,7 +30,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.21
+          go-version: ^1.22
         id: go
 
       - name: Check out code into the Go module directory
@@ -40,7 +40,7 @@ jobs:
         run: go install mvdan.cc/[email protected]
 
       - name: Install staticcheck
-        run: go install honnef.co/go/tools/cmd/staticcheck@v0.4.2
+        run: go install honnef.co/go/tools/cmd/staticcheck@2024.1.1
 
       - name: Install golangci-lint
         run: go install github.com/golangci/golangci-lint/cmd/[email protected]

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -18,37 +18,30 @@ linters:
     - nlreturn
     - noctx
     - nonamedreturns
-    - nosnakecase
     - paralleltest
     - revive
     - testpackage
     - unparam
     - varnamelen
     - wrapcheck
     - wsl
-    - deadcode
-    - varcheck
     - exhaustruct
     - depguard
+    - err113
 
     #
     # Disabled because of generics:
     #
     - contextcheck
     - rowserrcheck
     - sqlclosecheck
-    - structcheck
     - wastedassign
 
     #
     # Disabled because deprecated:
     #
-    - exhaustivestruct
-    - golint
-    - ifshort
-    - interfacer
-    - maligned
-    - scopelint
+    - execinquery
+    - exportloopref
 
 linters-settings:
   #

diff --git a/Makefile b/Makefile
@@ -47,7 +47,7 @@ lint: ## Run linters
 	go vet ./...
 	staticcheck ./...
 	golangci-lint run
-	nilaway ./...
+	# nilaway ./...
 
 .PHONY: fmt
 fmt: ## Format the code

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # go-template
 
 [![Goreport status](https://goreportcard.com/badge/github.com/flashbots/go-template)](https://goreportcard.com/report/github.com/flashbots/go-template)
-[![Test status](https://github.com/flashbots/go-template/workflows/Checks/badge.svg?branch=main)](https://github.com/flashbots/go-template/actions?query=workflow%3A%22Checks%22)
+[![Test status](https://github.com/flashbots/go-template/actions/workflows/checks.yml/badge.svg?branch=main)](https://github.com/flashbots/go-template/actions?query=workflow%3A%22Checks%22)
 
 Toolbox and building blocks for new Go projects, to get started quickly and right-footed!
 

diff --git a/cli.dockerfile b/cli.dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM golang:1.21 AS builder
+FROM golang:1.23 AS builder
 ARG VERSION
 WORKDIR /build
 ADD go.mod /build/

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/flashbots/go-template
 
-go 1.21
+go 1.22
 
 require (
 	github.com/flashbots/go-utils v0.6.1-0.20240610084140-4461ab748667

diff --git a/httpserver.dockerfile b/httpserver.dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM golang:1.21 AS builder
+FROM golang:1.23 AS builder
 ARG VERSION
 WORKDIR /build
 ADD go.mod /build/

diff --git a/metrics/README.md b/metrics/README.md
@@ -1,5 +1,12 @@
 # metrics
 
+This example metrics module uses the OpenTelemetry package.
+
+A solid alternative is [VictoriaMetrics](https://github.com/VictoriaMetrics/VictoriaMetrics), see an example
+implementation here: https://github.com/flashbots/mev-share-node/blob/main/metrics/metrics.go
+
+---
+
 Introduction:
 - https://opentelemetry.io/docs/languages/go/instrumentation/