pr comments

f0ssel · f0ssel · commit a4c46832667e · 2022-05-20T15:33:39.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -120,9 +120,11 @@ func server() *cobra.Command {
 						_ = tracerProvider.Shutdown(ctx)
 					}()
 
-					sqlDriver, err = tracing.PostgresDriver(tracerProvider, "coderd.database")
+					d, err := tracing.PostgresDriver(tracerProvider, "coderd.database")
 					if err != nil {
 						logger.Warn(cmd.Context(), "failed to start postgres tracing driver", slog.Error(err))
+					} else {
+						sqlDriver = d
 					}
 				}
 			}
diff --git a/coderd/tracing/postgres.go b/coderd/tracing/postgres.go
@@ -37,6 +37,9 @@ func formatPostgresSpan(ctx context.Context, op string) string {
 		return strings.ToUpper(op)
 	}
 
-	s := strings.Split(strings.TrimPrefix(q, qPrefix), " ")[0]
+	// Remove the qPrefix and then grab the method name.
+	// We expect the first line of the query to be in
+	// the format "-- name: GetAPIKeyByID :one".
+	s := strings.SplitN(strings.TrimPrefix(q, qPrefix), " ", 2)[0]
 	return fmt.Sprintf("%s %s", strings.ToUpper(op), s)
 }

Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,11 @@ func server() *cobra.Command {`
`120`	`120`	`_ = tracerProvider.Shutdown(ctx)`
`121`	`121`	`}()`
`122`	`122`
`123`		`- sqlDriver, err = tracing.PostgresDriver(tracerProvider, "coderd.database")`
	`123`	`+ d, err := tracing.PostgresDriver(tracerProvider, "coderd.database")`
`124`	`124`	`if err != nil {`
`125`	`125`	`logger.Warn(cmd.Context(), "failed to start postgres tracing driver", slog.Error(err))`
	`126`	`+ } else {`
	`127`	`+ sqlDriver = d`
`126`	`128`	`}`
`127`	`129`	`}`
`128`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,9 @@ func formatPostgresSpan(ctx context.Context, op string) string {`
`37`	`37`	`return strings.ToUpper(op)`
`38`	`38`	`}`
`39`	`39`
`40`		`- s := strings.Split(strings.TrimPrefix(q, qPrefix), " ")[0]`
	`40`	`+ // Remove the qPrefix and then grab the method name.`
	`41`	`+ // We expect the first line of the query to be in`
	`42`	`+ // the format "-- name: GetAPIKeyByID :one".`
	`43`	`+ s := strings.SplitN(strings.TrimPrefix(q, qPrefix), " ", 2)[0]`
`41`	`44`	`return fmt.Sprintf("%s %s", strings.ToUpper(op), s)`
`42`	`45`	`}`