Skip to content

[v13] Remove sending tracingContext in NewClientConn #33584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AntonAM merged 1 commit into from
Oct 17, 2023
+1 −19
Merged

[v13] Remove sending tracingContext in NewClientConn #33584

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 1 addition & 19 deletions api/observability/tracing/ssh/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,17 @@ package ssh
import (
"context"
"encoding/json"
"fmt"
"net"
"time"

"github.com/gravitational/trace"
log "github.com/sirupsen/logrus"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/propagation"
semconv "go.opentelemetry.io/otel/semconv/v1.10.0"
oteltrace "go.opentelemetry.io/otel/trace"
"golang.org/x/crypto/ssh"

"github.com/gravitational/teleport/api/constants"
"github.com/gravitational/teleport/api/observability/tracing"
"github.com/gravitational/teleport/api/utils/sshutils"
)

const (
Expand Down Expand Up @@ -147,7 +143,7 @@ func Dial(ctx context.Context, network, addr string, config *ssh.ClientConfig, o
// properly over the ssh connection.
func NewClientConn(ctx context.Context, conn net.Conn, addr string, config *ssh.ClientConfig, opts ...tracing.Option) (ssh.Conn, <-chan ssh.NewChannel, <-chan *ssh.Request, error) {
tracer := tracing.NewConfig(opts).TracerProvider.Tracer(instrumentationName)
ctx, span := tracer.Start(
ctx, span := tracer.Start( //nolint:staticcheck,ineffassign // keeping shadowed ctx to avoid accidental missing in the future
ctx,
"ssh/NewClientConn",
oteltrace.WithSpanKind(oteltrace.SpanKindClient),
Expand All @@ -163,20 +159,6 @@ func NewClientConn(ctx context.Context, conn net.Conn, addr string, config *ssh.
)
defer span.End()

hp := &sshutils.HandshakePayload{
TracingContext: tracing.PropagationContextFromContext(ctx, opts...),
}

if len(hp.TracingContext) > 0 {
payloadJSON, err := json.Marshal(hp)
if err == nil {
payload := fmt.Sprintf("%s%s\x00", constants.ProxyHelloSignature, payloadJSON)
if _, err := conn.Write([]byte(payload)); err != nil {
log.WithError(err).Warnf("Failed to pass along tracing context to proxy %v", addr)
}
}
}

c, chans, reqs, err := ssh.NewClientConn(conn, addr, config)
if err != nil {
return nil, nil, nil, trace.Wrap(err)
Expand Down