Skip to content

Commit 31ae6fa

Browse files
Deeven-SeruDeeven-Seru
committed
fix(telemetry): apply code review feedback and resolve conflicts
2 parents c1af459 + ff65eb1 commit 31ae6fa

593 files changed

Lines changed: 32889 additions & 11953 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ci/continuous.release.cloudbuild.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ steps:
9191
script: |
9292
#!/usr/bin/env bash
9393
gcloud storage cp toolbox.linux.amd64 gs://$_BUCKET_NAME/$REF_NAME/linux/amd64/toolbox
94-
gcloud storage cp toolbox.linux.amd64 gs://$_OLD_BUCKET_NAME/$REF_NAME/linux/amd64/toolbox
9594
9695
- id: "build-linux-amd64-geminicli"
9796
name: golang:1
@@ -150,7 +149,6 @@ steps:
150149
script: |
151150
#!/usr/bin/env bash
152151
gcloud storage cp toolbox.darwin.arm64 gs://$_BUCKET_NAME/$REF_NAME/darwin/arm64/toolbox
153-
gcloud storage cp toolbox.darwin.arm64 gs://$_OLD_BUCKET_NAME/$REF_NAME/darwin/arm64/toolbox
154152
155153
- id: "build-darwin-arm64-geminicli"
156154
name: golang:1
@@ -215,7 +213,6 @@ steps:
215213
script: |
216214
#!/usr/bin/env bash
217215
gcloud storage cp toolbox.darwin.amd64 gs://$_BUCKET_NAME/$REF_NAME/darwin/amd64/toolbox
218-
gcloud storage cp toolbox.darwin.amd64 gs://$_OLD_BUCKET_NAME/$REF_NAME/darwin/amd64/toolbox
219216
220217
- id: "build-darwin-amd64-geminicli"
221218
name: golang:1
@@ -273,7 +270,6 @@ steps:
273270
script: |
274271
#!/usr/bin/env bash
275272
gcloud storage cp toolbox.windows.amd64 gs://$_BUCKET_NAME/$REF_NAME/windows/amd64/toolbox.exe
276-
gcloud storage cp toolbox.windows.amd64 gs://$_OLD_BUCKET_NAME/$REF_NAME/windows/amd64/toolbox.exe
277273
278274
- id: "build-windows-amd64-geminicli"
279275
name: golang:1
@@ -308,7 +304,6 @@ substitutions:
308304
_REGION: us-central1
309305
_AR_HOSTNAME: ${_REGION}-docker.pkg.dev
310306
_AR_REPO_NAME: toolbox-dev
311-
_OLD_BUCKET_NAME: genai-toolbox-dev
312307
_BUCKET_NAME: mcp-toolbox-for-databases-dev
313308
_ASSETS_BUCKET: toolbox-build-assets
314309
_DOCKER_URI: ${_AR_HOSTNAME}/${PROJECT_ID}/${_AR_REPO_NAME}/toolbox

‎.ci/integration.cloudbuild.yaml‎

Lines changed: 82 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ steps:
141141
args:
142142
- -c
143143
- |
144-
PATTERN="alloydb|internal/sources/postgres|tests/postgres|internal/server/|tests/common.go|.ci/"
144+
PATTERN="alloydb|internal/sources/postgres|tests/postgres|internal/server/|tests/common.go|tests/tool.go|.ci/"
145145
146146
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
147147
echo "Relevant changes detected. Starting AlloyDB tests..."
@@ -266,7 +266,7 @@ steps:
266266
args:
267267
- -c
268268
- |
269-
PATTERN="bigtable|internal/server/|.ci/"
269+
PATTERN="bigtable|internal/server/|tests/common.go|tests/tool.go|.ci/"
270270
271271
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
272272
echo "Changes detected. Running Bigtable tests..."
@@ -294,7 +294,7 @@ steps:
294294
args:
295295
- -c
296296
- |
297-
PATTERN="bigquery|internal/server/|.ci/"
297+
PATTERN="bigquery|internal/server/|tests/common.go|tests/tool.go|.ci/"
298298
299299
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
300300
echo "Changes detected. Running BigQuery tests..."
@@ -322,7 +322,7 @@ steps:
322322
args:
323323
- -c
324324
- |
325-
PATTERN="cloudgda|internal/server/|.ci/"
325+
PATTERN="cloudgda|internal/server/|tests/common.go|tests/tool.go|.ci/"
326326
327327
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
328328
echo "Changes detected. Running Cloud Gemini Data Analytics tests..."
@@ -350,7 +350,7 @@ steps:
350350
args:
351351
- -c
352352
- |
353-
PATTERN="dataplex|internal/server/|.ci/"
353+
PATTERN="dataplex|internal/server/|tests/common.go|tests/tool.go|.ci/"
354354
355355
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
356356
echo "Changes detected. Running Dataplex tests..."
@@ -408,7 +408,7 @@ steps:
408408
args:
409409
- -c
410410
- |
411-
PATTERN="cloudhealthcare|internal/server/|.ci/"
411+
PATTERN="cloudhealthcare|internal/server/|tests/common.go|tests/tool.go|.ci/"
412412
413413
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
414414
echo "Changes detected. Running Cloud Healthcare API tests..."
@@ -435,7 +435,7 @@ steps:
435435
args:
436436
- -c
437437
- |
438-
PATTERN="cloudloggingadmin|internal/server/|.ci/"
438+
PATTERN="cloudloggingadmin|internal/server/|tests/common.go|tests/tool.go|.ci/"
439439
440440
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
441441
echo "Changes detected. Running Cloud Logging Admin tests..."
@@ -448,6 +448,34 @@ steps:
448448
exit 0
449449
fi
450450
451+
- id: "cloud-storage"
452+
name: golang:1
453+
waitFor: ["compile-test-binary", "detect-changes"]
454+
entrypoint: /bin/bash
455+
env:
456+
- "GOPATH=/gopath"
457+
- "CLOUD_STORAGE_PROJECT=$PROJECT_ID"
458+
- "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
459+
secretEnv: ["CLIENT_ID"]
460+
volumes:
461+
- name: "go"
462+
path: "/gopath"
463+
args:
464+
- -c
465+
- |
466+
PATTERN="cloudstorage|internal/server/|tests/common.go|tests/tool.go|.ci/"
467+
468+
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
469+
echo "Relevant changes detected. Running Cloud Storage tests..."
470+
.ci/test_with_coverage.sh \
471+
"Cloud Storage" \
472+
cloudstorage \
473+
cloudstorage
474+
else
475+
echo "No relevant changes for Cloud Storage. Skipping shard."
476+
exit 0
477+
fi
478+
451479
- id: "postgres"
452480
name: golang:1
453481
waitFor: ["compile-test-binary", "detect-changes"]
@@ -526,7 +554,7 @@ steps:
526554
args:
527555
- -c
528556
- |
529-
PATTERN="spanner|internal/server/|.ci/"
557+
PATTERN="spanner|internal/server/|tests/common.go|tests/tool.go|.ci/"
530558
531559
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
532560
echo "Changes detected. Running Spanner tests..."
@@ -554,7 +582,7 @@ steps:
554582
args:
555583
- -c
556584
- |
557-
PATTERN="neo4j|internal/server/|.ci/"
585+
PATTERN="neo4j|internal/server/|tests/common.go|tests/tool.go|.ci/"
558586
559587
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
560588
echo "Changes detected. Running Neo4j tests..."
@@ -721,7 +749,7 @@ steps:
721749
args:
722750
- -c
723751
- |
724-
PATTERN="http|internal/server/|.ci/"
752+
PATTERN="http|internal/server/|tests/common.go|tests/tool.go|.ci/"
725753
726754
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
727755
echo "Changes detected. Running HTTP tests..."
@@ -748,7 +776,7 @@ steps:
748776
args:
749777
- -c
750778
- |
751-
PATTERN="sqlite|internal/server/|.ci/"
779+
PATTERN="sqlite|internal/server/|tests/common.go|tests/tool.go|.ci/"
752780
753781
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
754782
echo "Changes detected. Running SQLite tests..."
@@ -775,7 +803,7 @@ steps:
775803
args:
776804
- -c
777805
- |
778-
PATTERN="couchbase|internal/server/|.ci/"
806+
PATTERN="couchbase|internal/server/|tests/common.go|tests/tool.go|.ci/"
779807
780808
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
781809
echo "Changes detected. Running Couchbase tests..."
@@ -860,7 +888,7 @@ steps:
860888
args:
861889
- -c
862890
- |
863-
PATTERN="oceanbase|internal/server/|.ci/"
891+
PATTERN="oceanbase|internal/server/|tests/common.go|tests/tool.go|.ci/"
864892
865893
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
866894
echo "Relevant changes detected. Running OceanBase tests..."
@@ -888,7 +916,7 @@ steps:
888916
args:
889917
- -c
890918
- |
891-
PATTERN="firestore|internal/server/|.ci/"
919+
PATTERN="firestore|internal/server/|tests/common.go|tests/tool.go|.ci/"
892920
893921
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
894922
echo "Relevant changes detected. Running Firestore tests..."
@@ -916,7 +944,7 @@ steps:
916944
args:
917945
- -c
918946
- |
919-
PATTERN="mongodb|internal/server/|.ci/"
947+
PATTERN="mongodb|internal/server/|tests/common.go|tests/tool.go|.ci/"
920948
921949
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
922950
echo "Relevant changes detected. Running MongoDB tests..."
@@ -953,7 +981,7 @@ steps:
953981
args:
954982
- -c
955983
- |
956-
PATTERN="looker|internal/server/|.ci/"
984+
PATTERN="looker|internal/server/|tests/common.go|tests/tool.go|.ci/"
957985
958986
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
959987
echo "Relevant changes detected. Running Looker tests..."
@@ -982,7 +1010,7 @@ steps:
9821010
args:
9831011
- -c
9841012
- |
985-
PATTERN="mindsdb|internal/server/|.ci/"
1013+
PATTERN="mindsdb|internal/server/|tests/common.go|tests/tool.go|.ci/"
9861014
9871015
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
9881016
echo "Relevant changes detected. Running MindsDB tests..."
@@ -1030,7 +1058,7 @@ steps:
10301058
args:
10311059
- -c
10321060
- |
1033-
PATTERN="tidb|internal/server/|.ci/"
1061+
PATTERN="tidb|internal/server/|tests/common.go|tests/tool.go|.ci/"
10341062
10351063
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
10361064
echo "Relevant changes detected. Running TiDB tests..."
@@ -1060,7 +1088,7 @@ steps:
10601088
args:
10611089
- -c
10621090
- |
1063-
PATTERN="firebird|internal/server/|.ci/"
1091+
PATTERN="firebird|internal/server/|tests/common.go|tests/tool.go|.ci/"
10641092
10651093
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
10661094
echo "Relevant changes detected. Running Firebird tests..."
@@ -1090,7 +1118,7 @@ steps:
10901118
args:
10911119
- -c
10921120
- |
1093-
PATTERN="clickhouse|internal/server/|.ci/"
1121+
PATTERN="clickhouse|internal/server/|tests/common.go|tests/tool.go|.ci/"
10941122
10951123
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
10961124
echo "Relevant changes detected. Running ClickHouse tests..."
@@ -1121,7 +1149,7 @@ steps:
11211149
args:
11221150
- -c
11231151
- |
1124-
PATTERN="trino|internal/server/|.ci/"
1152+
PATTERN="trino|internal/server/|tests/common.go|tests/tool.go|.ci/"
11251153
11261154
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
11271155
echo "Changes detected. Running Trino tests..."
@@ -1152,7 +1180,7 @@ steps:
11521180
args:
11531181
- -c
11541182
- |
1155-
PATTERN="yugabytedb|internal/server/|.ci/"
1183+
PATTERN="yugabytedb|internal/server/|tests/common.go|tests/tool.go|.ci/"
11561184
11571185
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
11581186
echo "Changes detected. Running YugabyteDB tests..."
@@ -1176,7 +1204,7 @@ steps:
11761204
args:
11771205
- -c
11781206
- |
1179-
PATTERN="elasticsearch|internal/server/|.ci/"
1207+
PATTERN="elasticsearch|internal/server/|tests/common.go|tests/tool.go|.ci/"
11801208
11811209
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
11821210
echo "Changes detected. Running Elasticsearch tests..."
@@ -1206,7 +1234,7 @@ steps:
12061234
args:
12071235
- -c
12081236
- |
1209-
PATTERN="snowflake|internal/server/|.ci/"
1237+
PATTERN="snowflake|internal/server/|tests/common.go|tests/tool.go|.ci/"
12101238
12111239
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
12121240
echo "Changes detected. Running Snowflake tests..."
@@ -1234,7 +1262,7 @@ steps:
12341262
args:
12351263
- -c
12361264
- |
1237-
PATTERN="cassandra|internal/server/|.ci/"
1265+
PATTERN="cassandra|internal/server/|tests/common.go|tests/tool.go|.ci/"
12381266
12391267
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
12401268
echo "Changes detected. Running Cassandra tests..."
@@ -1263,7 +1291,7 @@ steps:
12631291
args:
12641292
- -c
12651293
- |
1266-
PATTERN="oracle|internal/server/|.ci/"
1294+
PATTERN="oracle|internal/server/|tests/common.go|tests/tool.go|.ci/"
12671295
12681296
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
12691297
echo "Changes detected. Running Oracle tests..."
@@ -1282,8 +1310,8 @@ steps:
12821310
total_coverage=$(go tool cover -func=oracle_coverage.out | grep "total:" | awk '{print $3}')
12831311
echo "Oracle total coverage: $total_coverage"
12841312
coverage_numeric=$(echo "$total_coverage" | sed 's/%//')
1285-
if awk -v cov="$coverage_numeric" 'BEGIN {exit !(cov < 60)}'; then
1286-
echo "Coverage failure: $total_coverage is below 60%."
1313+
if awk -v cov="$coverage_numeric" 'BEGIN {exit !(cov < 55)}'; then
1314+
echo "Coverage failure: $total_coverage is below 55%."
12871315
exit 1
12881316
fi
12891317
else
@@ -1308,7 +1336,7 @@ steps:
13081336
args:
13091337
- -c
13101338
- |
1311-
PATTERN="serverlessspark|internal/server/|.ci/"
1339+
PATTERN="serverlessspark|internal/server/|tests/common.go|tests/tool.go|.ci/"
13121340
13131341
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
13141342
echo "Changes detected. Running Serverless Spark tests..."
@@ -1357,7 +1385,7 @@ steps:
13571385
args:
13581386
- -c
13591387
- |
1360-
PATTERN="singlestore|internal/server/|.ci/"
1388+
PATTERN="singlestore|internal/server/|tests/common.go|tests/tool.go|.ci/"
13611389
13621390
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
13631391
echo "Changes detected. Running SingleStore tests..."
@@ -1399,6 +1427,30 @@ steps:
13991427
exit 0
14001428
fi
14011429
1430+
- id: "auth"
1431+
name: golang:1
1432+
waitFor: ["compile-test-binary", "detect-changes"]
1433+
entrypoint: /bin/bash
1434+
env:
1435+
- "GOPATH=/gopath"
1436+
- "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
1437+
secretEnv: ["CLIENT_ID"]
1438+
volumes:
1439+
- name: "go"
1440+
path: "/gopath"
1441+
args:
1442+
- -c
1443+
- |
1444+
PATTERN="auth/|tests/auth/|internal/server/|tests/common.go|tests/tool.go|.ci/"
1445+
1446+
if grep -qE "$$PATTERN" /workspace/changed_files.txt; then
1447+
# skip coverage check for auth framework
1448+
./auth.test -test.v
1449+
else
1450+
echo "No relevant changes for Auth. Skipping shard."
1451+
exit 0
1452+
fi
1453+
14021454
availableSecrets:
14031455
secretManager:
14041456
# Common secrets

0 commit comments

Comments
 (0)