Update faas-middleware and Go version to 1.21

The new version of faas-middleware adds an X-OpenFaaS-Internal
header when maximum concurrency is met due to max_inflight.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

.github/workflows/build.yaml

@@ -18,7 +18,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Make all
         run: make all
 

.github/workflows/publish.yaml

@@ -26,7 +26,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Make all
         run: make all
 

Makefile

@@ -43,10 +43,10 @@ hashgen:
 .PHONY: dist
 dist:
 	@echo "+ $@"
-	CGO_ENABLED=0 GOOS=linux go build -mod=vendor -a -ldflags $(LDFLAGS) -installsuffix cgo -o bin/fwatchdog-amd64
-	GOARM=7 GOARCH=arm CGO_ENABLED=0 GOOS=linux go build -mod=vendor -a -ldflags $(LDFLAGS) -installsuffix cgo -o bin/fwatchdog-arm
-	GOARCH=arm64 CGO_ENABLED=0 GOOS=linux go build -mod=vendor -a -ldflags $(LDFLAGS) -installsuffix cgo -o bin/fwatchdog-arm64
-	GOOS=windows CGO_ENABLED=0 go build -mod=vendor -a -ldflags $(LDFLAGS) -installsuffix cgo -o bin/fwatchdog.exe
+	CGO_ENABLED=0 GOOS=linux go build -mod=vendor -ldflags $(LDFLAGS) -o bin/fwatchdog-amd64
+	GOARM=7 GOARCH=arm CGO_ENABLED=0 GOOS=linux go build -mod=vendor -ldflags $(LDFLAGS) -o bin/fwatchdog-arm
+	GOARCH=arm64 CGO_ENABLED=0 GOOS=linux go build -mod=vendor -ldflags $(LDFLAGS) -o bin/fwatchdog-arm64
+	GOOS=windows CGO_ENABLED=0 go build -mod=vendor -ldflags $(LDFLAGS) -o bin/fwatchdog.exe
 
 # use this with
 # `./ci/copy_redist.sh $(make print-image) && ./ci/hashgen.sh`

go.mod

@@ -1,11 +1,18 @@
 module github.com/openfaas/of-watchdog
 
-go 1.19
+go 1.20
 
 require (
 	github.com/docker/go-units v0.5.0
-	github.com/openfaas/faas-middleware v1.2.2
-	github.com/prometheus/client_golang v1.15.1
+	github.com/openfaas/faas-middleware v1.2.3
+	github.com/prometheus/client_golang v1.17.0
+)
+
+require (
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.45.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
 )
 
 require (
@@ -14,9 +21,6 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 )