Pull request #426: ADG-11715-all-update-skel

Merge in GO/dnsproxy from ADG-11715-all-update-skel to master

Squashed commit of the following:

commit db7d0c9
Author: Maksim Kazantsev <m.kazantsev@adguard.com>
Date:   Wed Mar 18 15:43:13 2026 +0300

    all: bump makefile and dockerfile version;

commit 44b5b77
Author: Maksim Kazantsev <m.kazantsev@adguard.com>
Date:   Fri Mar 13 18:13:17 2026 +0300

    all: upd deps;

commit 4d08924
Author: Maksim Kazantsev <m.kazantsev@adguard.com>
Date:   Fri Mar 13 18:10:22 2026 +0300

    all: upd go version; upd deps; impl hooks; upd scripts; upd dockerfile, makefile;

Author: makazantsev

.github/workflows/build.yaml

@@ -1,7 +1,7 @@
 name: Build
 
 'env':
-  'GO_VERSION': '1.25.5'
+  'GO_VERSION': '1.26.1'
 
 'on':
   'push':

.github/workflows/docker.yml

@@ -1,7 +1,7 @@
 'name': Docker
 
 'env':
-  'GO_VERSION': '1.25.5'
+  'GO_VERSION': '1.26.1'
 
 'on':
   'push':

.github/workflows/lint.yaml

@@ -1,7 +1,7 @@
 'name': 'lint'
 
 'env':
-  'GO_VERSION': '1.25.5'
+  'GO_VERSION': '1.26.1'
 
 'on':
   'push':
@@ -22,11 +22,10 @@
           'go-version': '${{ env.GO_VERSION }}'
       - 'name': 'run-lint'
         'run': >
-          make go-deps go-tools go-lint
+          make go-deps go-lint
 
   'notify':
     'needs':
-      - 'go-lint'
     # Secrets are not passed to workflows that are triggered by a pull request
     # from a fork.
     #

Makefile

@@ -7,7 +7,7 @@
 # This comment is used to simplify checking local copies of the Makefile.  Bump
 # this number every time a significant change is made to this Makefile.
 #
-# AdGuard-Project-Version: 11
+# AdGuard-Project-Version: 13
 
 # Don't name these macros "GO" etc., because GNU Make apparently makes them
 # exported environment variables with the literal value of "${GO:-go}" and so
@@ -24,31 +24,31 @@ GOAMD64 = v1
 GOPROXY = https://proxy.golang.org|direct
 GOTELEMETRY = off
 OUT = dnsproxy
-GOTOOLCHAIN = go1.25.5
+GOTOOLCHAIN = go1.26.1
 RACE = 0
 REVISION = $${REVISION:-$$(git rev-parse --short HEAD)}
 VERSION = 0
 
-ENV = env\
-	BRANCH="$(BRANCH)"\
-	DIST_DIR='$(DIST_DIR)'\
-	GO="$(GO.MACRO)"\
-	GOAMD64='$(GOAMD64)'\
-	GOPROXY='$(GOPROXY)'\
-	GOTELEMETRY='$(GOTELEMETRY)'\
-	OUT='$(OUT)'\
-	GOTOOLCHAIN='$(GOTOOLCHAIN)'\
-	PATH="$${PWD}/bin:$$("$(GO.MACRO)" env GOPATH)/bin:$${PATH}"\
-	RACE='$(RACE)'\
-	REVISION="$(REVISION)"\
-	VERBOSE="$(VERBOSE.MACRO)"\
-	VERSION="$(VERSION)"\
+ENV = env \
+	BRANCH="$(BRANCH)" \
+	DIST_DIR='$(DIST_DIR)' \
+	GO="$(GO.MACRO)" \
+	GOAMD64='$(GOAMD64)' \
+	GOPROXY='$(GOPROXY)' \
+	GOTELEMETRY='$(GOTELEMETRY)' \
+	OUT='$(OUT)' \
+	GOTOOLCHAIN='$(GOTOOLCHAIN)' \
+	PATH="$${PWD}/bin:$$("$(GO.MACRO)" env GOPATH)/bin:$${PATH}" \
+	RACE='$(RACE)' \
+	REVISION="$(REVISION)" \
+	VERBOSE="$(VERBOSE.MACRO)" \
+	VERSION="$(VERSION)" \
 
 # Keep the line above blank.
 
-ENV_MISC = env\
-	PATH="$${PWD}/bin:$$("$(GO.MACRO)" env GOPATH)/bin:$${PATH}"\
-	VERBOSE="$(VERBOSE.MACRO)"\
+ENV_MISC = env \
+	PATH="$${PWD}/bin:$$("$(GO.MACRO)" env GOPATH)/bin:$${PATH}" \
+	VERBOSE="$(VERBOSE.MACRO)" \
 
 # Keep the line above blank.
 
@@ -62,17 +62,16 @@ init: ; git config core.hooksPath ./scripts/hooks
 .PHONY: test
 test: go-test
 
-.PHONY: go-build go-deps go-env go-lint go-test go-tools go-upd-tools
+.PHONY: go-build go-deps go-env go-lint go-test go-upd-tools
 go-build:     ; $(ENV)          "$(SHELL)" ./scripts/make/go-build.sh
 go-deps:      ; $(ENV)          "$(SHELL)" ./scripts/make/go-deps.sh
 go-env:       ; $(ENV)          "$(GO.MACRO)" env
 go-lint:      ; $(ENV)          "$(SHELL)" ./scripts/make/go-lint.sh
 go-test:      ; $(ENV) RACE='1' "$(SHELL)" ./scripts/make/go-test.sh
-go-tools:     ; $(ENV)          "$(SHELL)" ./scripts/make/go-tools.sh
 go-upd-tools: ; $(ENV)          "$(SHELL)" ./scripts/make/go-upd-tools.sh
 
 .PHONY: go-check
-go-check: go-tools go-lint go-test
+go-check: go-lint go-test
 
 # A quick check to make sure that all operating systems relevant to the
 # development of the project can be typechecked and built successfully.

README.md

@@ -37,7 +37,7 @@ There are several options how to install `dnsproxy`.
 
 ## How to build
 
-You will need Go 1.25 or later.
+You will need Go 1.26 or later.
 
 ```shell
 make build

bamboo-specs/bamboo.yaml

@@ -13,7 +13,7 @@
     # exact patch version as opposed to a minor one to make sure that this exact
     # version is actually used and not whatever the docker daemon on the CI has
     # cached a few months ago.
-    'dockerGo': 'adguard/go-builder:1.25.5--1'
+    'dockerGo': 'adguard/go-builder:1.26.1--1'
     'maintainer': 'Adguard Go Team'
     'name': 'dnsproxy'
 

docker/ci.Dockerfile

@@ -3,7 +3,7 @@
 # This comment is used to simplify checking local copies of the Dockerfile.
 # Bump this number every time a significant change is made to this Dockerfile.
 #
-# AdGuard-Project-Version: 10
+# AdGuard-Project-Version: 11
 
 # Dockerfile guidelines:
 #
@@ -28,7 +28,7 @@
 #    needed.  Keep it in sync with bamboo-specs/bamboo.yaml.
 
 # NOTE:  Keep in sync with bamboo-specs/bamboo.yaml.
-ARG BASE_IMAGE=adguard/go-builder:1.25.5--1
+ARG BASE_IMAGE=adguard/go-builder:1.26.1--1
 
 # The dependencies stage is needed to install packages and tool dependencies.
 # This is also where binaries like osslsigncode, which may be required for tests
@@ -53,7 +53,6 @@ make \
 	VERBOSE=1 \
 	go-env \
 	go-deps \
-	go-tools \
 	;
 EOF
 

go.mod

@@ -1,80 +1,83 @@
 module github.com/AdguardTeam/dnsproxy
 
-go 1.25.5
+go 1.26.1
 
 require (
-	github.com/AdguardTeam/golibs v0.35.2
+	github.com/AdguardTeam/golibs v0.35.10
 	github.com/ameshkov/dnscrypt/v2 v2.4.0
 	github.com/ameshkov/dnsstamps v1.0.3
 	github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0
 	github.com/bluele/gcache v0.0.2
-	github.com/miekg/dns v1.1.68
+	github.com/miekg/dns v1.1.72
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	// TODO(s.chzhen):  Update after investigation of the 0-RTT bug/behavior
 	// when TestUpstreamDoH_serverRestart/http3/second_try keeps failing.
-	github.com/quic-go/quic-go v0.56.0
+	github.com/quic-go/quic-go v0.59.0
 	github.com/stretchr/testify v1.11.1
-	golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6 // indirect
-	golang.org/x/net v0.47.0
-	golang.org/x/sys v0.38.0
-	gonum.org/v1/gonum v0.16.0
+	golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 // indirect
+	golang.org/x/net v0.52.0
+	golang.org/x/sys v0.42.0
+	gonum.org/v1/gonum v0.17.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	cloud.google.com/go v0.123.0 // indirect
-	cloud.google.com/go/auth v0.17.0 // indirect
+	cloud.google.com/go/auth v0.18.1 // indirect
 	cloud.google.com/go/compute/metadata v0.9.0 // indirect
-	github.com/BurntSushi/toml v1.5.0 // indirect
+	github.com/BurntSushi/toml v1.6.0 // indirect
 	github.com/anthropics/anthropic-sdk-go v1.19.0 // indirect
 	github.com/ccojocar/zxcvbn-go v1.0.4 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fzipp/gocyclo v0.6.0 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golangci/misspell v0.7.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/renameio/v2 v2.0.1 // indirect
+	github.com/google/renameio/v2 v2.0.2 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.7 // indirect
-	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.11 // indirect
+	github.com/googleapis/gax-go/v2 v2.16.0 // indirect
 	github.com/gookit/color v1.6.0 // indirect
 	github.com/gordonklaus/ineffassign v0.2.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/jstemmer/go-junit-report/v2 v2.1.0 // indirect
 	github.com/kisielk/errcheck v1.9.0 // indirect
+	github.com/openai/openai-go/v3 v3.17.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/quic-go/qpack v0.5.1 // indirect
+	github.com/quic-go/qpack v0.6.0 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
-	github.com/securego/gosec/v2 v2.22.10 // indirect
+	github.com/securego/gosec/v2 v2.22.12-0.20260119173857-b579523bf6db // indirect
 	github.com/tidwall/gjson v1.18.0 // indirect
 	github.com/tidwall/match v1.2.0 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tidwall/sjson v1.2.5 // indirect
 	github.com/uudashr/gocognit v1.2.0 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
+	go.opentelemetry.io/otel v1.40.0 // indirect
+	go.opentelemetry.io/otel/metric v1.40.0 // indirect
+	go.opentelemetry.io/otel/trace v1.40.0 // indirect
 	go.uber.org/mock v0.6.0 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/exp/typeparams v0.0.0-20251125195548-87e1e737ad39 // indirect
-	golang.org/x/mod v0.30.0 // indirect
-	golang.org/x/sync v0.18.0 // indirect
-	golang.org/x/telemetry v0.0.0-20251203150158-8fff8a5912fc // indirect
-	golang.org/x/term v0.37.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
-	golang.org/x/tools v0.39.0 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/crypto v0.49.0 // indirect
+	golang.org/x/exp/typeparams v0.0.0-20260112195511-716be5621a96 // indirect
+	golang.org/x/mod v0.34.0 // indirect
+	golang.org/x/sync v0.20.0 // indirect
+	golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c // indirect
+	golang.org/x/term v0.41.0 // indirect
+	golang.org/x/text v0.35.0 // indirect
+	golang.org/x/tools v0.43.0 // indirect
 	golang.org/x/vuln v1.1.4 // indirect
-	google.golang.org/genai v1.37.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
-	google.golang.org/grpc v1.77.0 // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
+	google.golang.org/genai v1.43.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
+	google.golang.org/grpc v1.78.0 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
 	honnef.co/go/tools v0.6.1 // indirect
 	mvdan.cc/editorconfig v0.3.0 // indirect
 	mvdan.cc/gofumpt v0.9.2 // indirect