fix: Tidy up closes for nicer output

kylecarbs · kylecarbs · commit 8db791b2bbb1 · 2022-10-17T22:17:51.000Z
There was a context canceled message that would appear
because of traces, and this was using the wrong close.

I don't think it was causing any specific problems, but
it could make a replica warning appear on restart.
diff --git a/cli/server.go b/cli/server.go
@@ -476,14 +476,13 @@ func Server(dflags *codersdk.DeploymentFlags, newAPI func(context.Context, *code
 				), dflags.PromAddress.Value, "prometheus")()
 			}
 
-			// We use a separate closer so the Enterprise API
+			// We use a separate coderAPICloser so the Enterprise API
 			// can have it's own close functions. This is cleaner
 			// than abstracting the Coder API itself.
-			coderAPI, closer, err := newAPI(ctx, options)
+			coderAPI, coderAPICloser, err := newAPI(ctx, options)
 			if err != nil {
 				return err
 			}
-			defer closer.Close()
 
 			client := codersdk.New(localURL)
 			if dflags.TLSEnable.Value {
@@ -663,7 +662,7 @@ func Server(dflags *codersdk.DeploymentFlags, newAPI func(context.Context, *code
 			wg.Wait()
 
 			cmd.Println("Waiting for WebSocket connections to close...")
-			_ = coderAPI.Close()
+			_ = coderAPICloser.Close()
 			cmd.Println("Done waiting for WebSocket connections")
 
 			// Close tunnel after we no longer have in-flight connections.
diff --git a/coderd/tracing/exporter.go b/coderd/tracing/exporter.go
@@ -3,6 +3,7 @@ package tracing
 import (
 	"context"
 
+	"github.com/go-logr/logr"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
@@ -59,12 +60,15 @@ func TracerProvider(ctx context.Context, service string, opts TracerOpts) (*sdkt
 
 	tracerProvider := sdktrace.NewTracerProvider(tracerOpts...)
 	otel.SetTracerProvider(tracerProvider)
+	// Ignore otel errors!
+	otel.SetErrorHandler(otel.ErrorHandlerFunc(func(err error) {}))
 	otel.SetTextMapPropagator(
 		propagation.NewCompositeTextMapPropagator(
 			propagation.TraceContext{},
 			propagation.Baggage{},
 		),
 	)
+	otel.SetLogger(logr.Discard())
 
 	return tracerProvider, func(ctx context.Context) error {
 		for _, close := range closers {
diff --git a/enterprise/tailnet/coordinator.go b/enterprise/tailnet/coordinator.go
@@ -215,7 +215,7 @@ func (c *haCoordinator) ServeAgent(conn net.Conn, id uuid.UUID) error {
 	for {
 		node, err := c.handleAgentUpdate(id, decoder)
 		if err != nil {
-			if errors.Is(err, io.EOF) || errors.Is(err, io.ErrClosedPipe) {
+			if errors.Is(err, io.EOF) || errors.Is(err, io.ErrClosedPipe) || errors.Is(err, context.Canceled) {
 				return nil
 			}
 			return xerrors.Errorf("handle next agent message: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ func (c *haCoordinator) ServeAgent(conn net.Conn, id uuid.UUID) error {`
`215`	`215`	`for {`
`216`	`216`	`node, err := c.handleAgentUpdate(id, decoder)`
`217`	`217`	`if err != nil {`
`218`		`- if errors.Is(err, io.EOF) \|\| errors.Is(err, io.ErrClosedPipe) {`
	`218`	`+ if errors.Is(err, io.EOF) \|\| errors.Is(err, io.ErrClosedPipe) \|\| errors.Is(err, context.Canceled) {`
`219`	`219`	`return nil`
`220`	`220`	`}`
`221`	`221`	`return xerrors.Errorf("handle next agent message: %w", err)`