fix(benchmarks): staticcheck errors (#325)

* fix(benchmarks): staticcheck errors * fix(benchmarks): fix formatting argument * chore(benchmarks/benchwrapper): regenerate protobuf * build: run staticchecks on benchmark folder --------- Co-authored-by: Knut Olav Løite <[email protected]>
googleapis · Nov 22, 2024 · 0ed841e · 0ed841e
1 parent 9d4f987
commit 0ed841e
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 134 deletions.
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -61,4 +61,8 @@ jobs:
 
       - name: staticcheck ./examples
         working-directory: ./examples
-        run: staticcheck -checks "inherit,-U1000" ./...
+        run: staticcheck -checks "inherit,-U1000" ./...
+
+      - name: staticcheck ./benchmarks
+        working-directory: ./benchmarks
+        run: staticcheck -checks "inherit,-U1000" ./...
diff --git a/benchmarks/benchwrapper/main.go b/benchmarks/benchwrapper/main.go
@@ -118,7 +118,9 @@ func (s *server) Update(ctx context.Context, req *pb.UpdateQuery) (*pb.EmptyResp
 	}
 	for _, q := range req.Queries {
 		_, err = tx.ExecContext(ctx, q)
-
+		if err != nil {
+			log.Fatalf("failed to execute query: %v", err)
+		}
 	}
 	// Run the active DML batch.
 	if _, err := tx.ExecContext(ctx, "RUN BATCH"); err != nil {

diff --git a/benchmarks/benchwrapper/proto/README.md b/benchmarks/benchwrapper/proto/README.md
@@ -1,4 +1,4 @@
 README.md
 Regenerating protos
 cd benchmarks/benchwrapper/proto
-protoc --go_out=plugins=grpc:. *.proto
+go generate .
diff --git a/benchmarks/benchwrapper/proto/gen.go b/benchmarks/benchwrapper/proto/gen.go
@@ -0,0 +1,19 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package main wraps the client library in a gRPC interface that a benchmarker
+// can communicate through.
+package proto
+
+//go:generate protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative *.proto
diff --git a/benchmarks/benchwrapper/proto/spanner.pb.go b/benchmarks/benchwrapper/proto/spanner.pb.go
diff --git a/benchmarks/benchwrapper/proto/spanner.proto b/benchmarks/benchwrapper/proto/spanner.proto
@@ -15,7 +15,7 @@
 syntax = "proto3";
 
 package spanner_bench;
-option go_package = "./spanner_bench";
+option go_package = "./proto";
 
 
 message Singer {