fix tests

spanner/client.go

@@ -628,10 +628,11 @@ type wrappedStream struct {
 	grpc.ClientStream
 }
 
-func (w *wrappedStream) SendMsg(m any) error {
+func (w *wrappedStream) RecvMsg(m any) error {
 	attempt := &attemptTracer{}
 	attempt.setStartTime(time.Now())
-	err := w.ClientStream.SendMsg(m)
+	err := w.ClientStream.RecvMsg(m)
+	statusCode, _ := status.FromError(err)
 	ctx := w.ClientStream.Context()
 	mt, ok := ctx.Value(metricsTracerKey).(*builtinMetricsTracer)
 	if !ok || !w.isFirstRecv {
@@ -646,7 +647,6 @@ func (w *wrappedStream) SendMsg(m any) error {
 	if strings.HasPrefix(w.target, "google-c2p") {
 		mt.currOp.setDirectPathEnabled(true)
 	}
-	statusCode, _ := status.FromError(err)
 	isDirectPathUsed := false
 	peerInfo, ok := peer.FromContext(ctx)
 	if ok {
@@ -663,8 +663,8 @@ func (w *wrappedStream) SendMsg(m any) error {
 	return err
 }
 
-func (w *wrappedStream) RecvMsg(m any) error {
-	return w.ClientStream.RecvMsg(m)
+func (w *wrappedStream) SendMsg(m any) error {
+	return w.ClientStream.SendMsg(m)
 }
 
 func newWrappedStream(s grpc.ClientStream, method, target string) grpc.ClientStream {

spanner/metrics_test.go

@@ -102,6 +102,7 @@ func TestNewBuiltinMetricsTracerFactory(t *testing.T) {
 		wantCreateTSCallsCount int // No. of CreateTimeSeries calls
 		wantMethods            []string
 		wantOTELValue          map[string]map[string]int64
+		wantOTELMetrics        map[string][]string
 	}{
 		{
 			desc:                   "should create a new tracer factory with default meter provider",
@@ -119,6 +120,11 @@ func TestNewBuiltinMetricsTracerFactory(t *testing.T) {
 					nativeMetricsPrefix + metricNameOperationCount: 1,
 				},
 			},
+			wantOTELMetrics: map[string][]string{
+				createSessionRPC: wantMetricTypesGCM,
+				// since operation will be retries once we will have extra attempt latency for this operation
+				"Spanner.StreamingRead": append(wantMetricTypesGCM, nativeMetricsPrefix+metricNameAttemptLatencies),
+			},
 		},
 		{
 			desc:        "should not create instruments when SPANNER_EMULATOR_HOST is set",
@@ -201,7 +207,7 @@ func TestNewBuiltinMetricsTracerFactory(t *testing.T) {
 				}
 				for method, gotMetricTypes := range gotMetricTypesPerMethod {
 					sort.Strings(gotMetricTypes)
-					if !testutil.Equal(gotMetricTypes, wantMetricTypesGCM) {
+					if !testutil.Equal(gotMetricTypes, test.wantOTELMetrics[method]) {
 						t.Errorf("Metric types missing in req. %s got: %v, want: %v", method, gotMetricTypes, wantMetricTypesGCM)
 					}
 				}