fix: Tidy up closes for nicer output (#4605)

kylecarbs · web-flow · commit c5afaffa7e4c · 2022-10-17T18:36:23.000-05:00
* fix: Tidy up closes for nicer output

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.

* Fix migration and experimental
diff --git a/cli/root.go b/cli/root.go
@@ -609,7 +609,8 @@ func (h *headerTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 
 // ExperimentalEnabled returns if the experimental feature flag is enabled.
 func ExperimentalEnabled(cmd *cobra.Command) bool {
-	return cliflag.IsSetBool(cmd, varExperimental)
+	enabled, _ := cmd.Flags().GetBool(varExperimental)
+	return enabled
 }
 
 // EnsureExperimental will ensure that the experimental feature flag is set if the given flag is set.
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/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000059_file_id.up.sql b/coderd/database/migrations/000059_file_id.up.sql
@@ -14,9 +14,6 @@ BEGIN;
 -- Drop the primary key on hash.
 ALTER TABLE files DROP CONSTRAINT files_pkey;
 
--- This extension is required by gen_random_uuid
-CREATE EXTENSION IF NOT EXISTS pgcrypto;
-
 -- Add an 'id' column and designate it the primary key.
 ALTER TABLE files ADD COLUMN
 	id uuid NOT NULL PRIMARY KEY DEFAULT gen_random_uuid ();
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)
diff --git a/tailnet/coordinator.go b/tailnet/coordinator.go
@@ -1,6 +1,7 @@
 package tailnet
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"io"
@@ -289,7 +290,7 @@ func (c *coordinator) ServeAgent(conn net.Conn, id uuid.UUID) error {
 	for {
 		err := c.handleNextAgentMessage(id, decoder)
 		if err != nil {
-			if errors.Is(err, io.EOF) {
+			if errors.Is(err, io.EOF) || 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
`@@ -609,7 +609,8 @@ func (h headerTransport) RoundTrip(req http.Request) (*http.Response, error) {`
`609`	`609`
`610`	`610`	`// ExperimentalEnabled returns if the experimental feature flag is enabled.`
`611`	`611`	`func ExperimentalEnabled(cmd *cobra.Command) bool {`
`612`		`- return cliflag.IsSetBool(cmd, varExperimental)`
	`612`	`+ enabled, _ := cmd.Flags().GetBool(varExperimental)`
	`613`	`+ return enabled`
`613`	`614`	`}`
`614`	`615`
`615`	`616`	`// EnsureExperimental will ensure that the experimental feature flag is set if the given flag is set.`
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)`