test

spanner/test/cloudexecutor/executor/internal/inputstream/handler.go

@@ -112,7 +112,7 @@ func getCloudTraceClientOptions() ([]option.ClientOption, error) {
 	log.Printf("serviceKeyFile contents: %v\n", fileContents)
 
 	var traceClientOpts []option.ClientOption
-	traceClientOpts = append(traceClientOpts, option.WithEndpoint("cloudtrace.googleapis.com:443"))
+	traceClientOpts = append(traceClientOpts, option.WithEndpoint("staging-cloudtrace.sandbox.googleapis.com:443"))
 
 	// perRPCCredentials, err := oauth.NewJWTAccessFromKey(cloudSystestCredentialsJSON)
 	// if err != nil {
@@ -160,6 +160,7 @@ func (h *CloudStreamHandler) startHandlingRequest(ctx context.Context, req *exec
 	if err != nil {
 		return outcomeSender.FinishWithError(err)
 	}
+	actionHandlerType := actionHandlerType(inputAction)
 
 	// Setup trace context propagation.
 	tc := propagation.TraceContext{}
@@ -183,16 +184,16 @@ func (h *CloudStreamHandler) startHandlingRequest(ctx context.Context, req *exec
 	}
 	tp := sdktrace.NewTracerProvider(
 		sdktrace.WithBatcher(traceExporter),
-		sdktrace.WithSampler(sdktrace.AlwaysSample()),
+		sdktrace.WithSampler(sdktrace.TraceIDRatioBased(0.1)),
 	)
 	defer func() { _ = tp.Shutdown(ctx) }()
 
 	otel.SetTracerProvider(tp)
 
-	tracer := tp.Tracer("nareshz-test.com/trace")
+	tracer := tp.Tracer("nareshz-systest.com/trace")
 
 	// Create a span for the systest action.
-	ctx, span := tracer.Start(ctx, "systestactiontrace")
+	ctx, span := tracer.Start(ctx, fmt.Sprintf("systestaction_%v", actionHandlerType))
 	defer span.End()
 
 	// Create a channel to receive the error from the goroutine.
@@ -222,6 +223,44 @@ func (h *CloudStreamHandler) startHandlingRequest(ctx context.Context, req *exec
 	}
 }
 
+// newActionHandler instantiates an actionHandler for executing the given action.
+func actionHandlerType(action *executorpb.SpannerAction) string {
+	switch action.GetAction().(type) {
+	case *executorpb.SpannerAction_Start:
+		return "SpannerAction_Start"
+	case *executorpb.SpannerAction_Finish:
+		return "SpannerAction_Finish"
+	case *executorpb.SpannerAction_Admin:
+		return "SpannerAction_Admin"
+	case *executorpb.SpannerAction_Read:
+		return "SpannerAction_Read"
+	case *executorpb.SpannerAction_Query:
+		return "SpannerAction_Query"
+	case *executorpb.SpannerAction_Mutation:
+		return "SpannerAction_Mutation"
+	case *executorpb.SpannerAction_Write:
+		return "SpannerAction_Write"
+	case *executorpb.SpannerAction_Dml:
+		return "SpannerAction_Dml"
+	case *executorpb.SpannerAction_StartBatchTxn:
+		return "SpannerAction_StartBatchTxn"
+	case *executorpb.SpannerAction_GenerateDbPartitionsRead:
+		return "SpannerAction_GenerateDbPartitionsRead"
+	case *executorpb.SpannerAction_GenerateDbPartitionsQuery:
+		return "SpannerAction_GenerateDbPartitionsQuery"
+	case *executorpb.SpannerAction_ExecutePartition:
+		return "SpannerAction_ExecutePartition"
+	case *executorpb.SpannerAction_PartitionedUpdate:
+		return "SpannerAction_PartitionedUpdate"
+	case *executorpb.SpannerAction_CloseBatchTxn:
+		return "SpannerAction_CloseBatchTxn"
+	case *executorpb.SpannerAction_BatchDml:
+		return "SpannerAction_BatchDml"
+	default:
+		return "SpannerAction_default"
+	}
+}
+
 // newActionHandler instantiates an actionHandler for executing the given action.
 func (h *CloudStreamHandler) newActionHandler(action *executorpb.SpannerAction, outcomeSender *outputstream.OutcomeSender) (cloudActionHandler, error) {
 	if action.DatabasePath != "" {