resolve merge conflicts

core/go.mod

@@ -63,6 +63,7 @@ require (
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/sync v0.8.0
+	google.golang.org/grpc v1.64.0
 	gorm.io/driver/sqlite v1.5.6
 	gorm.io/gorm v1.25.10
 	k8s.io/apimachinery v0.29.3
@@ -189,7 +190,6 @@ require (
 	golang.org/x/tools v0.24.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
-	google.golang.org/grpc v1.64.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect

core/metrics/multiexporter_test.go

@@ -1,11 +1,12 @@
-package metrics
+package metrics_test
 
 import (
 	"context"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/synapsecns/sanguine/core/metrics"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	"go.opentelemetry.io/otel/sdk/trace/tracetest"
 )
@@ -16,7 +17,7 @@ func TestMultiExporter(t *testing.T) {
 	exporter2 := tracetest.NewInMemoryExporter()
 
 	// Create multi-exporter
-	multiExporter := NewMultiExporter(exporter1, exporter2)
+	multiExporter := metrics.NewMultiExporter(exporter1, exporter2)
 
 	// Create test spans
 	spans := []sdktrace.ReadOnlySpan{

core/metrics/otlp.go

@@ -56,7 +56,7 @@ func (n *otlpHandler) Start(ctx context.Context) (err error) {
 		exporters = append(exporters, exporter)
 	}
 
-	// create the multi-exporter with optional secondary exporter
+	// create the multi-exporter with all the exporters
 	multiExporter := NewMultiExporter(exporters...)
 
 	n.baseHandler = newBaseHandler(