Accommodate for breaking changes in elastic-agent-libs

elastic · Apr 11, 2024 · 3335e79 · 3335e79
1 parent 70fcf1d
commit 3335e79
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/heartbeat/monitors/active/dialchain/dialers.go b/heartbeat/monitors/active/dialchain/dialers.go
@@ -18,6 +18,7 @@
 package dialchain
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"strconv"
@@ -69,7 +70,7 @@ func UDPDialer(to time.Duration) NetDialer {
 // CreateNetDialer returns a NetDialer with the given timeout.
 func CreateNetDialer(timeout time.Duration) NetDialer {
 	return func(event *beat.Event) (transport.Dialer, error) {
-		return makeDialer(func(network, address string) (net.Conn, error) {
+		return makeDialer(func(ctx context.Context, network, address string) (net.Conn, error) {
 			var namespace string
 
 			switch network {
@@ -100,7 +101,7 @@ func CreateNetDialer(timeout time.Duration) NetDialer {
 			dialer := &net.Dialer{Timeout: timeout}
 
 			start := time.Now()
-			conn, err := transport.DialWith(dialer, network, host, addresses, port)
+			conn, err := transport.DialWith(ctx, dialer, network, host, addresses, port)
 			if err != nil {
 				return nil, ecserr.NewCouldNotConnectErr(host, port, err)
 			}

diff --git a/heartbeat/monitors/active/dialchain/util.go b/heartbeat/monitors/active/dialchain/util.go
@@ -18,6 +18,7 @@
 package dialchain
 
 import (
+	"context"
 	"net"
 	"time"
 
@@ -58,23 +59,23 @@ func (t *timer) stop()                   { t.e = time.Now() }
 func (t *timer) duration() time.Duration { return t.e.Sub(t.s) }
 
 // makeDialer aliases transport.DialerFunc
-func makeDialer(fn func(network, address string) (net.Conn, error)) transport.Dialer {
+func makeDialer(fn func(ctx context.Context, network, address string) (net.Conn, error)) transport.Dialer {
 	return transport.DialerFunc(fn)
 }
 
 // beforeDial will always call fn before executing the underlying dialer.
 // The callback must return the original or a new address to be used with
 // the dialer.
 func beforeDial(dialer transport.Dialer, fn func(string) string) transport.Dialer {
-	return makeDialer(func(network, address string) (net.Conn, error) {
+	return makeDialer(func(ctx context.Context, network, address string) (net.Conn, error) {
 		address = fn(address)
 		return dialer.Dial(network, address)
 	})
 }
 
 // afterDial will run fn after the dialer did successfully return a connection.
 func afterDial(dialer transport.Dialer, fn func(net.Conn) (net.Conn, error)) transport.Dialer {
-	return makeDialer(func(network, address string) (net.Conn, error) {
+	return makeDialer(func(ctx context.Context, network, address string) (net.Conn, error) {
 		conn, err := dialer.Dial(network, address)
 		if err == nil {
 			conn, err = fn(conn)

diff --git a/metricbeat/helper/dialer/dialer_windows.go b/metricbeat/helper/dialer/dialer_windows.go
@@ -20,6 +20,7 @@
 package dialer
 
 import (
+	"context"
 	"errors"
 	"net"
 	"strings"
@@ -60,7 +61,7 @@ func (t *NpipeDialerBuilder) String() string {
 func (t *NpipeDialerBuilder) Make(timeout time.Duration) (transport.Dialer, error) {
 	to := timeout
 	return transport.DialerFunc(
-		func(_, _ string) (net.Conn, error) {
+		func(_ context.Context, _, _ string) (net.Conn, error) {
 			return winio.DialPipe(
 				strings.TrimSuffix(npipe.TransformString(t.Path), "/"),
 				&to,

diff --git a/x-pack/filebeat/input/cel/transport_windows.go b/x-pack/filebeat/input/cel/transport_windows.go
@@ -7,6 +7,7 @@
 package cel
 
 import (
+	"context"
 	"net"
 	"path/filepath"
 
@@ -21,3 +22,7 @@ type npipeDialer struct {
 func (d npipeDialer) Dial(_, _ string) (net.Conn, error) {
 	return winio.DialPipe(`\\.\pipe`+filepath.FromSlash(d.path), nil)
 }
+
+func (d npipeDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
+	return winio.DialPipeContext(ctx, `\\.\pipe`+filepath.FromSlash(d.path))
+}
diff --git a/x-pack/filebeat/input/httpjson/client_windows.go b/x-pack/filebeat/input/httpjson/client_windows.go
@@ -7,6 +7,7 @@
 package httpjson
 
 import (
+	"context"
 	"net"
 	"path/filepath"
 
@@ -21,3 +22,7 @@ type npipeDialer struct {
 func (d npipeDialer) Dial(_, _ string) (net.Conn, error) {
 	return winio.DialPipe(`\\.\pipe`+filepath.FromSlash(d.path), nil)
 }
+
+func (d npipeDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
+	return winio.DialPipeContext(ctx, `\\.\pipe`+filepath.FromSlash(d.path))
+}