RSDK-8205: Remove Conversion To Zap Loggers (viamrobotics#4207)

cheukt · Jul 24, 2024 · 3b7de95 · 3b7de95
1 parent 7ee5b7e
commit 3b7de95
Show file tree

Hide file tree

Showing 74 changed files with 160 additions and 172 deletions.
diff --git a/cli/module_build.go b/cli/module_build.go
@@ -109,14 +109,14 @@ func moduleBuildLocalAction(cCtx *cli.Context, manifest *moduleManifest) error {
 	if manifest.Build.Setup != "" {
 		infof(cCtx.App.Writer, "Starting setup step: %q", manifest.Build.Setup)
 		processConfig.Args = []string{"-c", manifest.Build.Setup}
-		proc := pexec.NewManagedProcess(processConfig, logger.AsZap())
+		proc := pexec.NewManagedProcess(processConfig, logger)
 		if err := proc.Start(cCtx.Context); err != nil {
 			return err
 		}
 	}
 	infof(cCtx.App.Writer, "Starting build step: %q", manifest.Build.Build)
 	processConfig.Args = []string{"-c", manifest.Build.Build}
-	proc := pexec.NewManagedProcess(processConfig, logger.AsZap())
+	proc := pexec.NewManagedProcess(processConfig, logger)
 	if err := proc.Start(cCtx.Context); err != nil {
 		return err
 	}

diff --git a/components/arm/client_test.go b/components/arm/client_test.go
@@ -27,7 +27,7 @@ func TestClient(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	var (

diff --git a/components/audioinput/client_test.go b/components/audioinput/client_test.go
@@ -29,7 +29,7 @@ func TestClient(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	audioData := &wave.Float32Interleaved{
@@ -138,7 +138,7 @@ func TestClientStreamAfterClose(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	// Set up audioinput that can stream audio

diff --git a/components/audioinput/microphone/microphone.go b/components/audioinput/microphone/microphone.go
@@ -113,7 +113,7 @@ func tryMicrophoneOpen(
 	constraints mediadevices.MediaStreamConstraints,
 	logger logging.Logger,
 ) (audioinput.AudioSource, error) {
-	source, err := gostream.GetNamedAudioSource(filepath.Base(path), constraints, logger.AsZap())
+	source, err := gostream.GetNamedAudioSource(filepath.Base(path), constraints, logger)
 	if err != nil {
 		return nil, err
 	}

diff --git a/components/base/client_test.go b/components/base/client_test.go
@@ -81,7 +81,7 @@ func TestClient(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	argsReceived := map[string][]interface{}{}

diff --git a/components/board/client_test.go b/components/board/client_test.go
@@ -29,7 +29,7 @@ func setupService(t *testing.T, injectBoard *inject.Board) (net.Listener, func()
 	logger := logging.NewTestLogger(t)
 	listener, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	boardSvc, err := resource.NewAPIResourceCollection(board.API, map[resource.Name]board.Board{board.Named(testBoardName): injectBoard})

diff --git a/components/camera/client_test.go b/components/camera/client_test.go
@@ -37,7 +37,7 @@ func TestClient(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	injectCamera := &inject.Camera{}
@@ -338,7 +338,7 @@ func TestClientProperties(t *testing.T) {
 	listener, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
 
-	server, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	server, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	injectCamera := &inject.Camera{}
@@ -428,7 +428,7 @@ func TestClientLazyImage(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	injectCamera := &inject.Camera{}
@@ -497,7 +497,7 @@ func TestClientWithInterceptor(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	// Set up camera that adds timestamps into the gRPC response header.
@@ -559,7 +559,7 @@ func TestClientStreamAfterClose(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	// Set up camera that can stream images
@@ -633,7 +633,7 @@ func TestRTPPassthroughWithoutWebRTC(t *testing.T) {
 	camName := "rtp_passthrough_camera"
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	injectCamera := &inject.Camera{}

diff --git a/components/camera/replaypcd/replaypcd_utils_test.go b/components/camera/replaypcd/replaypcd_utils_test.go
@@ -134,7 +134,7 @@ func timestampsFromFileNum(fileNum int) (*timestamppb.Timestamp, *timestamppb.Ti
 func createMockCloudDependencies(ctx context.Context, t *testing.T, logger logging.Logger, b bool) (resource.Dependencies, func() error) {
 	listener, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	// This creates a mock server for each pcd file used in testing

diff --git a/components/camera/videosource/webcam.go b/components/camera/videosource/webcam.go
@@ -256,7 +256,7 @@ func findAndMakeVideoSource(
 		return cam, label, nil
 	}
 
-	source, err := gostream.GetAnyVideoSource(constraints, logger.AsZap())
+	source, err := gostream.GetAnyVideoSource(constraints, logger)
 	if err != nil {
 		return nil, "", errors.Wrap(err, "found no webcams")
 	}
@@ -429,7 +429,7 @@ func getNamedVideoSource(
 			path = resolvedPath
 		}
 	}
-	return gostream.GetNamedVideoSource(filepath.Base(path), constraints, logger.AsZap())
+	return gostream.GetNamedVideoSource(filepath.Base(path), constraints, logger)
 }
 
 // monitoredWebcam tries to ensure its underlying camera stays connected.

diff --git a/components/encoder/client_test.go b/components/encoder/client_test.go
@@ -27,7 +27,7 @@ func TestClient(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	workingEncoder := &inject.Encoder{}

diff --git a/components/gantry/client_test.go b/components/gantry/client_test.go
@@ -20,7 +20,7 @@ func TestClient(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	var gantryPos []float64

diff --git a/components/generic/client_test.go b/components/generic/client_test.go
@@ -25,7 +25,7 @@ func TestClient(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	workingGeneric := &inject.GenericComponent{}

diff --git a/components/gripper/client_test.go b/components/gripper/client_test.go
@@ -22,7 +22,7 @@ func TestClient(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	var gripperOpen string

diff --git a/components/input/client_test.go b/components/input/client_test.go
@@ -21,7 +21,7 @@ func TestClient(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	var extraOptions map[string]interface{}
@@ -276,7 +276,7 @@ func TestClientRace(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	injectInputController := &inject.TriggerableInputController{}

diff --git a/components/motor/client_test.go b/components/motor/client_test.go
@@ -20,7 +20,7 @@ func TestClient(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	workingMotor := &inject.Motor{}

diff --git a/components/movementsensor/client_test.go b/components/movementsensor/client_test.go
@@ -39,7 +39,7 @@ func TestClient(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	loc := geo.NewPoint(90, 1)

diff --git a/components/movementsensor/replay/replay_utils_test.go b/components/movementsensor/replay/replay_utils_test.go
@@ -171,7 +171,7 @@ func createMockCloudDependencies(ctx context.Context, t *testing.T, logger loggi
 ) (resource.Dependencies, func() error) {
 	listener, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	test.That(t, rpcServer.RegisterServiceServer(

diff --git a/components/posetracker/client_test.go b/components/posetracker/client_test.go
@@ -31,7 +31,7 @@ func TestClient(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	workingPT := &inject.PoseTracker{}

diff --git a/components/powersensor/client_test.go b/components/powersensor/client_test.go
@@ -22,7 +22,7 @@ func TestClient(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	testVolts := 4.8

diff --git a/components/sensor/client_test.go b/components/sensor/client_test.go
@@ -27,7 +27,7 @@ func TestClient(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	rs := map[string]interface{}{"a": 1.1, "b": 2.2}

diff --git a/components/servo/client_test.go b/components/servo/client_test.go
@@ -26,7 +26,7 @@ func TestClient(t *testing.T) {
 	logger := logging.NewTestLogger(t)
 	listener1, err := net.Listen("tcp", "localhost:0")
 	test.That(t, err, test.ShouldBeNil)
-	rpcServer, err := rpc.NewServer(logger.AsZap(), rpc.WithUnauthenticated())
+	rpcServer, err := rpc.NewServer(logger, rpc.WithUnauthenticated())
 	test.That(t, err, test.ShouldBeNil)
 
 	var actualExtra map[string]interface{}

diff --git a/config/logging_level.go b/config/logging_level.go
@@ -3,7 +3,6 @@ package config
 import (
 	"sync"
 
-	"github.com/edaniels/golog"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
@@ -27,18 +26,15 @@ var globalLogger struct {
 func InitLoggingSettings(logger logging.Logger, cmdLineDebugFlag bool) {
 	globalLogger.logger = logger
 	globalLogger.cmdLineDebugFlag = cmdLineDebugFlag
-	gologLogger := golog.NewDebugLogger("rdk.golog")
 
 	if cmdLineDebugFlag {
 		logging.GlobalLogLevel.SetLevel(zapcore.DebugLevel)
 		logger.SetLevel(logging.DEBUG)
 	} else {
 		logging.GlobalLogLevel.SetLevel(zapcore.InfoLevel)
 		logger.SetLevel(logging.INFO)
-		gologLogger = golog.NewLogger("rdk.golog")
 	}
 
-	golog.ReplaceGloabl(gologLogger)
 	globalLogger.logger.Info("Log level initialized: ", logging.GlobalLogLevel.Level())
 }
 

diff --git a/config/reader.go b/config/reader.go
@@ -712,7 +712,7 @@ func CreateNewGRPCClient(ctx context.Context, cloudCfg *Cloud, logger logging.Lo
 		dialOpts = append(dialOpts, rpc.WithInsecure())
 	}
 
-	return rpc.DialDirectGRPC(ctx, u.Host, logger.AsZap(), dialOpts...)
+	return rpc.DialDirectGRPC(ctx, u.Host, logger, dialOpts...)
 }
 
 // CreateNewGRPCClientWithAPIKey creates a new grpc cloud configured to communicate with the robot service
@@ -738,5 +738,5 @@ func CreateNewGRPCClientWithAPIKey(ctx context.Context, cloudCfg *Cloud,
 		dialOpts = append(dialOpts, rpc.WithInsecure())
 	}
 
-	return rpc.DialDirectGRPC(ctx, u.Host, logger.AsZap(), dialOpts...)
+	return rpc.DialDirectGRPC(ctx, u.Host, logger, dialOpts...)
 }
diff --git a/config/testutils/fake_cloud.go b/config/testutils/fake_cloud.go
@@ -57,7 +57,7 @@ func NewFakeCloudServer(t *testing.T, ctx context.Context, logger logging.Logger
 		deviceConfigs: map[string]*configAndCerts{},
 	}
 
-	server.rpcServer, err = rpc.NewServer(logger.AsZap(),
+	server.rpcServer, err = rpc.NewServer(logger,
 		rpc.WithDisableMulticastDNS(),
 		rpc.WithAuthHandler(rutils.CredentialsTypeRobotSecret, rpc.AuthHandlerFunc(
 			server.robotSecretAuthenticate,

diff --git a/examples/customresources/demos/remoteserver/server_test.go b/examples/customresources/demos/remoteserver/server_test.go
@@ -83,7 +83,7 @@ func TestGizmo(t *testing.T) {
 		test.That(t, err, test.ShouldBeNil)
 
 		processLogger, logObserver := logging.NewObservedTestLogger(t)
-		pmgr := pexec.NewProcessManager(processLogger.Sublogger("remoteA").AsZap())
+		pmgr := pexec.NewProcessManager(processLogger.Sublogger("remoteA"))
 		pCfg := pexec.ProcessConfig{
 			ID:      "Intermediate",
 			Name:    "go",

diff --git a/go.mod b/go.mod
@@ -25,7 +25,6 @@ require (
 	github.com/docker/go-units v0.5.0
 	github.com/edaniels/gobag v1.0.7-0.20220607183102-4242cd9e2848
 	github.com/edaniels/golinters v0.0.5-0.20220906153528-641155550742
-	github.com/edaniels/golog v0.0.0-20230215213219-28954395e8d0
 	github.com/edaniels/lidario v0.0.0-20220607182921-5879aa7b96dd
 	github.com/fatih/color v1.15.0
 	github.com/fogleman/gg v1.3.0
@@ -88,7 +87,7 @@ require (
 	go.uber.org/zap v1.24.0
 	go.viam.com/api v0.1.322
 	go.viam.com/test v1.1.1-0.20220913152726-5da9916c08a2
-	go.viam.com/utils v0.1.85
+	go.viam.com/utils v0.1.87
 	goji.io v2.0.2+incompatible
 	golang.org/x/image v0.15.0
 	golang.org/x/mobile v0.0.0-20240112133503-c713f31d574b
@@ -173,6 +172,7 @@ require (
 	github.com/denis-tingaikin/go-header v0.4.3 // indirect
 	github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
 	github.com/dnephin/pflag v1.0.7 // indirect
+	github.com/edaniels/golog v0.0.0-20230215213219-28954395e8d0 // indirect
 	github.com/edaniels/zeroconf v1.0.10 // indirect
 	github.com/envoyproxy/go-control-plane v0.11.1 // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect

diff --git a/go.sum b/go.sum
@@ -1544,8 +1544,8 @@ go.viam.com/api v0.1.322 h1:bC78B6QOxUgfWU2rOvN+4n03gg1JgZUPF9VN49X9GQc=
 go.viam.com/api v0.1.322/go.mod h1:msa4TPrMVeRDcG4YzKA/S6wLEUC7GyHQE973JklrQ10=
 go.viam.com/test v1.1.1-0.20220913152726-5da9916c08a2 h1:oBiK580EnEIzgFLU4lHOXmGAE3MxnVbeR7s1wp/F3Ps=
 go.viam.com/test v1.1.1-0.20220913152726-5da9916c08a2/go.mod h1:XM0tej6riszsiNLT16uoyq1YjuYPWlRBweTPRDanIts=
-go.viam.com/utils v0.1.85 h1:dZHMTt0Wz4s+6J+ex6pwF2JCacHSdVEcDU2XeSyaPeY=
-go.viam.com/utils v0.1.85/go.mod h1:VDxTqGLWOvqKrCPECfMX799LDm3PPX6ATeLA6JSkDuY=
+go.viam.com/utils v0.1.87 h1:ogXDiWqOFGIosptZYhDpxz+8tr9p8tjVesyC+c6xa8g=
+go.viam.com/utils v0.1.87/go.mod h1:VDxTqGLWOvqKrCPECfMX799LDm3PPX6ATeLA6JSkDuY=
 go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 h1:WJhcL4p+YeDxmZWg141nRm7XC8IDmhz7lk5GpadO1Sg=
 go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
 gocv.io/x/gocv v0.25.0/go.mod h1:Rar2PS6DV+T4FL+PM535EImD/h13hGVaHhnCu1xarBs=

diff --git a/gostream/codec/audio_encoder.go b/gostream/codec/audio_encoder.go
@@ -4,8 +4,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/edaniels/golog"
 	"github.com/pion/mediadevices/pkg/wave"
+
+	"go.viam.com/rdk/logging"
 )
 
 // An AudioEncoder is anything that can encode audo chunks into bytes. This means that
@@ -18,6 +19,6 @@ type AudioEncoder interface {
 
 // An AudioEncoderFactory produces AudioEncoders and provides information about the underlying encoder itself.
 type AudioEncoderFactory interface {
-	New(sampleRate, channelCount int, latency time.Duration, logger golog.Logger) (AudioEncoder, error)
+	New(sampleRate, channelCount int, latency time.Duration, logger logging.Logger) (AudioEncoder, error)
 	MIMEType() string
 }