fix: Change WithTraceProvider to WithTracerProvider

Author: reggiemcdonald

instrumentation/github.com/gocql/gocql/config.go

@@ -25,7 +25,7 @@ import (
 // TracedSessionConfig provides configuration for sessions
 // created with NewSessionWithTracing.
 type TracedSessionConfig struct {
-	traceProvider     trace.Provider
+	tracerProvider    trace.Provider
 	meterProvider     metric.Provider
 	instrumentQuery   bool
 	instrumentBatch   bool
@@ -80,11 +80,11 @@ func WithConnectObserver(observer gocql.ConnectObserver) TracedSessionOption {
 	})
 }
 
-// WithTraceProvider will set the trace provider used to get a tracer
+// WithTracerProvider will set the trace provider used to get a tracer
 // for creating spans. Defaults to global.TraceProvider()
-func WithTraceProvider(provider trace.Provider) TracedSessionOption {
+func WithTracerProvider(provider trace.Provider) TracedSessionOption {
 	return TracedSessionOptionFunc(func(c *TracedSessionConfig) {
-		c.traceProvider = provider
+		c.tracerProvider = provider
 	})
 }
 
@@ -125,7 +125,7 @@ func WithConnectInstrumentation(enabled bool) TracedSessionOption {
 
 func configure(options ...TracedSessionOption) *TracedSessionConfig {
 	config := &TracedSessionConfig{
-		traceProvider:     global.TraceProvider(),
+		tracerProvider:    global.TraceProvider(),
 		meterProvider:     global.MeterProvider(),
 		instrumentQuery:   true,
 		instrumentBatch:   true,

instrumentation/github.com/gocql/gocql/gocql.go

@@ -29,7 +29,7 @@ import (
 func NewSessionWithTracing(ctx context.Context, cluster *gocql.ClusterConfig, options ...TracedSessionOption) (*gocql.Session, error) {
 	config := configure(options...)
 	instruments := newInstruments(config.meterProvider)
-	tracer := config.traceProvider.Tracer(
+	tracer := config.tracerProvider.Tracer(
 		instrumentationName,
 		trace.WithInstrumentationVersion(otelcontrib.SemVersion()),
 	)

instrumentation/github.com/gocql/gocql/gocql_test.go

@@ -89,16 +89,16 @@ func mockExportPipeline(t *testing.T) *push.Controller {
 	return controller
 }
 
-type mockTraceProvider struct {
+type mockTracerProvider struct {
 	tracer *mocktracer.Tracer
 }
 
-func (p *mockTraceProvider) Tracer(name string, options ...trace.TracerOption) trace.Tracer {
+func (p *mockTracerProvider) Tracer(name string, options ...trace.TracerOption) trace.Tracer {
 	return p.tracer
 }
 
-func newTraceProvider() *mockTraceProvider {
-	return &mockTraceProvider{
+func newTracerProvider() *mockTracerProvider {
+	return &mockTracerProvider{
 		mocktracer.NewTracer(instrumentationName),
 	}
 }
@@ -122,14 +122,14 @@ func TestQuery(t *testing.T) {
 	controller := getController(t)
 	defer afterEach()
 	cluster := getCluster()
-	traceProvider := newTraceProvider()
+	tracerProvider := newTracerProvider()
 
-	ctx, parentSpan := traceProvider.tracer.Start(context.Background(), "gocql-test")
+	ctx, parentSpan := tracerProvider.tracer.Start(context.Background(), "gocql-test")
 
 	session, err := NewSessionWithTracing(
 		ctx,
 		cluster,
-		WithTraceProvider(traceProvider),
+		WithTracerProvider(tracerProvider),
 		WithMeterProvider(controller.Provider()),
 		WithConnectInstrumentation(false),
 	)
@@ -147,7 +147,7 @@ func TestQuery(t *testing.T) {
 	parentSpan.End()
 
 	// Get the spans and ensure that they are child spans to the local parent
-	spans := traceProvider.tracer.EndedSpans()
+	spans := tracerProvider.tracer.EndedSpans()
 
 	// Collect all the connection spans
 	// total spans:
@@ -244,14 +244,14 @@ func TestBatch(t *testing.T) {
 	controller := getController(t)
 	defer afterEach()
 	cluster := getCluster()
-	traceProvider := newTraceProvider()
+	tracerProvider := newTracerProvider()
 
-	ctx, parentSpan := traceProvider.tracer.Start(context.Background(), "gocql-test")
+	ctx, parentSpan := tracerProvider.tracer.Start(context.Background(), "gocql-test")
 
 	session, err := NewSessionWithTracing(
 		ctx,
 		cluster,
-		WithTraceProvider(traceProvider),
+		WithTracerProvider(tracerProvider),
 		WithMeterProvider(controller.Provider()),
 		WithConnectInstrumentation(false),
 	)
@@ -271,7 +271,7 @@ func TestBatch(t *testing.T) {
 
 	parentSpan.End()
 
-	spans := traceProvider.tracer.EndedSpans()
+	spans := tracerProvider.tracer.EndedSpans()
 	// total spans:
 	// 1 span for the query
 	// 1 span for the local span
@@ -342,22 +342,22 @@ func TestConnection(t *testing.T) {
 	controller := getController(t)
 	defer afterEach()
 	cluster := getCluster()
-	traceProvider := newTraceProvider()
+	tracerProvider := newTracerProvider()
 	connectObserver := &mockConnectObserver{0}
 	ctx := context.Background()
 
 	session, err := NewSessionWithTracing(
 		ctx,
 		cluster,
-		WithTraceProvider(traceProvider),
+		WithTracerProvider(tracerProvider),
 		WithMeterProvider(controller.Provider()),
 		WithConnectObserver(connectObserver),
 	)
 	require.NoError(t, err)
 	defer session.Close()
 	require.NoError(t, session.AwaitSchemaAgreement(ctx))
 
-	spans := traceProvider.tracer.EndedSpans()
+	spans := tracerProvider.tracer.EndedSpans()
 
 	assert.Less(t, 0, connectObserver.callCount)
 

instrumentation/github.com/gocql/gocql/instrument.go

@@ -40,7 +40,7 @@ type instruments struct {
 	latency metric.Int64ValueRecorder
 }
 
-// newInstruments will recreate instruments using a meter
+// newInstruments will create instruments using a meter
 // from the given provider p.
 func newInstruments(p metric.Provider) *instruments {
 	meter := p.Meter(