Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- "docs/**"

env:
GO_VERSION: 1.24.x
GO_VERSION: 1.26.x
WIX_VERSION: 5.0.0
PYTHON_VERSION: 3.7.9

Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
run: |
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin $GOLANGCI_LINT_VER
env:
GOLANGCI_LINT_VER: v2.2.2
GOLANGCI_LINT_VER: v2.9.0
- name: Lint
shell: bash
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- "docs/**"

env:
GO_VERSION: 1.24.x
GO_VERSION: 1.26.x
WIX_VERSION: 5.0.0
PYTHON_VERSION: 3.7.9

Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
run: |
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin $GOLANGCI_LINT_VER
env:
GOLANGCI_LINT_VER: v2.2.2
GOLANGCI_LINT_VER: v2.9.0
- name: Lint
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'v*'

env:
GO_VERSION: 1.24.x
GO_VERSION: 1.26.x
WIX_VERSION: 5.0.0
PYTHON_VERSION: 3.7.9

Expand Down
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ linters:
- errcheck
- nolintlint
- staticcheck
- noctx
path: _test\.go
paths:
- third_party$
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@ require (
gopkg.in/yaml.v2 v2.3.0 // indirect
)

go 1.24.5
go 1.26.0
4 changes: 3 additions & 1 deletion pkg/api/listener.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ package api
import (
"context"
"fmt"
"github.com/Microsoft/go-winio"
"net"
"strings"

"github.com/Microsoft/go-winio"
)

// MakePipeListener produces a new listener for receiving requests over a named pipe.
Expand All @@ -41,6 +42,7 @@ func MakePipeListener(pipePath, descriptor string) (net.Listener, error) {

// makeTCPListener produces a new listener for receiving requests over TCP.
func makeTCPListener(addr string) (net.Listener, error) {
//nolint:noctx
return net.Listen("tcp", addr)
}

Expand Down
5 changes: 4 additions & 1 deletion pkg/network/dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package network

import (
"context"
"errors"
"expvar"
"net"
Expand Down Expand Up @@ -119,7 +120,9 @@ func (r *ReverseDNS) Add(addr Address) ([]string, error) {

now := time.Now()
exp := now.Add(r.ttl).UnixNano()
names, err := net.LookupAddr(addr.ToIPString())
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
defer cancel()
names, err := net.DefaultResolver.LookupAddr(ctx, addr.ToIPString())
if err != nil {
r.blacklist[addr]++
failedDNSLookups.Add(addr.ToIPString(), 1)
Expand Down
8 changes: 5 additions & 3 deletions pkg/outputs/amqp/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ package amqp
import (
"expvar"
"fmt"
"github.com/rabbitstack/fibratus/pkg/util/tls"
log "github.com/sirupsen/logrus"
"github.com/streadway/amqp"
"net"
"sync"
"time"

"github.com/rabbitstack/fibratus/pkg/util/tls"
log "github.com/sirupsen/logrus"
"github.com/streadway/amqp"
)

var (
Expand Down Expand Up @@ -55,6 +56,7 @@ func (c *client) connect(healthcheck bool) error {
amqpConfig := amqp.Config{
Vhost: c.config.Vhost,
Dial: func(network, addr string) (net.Conn, error) {
//nolint:noctx
return net.DialTimeout(network, addr, c.config.Timeout)
},
SASL: c.config.auth(),
Expand Down
Loading