serverutils: move TracerI into TestTenantInterface

Tracer method is already in TestTenantInterface.

Release note: None

pkg/server/testserver.go

@@ -856,6 +856,11 @@ func (t *TestTenant) Tracer() *tracing.Tracer {
 	return t.sql.ambientCtx.Tracer
 }
 
+// TracerI is part of the serverutils.TestTenantInterface.
+func (t *TestTenant) TracerI() interface{} {
+	return t.Tracer
+}
+
 // SettingsWatcher is part of the serverutils.TestTenantInterface.
 func (t *TestTenant) SettingsWatcher() interface{} {
 	return t.sql.settingsWatcher

pkg/testutils/serverutils/test_server_shim.go

@@ -149,9 +149,6 @@ type TestServerInterface interface {
 	// insql.InternalDB as an interface{}.
 	InternalDB() interface{}
 
-	// TracerI returns a *tracing.Tracer as an interface{}.
-	TracerI() interface{}
-
 	// GossipI returns the gossip used by the TestServer.
 	// The real return type is *gossip.Gossip.
 	GossipI() interface{}

pkg/testutils/serverutils/test_tenant_shim.go

@@ -218,6 +218,9 @@ type TestTenantInterface interface {
 	// Tracer returns a reference to the tenant's Tracer.
 	Tracer() *tracing.Tracer
 
+	// TracerI is the same as Tracer but returns an interface{}.
+	TracerI() interface{}
+
 	// MigrationServer returns the tenant's migration server, which is used in
 	// upgrade testing.
 	MigrationServer() interface{}