go/opentelemetry-go
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2026-06-03 18:35:08 +02:00
Code Issues Releases Activity

chore: fix noctx issues (#8008)

Browse Source 
***Description***

Fixes
[noctx](https://golangci-lint.run/docs/linters/configuration/#noctx)
issues and enables the linter

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
Co-authored-by: Damien Mathieu <42@dmathieu.com>
This commit is contained in:
Matthieu MOREL
2026-03-23 14:28:38 +01:00
committed by GitHub
parent 717c1b3505
commit e9449e3b34
21 changed files with 71 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
semconv/internal/v2/http_test.go
+4 -1
View File
@@ -141,7 +141,10 @@ func TestHTTPServerRequest(t *testing.T) {
srvPort, err := strconv.ParseInt(srvURL.Port(), 10, 32)
require.NoError(t, err)
resp, err := srv.Client().Get(srv.URL)
r, err := http.NewRequestWithContext(t.Context(), http.MethodGet, srv.URL, http.NoBody)
require.NoError(t, err)
resp, err := srv.Client().Do(r)
require.NoError(t, err)
require.NoError(t, resp.Body.Close())
semconv/internal/v2/net_test.go
+9 -8
View File
@@ -4,6 +4,7 @@
package internal
import (
"context"
"net"
"strconv"
"testing"
@@ -74,12 +75,12 @@ func TestNetServerNilAddr(t *testing.T) {
assert.ElementsMatch(t, expected, got)
}
func newTCPListener() (net.Listener, error) {
return net.Listen("tcp4", "127.0.0.1:0")
func newTCPListener(ctx context.Context) (net.Listener, error) {
return (&net.ListenConfig{}).Listen(ctx, "tcp4", "127.0.0.1:0")
}
func TestNetServerTCP(t *testing.T) {
ln, err := newTCPListener()
ln, err := newTCPListener(t.Context())
require.NoError(t, err)
defer func() { require.NoError(t, ln.Close()) }()
@@ -145,13 +146,13 @@ func TestNetClientNilAddr(t *testing.T) {
assert.ElementsMatch(t, expected, got)
}
func newTCPConn() (net.Conn, net.Listener, error) {
ln, err := newTCPListener()
func newTCPConn(ctx context.Context) (net.Conn, net.Listener, error) {
ln, err := newTCPListener(ctx)
if err != nil {
return nil, nil, err
}
conn, err := net.Dial("tcp4", ln.Addr().String())
conn, err := (&net.Dialer{}).DialContext(ctx, "tcp4", ln.Addr().String())
if err != nil {
_ = ln.Close()
return nil, nil, err
@@ -161,7 +162,7 @@ func newTCPConn() (net.Conn, net.Listener, error) {
}
func TestNetClientTCP(t *testing.T) {
conn, ln, err := newTCPConn()
conn, ln, err := newTCPConn(t.Context())
require.NoError(t, err)
defer func() { require.NoError(t, ln.Close()) }()
defer func() { require.NoError(t, conn.Close()) }()
@@ -196,7 +197,7 @@ type remoteOnlyConn struct{ net.Conn }
func (remoteOnlyConn) LocalAddr() net.Addr { return nil }
func TestNetClientTCPNilLocal(t *testing.T) {
conn, ln, err := newTCPConn()
conn, ln, err := newTCPConn(t.Context())
require.NoError(t, err)
defer func() { require.NoError(t, ln.Close()) }()
defer func() { require.NoError(t, conn.Close()) }()
semconv/internal/v3/http_test.go
+4 -1
View File
@@ -141,7 +141,10 @@ func TestHTTPServerRequest(t *testing.T) {
srvPort, err := strconv.ParseInt(srvURL.Port(), 10, 32)
require.NoError(t, err)
resp, err := srv.Client().Get(srv.URL)
r, err := http.NewRequestWithContext(t.Context(), http.MethodGet, srv.URL, http.NoBody)
require.NoError(t, err)
resp, err := srv.Client().Do(r)
require.NoError(t, err)
require.NoError(t, resp.Body.Close())
semconv/internal/v3/net_test.go
+9 -8
View File
@@ -4,6 +4,7 @@
package internal
import (
"context"
"net"
"strconv"
"testing"
@@ -74,12 +75,12 @@ func TestNetServerNilAddr(t *testing.T) {
assert.ElementsMatch(t, expected, got)
}
func newTCPListener() (net.Listener, error) {
return net.Listen("tcp4", "127.0.0.1:0")
func newTCPListener(ctx context.Context) (net.Listener, error) {
return (&net.ListenConfig{}).Listen(ctx, "tcp4", "127.0.0.1:0")
}
func TestNetServerTCP(t *testing.T) {
ln, err := newTCPListener()
ln, err := newTCPListener(t.Context())
require.NoError(t, err)
defer func() { require.NoError(t, ln.Close()) }()
@@ -145,13 +146,13 @@ func TestNetClientNilAddr(t *testing.T) {
assert.ElementsMatch(t, expected, got)
}
func newTCPConn() (net.Conn, net.Listener, error) {
ln, err := newTCPListener()
func newTCPConn(ctx context.Context) (net.Conn, net.Listener, error) {
ln, err := newTCPListener(ctx)
if err != nil {
return nil, nil, err
}
conn, err := net.Dial("tcp4", ln.Addr().String())
conn, err := (&net.Dialer{}).DialContext(ctx, "tcp4", ln.Addr().String())
if err != nil {
_ = ln.Close()
return nil, nil, err
@@ -161,7 +162,7 @@ func newTCPConn() (net.Conn, net.Listener, error) {
}
func TestNetClientTCP(t *testing.T) {
conn, ln, err := newTCPConn()
conn, ln, err := newTCPConn(t.Context())
require.NoError(t, err)
defer func() { require.NoError(t, ln.Close()) }()
defer func() { require.NoError(t, conn.Close()) }()
@@ -196,7 +197,7 @@ type remoteOnlyConn struct{ net.Conn }
func (remoteOnlyConn) LocalAddr() net.Addr { return nil }
func TestNetClientTCPNilLocal(t *testing.T) {
conn, ln, err := newTCPConn()
conn, ln, err := newTCPConn(t.Context())
require.NoError(t, err)
defer func() { require.NoError(t, ln.Close()) }()
defer func() { require.NoError(t, conn.Close()) }()
semconv/internal/v4/http_test.go
+4 -1
View File
@@ -142,7 +142,10 @@ func TestHTTPServerRequest(t *testing.T) {
srvPort, err := strconv.ParseInt(srvURL.Port(), 10, 32)
require.NoError(t, err)
resp, err := srv.Client().Get(srv.URL)
r, err := http.NewRequestWithContext(t.Context(), http.MethodGet, srv.URL, http.NoBody)
require.NoError(t, err)
resp, err := srv.Client().Do(r)
require.NoError(t, err)
require.NoError(t, resp.Body.Close())
semconv/internal/v4/net_test.go
+9 -8
View File
@@ -4,6 +4,7 @@
package internal
import (
"context"
"net"
"strconv"
"testing"
@@ -74,12 +75,12 @@ func TestNetServerNilAddr(t *testing.T) {
assert.ElementsMatch(t, expected, got)
}
func newTCPListener() (net.Listener, error) {
return net.Listen("tcp4", "127.0.0.1:0")
func newTCPListener(ctx context.Context) (net.Listener, error) {
return (&net.ListenConfig{}).Listen(ctx, "tcp4", "127.0.0.1:0")
}
func TestNetServerTCP(t *testing.T) {
ln, err := newTCPListener()
ln, err := newTCPListener(t.Context())
require.NoError(t, err)
defer func() { require.NoError(t, ln.Close()) }()
@@ -145,13 +146,13 @@ func TestNetClientNilAddr(t *testing.T) {
assert.ElementsMatch(t, expected, got)
}
func newTCPConn() (net.Conn, net.Listener, error) {
ln, err := newTCPListener()
func newTCPConn(ctx context.Context) (net.Conn, net.Listener, error) {
ln, err := newTCPListener(ctx)
if err != nil {
return nil, nil, err
}
conn, err := net.Dial("tcp4", ln.Addr().String())
conn, err := (&net.Dialer{}).DialContext(ctx, "tcp4", ln.Addr().String())
if err != nil {
_ = ln.Close()
return nil, nil, err
@@ -161,7 +162,7 @@ func newTCPConn() (net.Conn, net.Listener, error) {
}
func TestNetClientTCP(t *testing.T) {
conn, ln, err := newTCPConn()
conn, ln, err := newTCPConn(t.Context())
require.NoError(t, err)
defer func() { require.NoError(t, ln.Close()) }()
defer func() { require.NoError(t, conn.Close()) }()
@@ -196,7 +197,7 @@ type remoteOnlyConn struct{ net.Conn }
func (remoteOnlyConn) LocalAddr() net.Addr { return nil }
func TestNetClientTCPNilLocal(t *testing.T) {
conn, ln, err := newTCPConn()
conn, ln, err := newTCPConn(t.Context())
require.NoError(t, err)
defer func() { require.NoError(t, ln.Close()) }()
defer func() { require.NoError(t, conn.Close()) }()