1
0
mirror of https://github.com/rancher/steve.git synced 2025-09-01 15:37:31 +00:00

49270 backport ping logging to 2.11: steve side (#711)

* Backport issue 49270 to 2.11: add context to remotedialer ping logger (steve side).

* Bump remotedialer to v0.3.3

* Bump remotedialer to v0.3.5 - gets latest fix.
This commit is contained in:
Eric Promislow
2025-07-10 12:40:07 -07:00
committed by GitHub
parent a44818637f
commit c4edb77306
3 changed files with 5 additions and 3 deletions

2
go.mod
View File

@@ -25,7 +25,7 @@ require (
github.com/rancher/kubernetes-provider-detector v0.1.5
github.com/rancher/lasso v0.2.2
github.com/rancher/norman v0.5.2
github.com/rancher/remotedialer v0.3.2
github.com/rancher/remotedialer v0.3.5
github.com/rancher/wrangler/v3 v3.2.1
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.10.0

4
go.sum
View File

@@ -232,8 +232,8 @@ github.com/rancher/lasso v0.2.2 h1:oKP5d4+eSupwHftLMTWo6QS1tYYZ5XK+ZjP+VNhwmk8=
github.com/rancher/lasso v0.2.2/go.mod h1:KSV3jBXfdXqdCuMm2uC8kKB9q/wuDYb3h0eHZoRjShM=
github.com/rancher/norman v0.5.2 h1:rwUKZ0QeVKJEtznhRdNQUMJtKjSoLYbFuPQGXm6xTxw=
github.com/rancher/norman v0.5.2/go.mod h1:lDO9ylAYBwch9FiYyuuWlYd7+IxgRgh0ioDJBweC7t4=
github.com/rancher/remotedialer v0.3.2 h1:kstZbRwPS5gPWpGg8VjEHT2poHtArs+Fc317YM8JCzU=
github.com/rancher/remotedialer v0.3.2/go.mod h1:Ys004RpJuTLSm+k4aYUCoFiOOad37ubYev3TkOFg/5w=
github.com/rancher/remotedialer v0.3.5 h1:3WtvfSReVYMf4UGDG382G3Ct2lu5QmKufAspSMjoGbE=
github.com/rancher/remotedialer v0.3.5/go.mod h1:BrTLlHp9xDNZM6lHiLdWNzwTLSGzYmzCNiRuZm5hapA=
github.com/rancher/wrangler/v3 v3.2.1 h1:V51PnoGb8bZ5jJdxFlqKQApzWdSp4sEy5OPGuEGqVbI=
github.com/rancher/wrangler/v3 v3.2.1/go.mod h1:RV8kkv5br5HaxXWamIbr95pOjvVeoC5CeBldcdw5Fv0=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=

View File

@@ -4,6 +4,7 @@ import (
"context"
"crypto/tls"
"crypto/x509"
"fmt"
"net"
"net/http"
"strings"
@@ -72,6 +73,7 @@ func serve(ctx context.Context, dialer websocket.Dialer, url string, headers htt
return err
}
defer conn.Close()
ctx = context.WithValue(ctx, remotedialer.ContextKeyCaller, fmt.Sprintf("steve server: url:%s", url))
go func() {
<-ctx.Done()