From 91b7e2246bc91147245047522d4a305503ba73c6 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Hugly Date: Thu, 16 Nov 2023 13:28:35 +0100 Subject: [PATCH] router: leftovers cleanup. That is: * Fix description of end2end.go. * Delete NilCtx(), no-longer used. --- private/tracing/context.go | 6 ------ tools/end2end/main.go | 16 ++++------------ 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/private/tracing/context.go b/private/tracing/context.go index 2d93eccd6a..4cad2c3423 100644 --- a/private/tracing/context.go +++ b/private/tracing/context.go @@ -75,9 +75,3 @@ func StartSpanFromCtx(ctx context.Context, operationName string, return opentracing.StartSpanFromContext(ctx, operationName, opts...) } - -// Allow the construction of nil-valued spans (and context) without leaking -// opentracing types. -func NilCtx() (opentracing.Span, context.Context) { - return nil, nil -} diff --git a/tools/end2end/main.go b/tools/end2end/main.go index 067f245b6a..b93852b1b9 100644 --- a/tools/end2end/main.go +++ b/tools/end2end/main.go @@ -14,18 +14,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -// This is a general purpose client/server code for end2end tests. It plays -// ping-pong with some variantions depending on command line arguments. -// -// One of the variants is for the client to send pings to the server -// until it receives at least one pong from the server or a given -// deadline was reached. The server responds to pings and the client -// wait for a response before doing anything else. -// -// Another variant is for the client to send back-to-back pings to the -// server until the sending fails or some deadline was reached. In this case -// the client isn't waiting for responses. The client checks at the end -// whether at least one response has been received. +// This is a general purpose client/server code for end2end tests. The client +// sends pings to the server until it receives at least one pong from the +// server or a given deadline is reached. The server responds to all pings and +// the client wait for a response before doing anything else. package main