Skip to content

Commit 367726c

Browse files
renovate-botolavloite
renovate-bot
and
olavloite
authored
deps: update deps (#306)
* deps: update deps * chore: run go mod tidy * chore: run go mod tidy in subfolders * chore: use insecure credentials * fix: disable native metrics when there are no credentials * build: remove go 1.21 workflows --------- Co-authored-by: Knut Olav Løite <koloite@gmail.com>
1 parent a0bc939 commit 367726c

File tree

14 files changed

+150
-135
lines changed

14 files changed

+150
-135
lines changed

‎.github/workflows/integration-tests-on-emulator.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Install Go
1818
uses: actions/setup-go@v5
1919
with:
20-
go-version: 1.22.x
20+
go-version: 1.23.x
2121
- name: Checkout code
2222
uses: actions/checkout@v4
2323
- name: Run integration tests on emulator

‎.github/workflows/integration-tests-on-production.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install Go
2626
uses: actions/setup-go@v5
2727
with:
28-
go-version: 1.22.x
28+
go-version: 1.23.x
2929
- name: Checkout code
3030
uses: actions/checkout@v4
3131
- name: Auth

‎.github/workflows/samples.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
samples:
77
strategy:
88
matrix:
9-
go-version: [1.21.x, 1.22.x, 1.23.x]
9+
go-version: [1.22.x, 1.23.x]
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Install Go

‎.github/workflows/unit-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
test:
99
strategy:
1010
matrix:
11-
go-version: [1.21.x, 1.22.x, 1.23.x]
11+
go-version: [1.22.x, 1.23.x]
1212
os: [ubuntu-latest, macos-latest, windows-latest]
1313
runs-on: ${{ matrix.os }}
1414
steps:

‎benchmarks/go.mod‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
11
module github.com/googleapis/go-sql-spanner/benchmarks
22

3-
go 1.21
3+
go 1.22.7
4+
5+
toolchain go1.22.9
46

57
replace github.com/googleapis/go-sql-spanner => ../
68

79
require (
810
cloud.google.com/go v0.116.0
9-
cloud.google.com/go/spanner v1.70.0
11+
cloud.google.com/go/spanner v1.72.0
1012
github.com/google/uuid v1.6.0
11-
github.com/googleapis/go-sql-spanner v1.7.3
12-
google.golang.org/api v0.201.0
13-
google.golang.org/grpc v1.67.1
13+
github.com/googleapis/go-sql-spanner v1.7.4
14+
google.golang.org/api v0.205.0
15+
google.golang.org/grpc v1.68.0
1416
google.golang.org/protobuf v1.35.1
1517
)
1618

1719
require (
18-
cel.dev/expr v0.16.0 // indirect
19-
cloud.google.com/go/auth v0.9.8 // indirect
20-
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
20+
cel.dev/expr v0.16.1 // indirect
21+
cloud.google.com/go/auth v0.10.1 // indirect
22+
cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect
2123
cloud.google.com/go/compute/metadata v0.5.2 // indirect
22-
cloud.google.com/go/iam v1.2.1 // indirect
23-
cloud.google.com/go/longrunning v0.6.1 // indirect
24-
cloud.google.com/go/monitoring v1.21.1 // indirect
24+
cloud.google.com/go/iam v1.2.2 // indirect
25+
cloud.google.com/go/longrunning v0.6.2 // indirect
26+
cloud.google.com/go/monitoring v1.21.2 // indirect
2527
github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.0 // indirect
2628
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect
2729
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
2830
github.com/cespare/xxhash/v2 v2.3.0 // indirect
29-
github.com/cncf/xds/go v0.0.0-20240822171458-6449f94b4d59 // indirect
31+
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
3032
github.com/envoyproxy/go-control-plane v0.13.0 // indirect
3133
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
3234
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -53,7 +55,7 @@ require (
5355
golang.org/x/sys v0.26.0 // indirect
5456
golang.org/x/text v0.19.0 // indirect
5557
golang.org/x/time v0.7.0 // indirect
56-
google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 // indirect
57-
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
58-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
58+
google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28 // indirect
59+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
60+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
5961
)

‎benchmarks/go.sum‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
cel.dev/expr v0.16.0 h1:yloc84fytn4zmJX2GU3TkXGsaieaV7dQ057Qs4sIG2Y=
2-
cel.dev/expr v0.16.0/go.mod h1:TRSuuV7DlVCE/uwv5QbAiW/v8l5O8C4eEPHeu7gf7Sg=
1+
cel.dev/expr v0.16.1 h1:NR0+oFYzR1CqLFhTAqg3ql59G9VfN8fKq1TCHJ6gq1g=
2+
cel.dev/expr v0.16.1/go.mod h1:AsGA5zb3WruAEQeQng1RZdGEXmBj0jvMWh6l5SnNuC8=
33
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
44
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
55
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -101,10 +101,10 @@ cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVo
101101
cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo=
102102
cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0=
103103
cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E=
104-
cloud.google.com/go/auth v0.9.8 h1:+CSJ0Gw9iVeSENVCKJoLHhdUykDgXSc4Qn+gu2BRtR8=
105-
cloud.google.com/go/auth v0.9.8/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI=
106-
cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY=
107-
cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc=
104+
cloud.google.com/go/auth v0.10.1 h1:TnK46qldSfHWt2a0b/hciaiVJsmDXWy9FqyUan0uYiI=
105+
cloud.google.com/go/auth v0.10.1/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI=
106+
cloud.google.com/go/auth/oauth2adapt v0.2.5 h1:2p29+dePqsCHPP1bqDJcKj4qxRyYCcbzKpFyKGt3MTk=
107+
cloud.google.com/go/auth/oauth2adapt v0.2.5/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8=
108108
cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0=
109109
cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8=
110110
cloud.google.com/go/automl v1.7.0/go.mod h1:RL9MYCCsJEOmt0Wf3z9uzG0a7adTT1fe+aObgSpkCt8=
@@ -319,8 +319,8 @@ cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGE
319319
cloud.google.com/go/iam v0.11.0/go.mod h1:9PiLDanza5D+oWFZiH1uG+RnRCfEGKoyl6yo4cgWZGY=
320320
cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY=
321321
cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0=
322-
cloud.google.com/go/iam v1.2.1 h1:QFct02HRb7H12J/3utj0qf5tobFh9V4vR6h9eX5EBRU=
323-
cloud.google.com/go/iam v1.2.1/go.mod h1:3VUIJDPpwT6p/amXRC5GY8fCCh70lxPygguVtI0Z4/g=
322+
cloud.google.com/go/iam v1.2.2 h1:ozUSofHUGf/F4tCNy/mu9tHLTaxZFLOUiKzjcgWHGIA=
323+
cloud.google.com/go/iam v1.2.2/go.mod h1:0Ys8ccaZHdI1dEUilwzqng/6ps2YB6vRsjIe00/+6JY=
324324
cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc=
325325
cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A=
326326
cloud.google.com/go/iap v1.6.0/go.mod h1:NSuvI9C/j7UdjGjIde7t7HBz+QTwBcapPE07+sSRcLk=
@@ -353,8 +353,8 @@ cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeN
353353
cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
354354
cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc=
355355
cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo=
356-
cloud.google.com/go/longrunning v0.6.1 h1:lOLTFxYpr8hcRtcwWir5ITh1PAKUD/sG2lKrTSYjyMc=
357-
cloud.google.com/go/longrunning v0.6.1/go.mod h1:nHISoOZpBcmlwbJmiVk5oDRz0qG/ZxPynEGs1iZ79s0=
356+
cloud.google.com/go/longrunning v0.6.2 h1:xjDfh1pQcWPEvnfjZmwjKQEcHnpz6lHjfy7Fo0MK+hc=
357+
cloud.google.com/go/longrunning v0.6.2/go.mod h1:k/vIs83RN4bE3YCswdXC5PFfWVILjm3hpEUlSko4PiI=
358358
cloud.google.com/go/managedidentities v1.3.0/go.mod h1:UzlW3cBOiPrzucO5qWkNkh0w33KFtBJU281hacNvsdE=
359359
cloud.google.com/go/managedidentities v1.4.0/go.mod h1:NWSBYbEMgqmbZsLIyKvxrYbtqOsxY1ZrGM+9RgDqInM=
360360
cloud.google.com/go/managedidentities v1.5.0/go.mod h1:+dWcZ0JlUmpuxpIDfyP5pP5y0bLdRwOS4Lp7gMni/LA=
@@ -378,8 +378,8 @@ cloud.google.com/go/monitoring v1.7.0/go.mod h1:HpYse6kkGo//7p6sT0wsIC6IBDET0RhI
378378
cloud.google.com/go/monitoring v1.8.0/go.mod h1:E7PtoMJ1kQXWxPjB6mv2fhC5/15jInuulFdYYtlcvT4=
379379
cloud.google.com/go/monitoring v1.12.0/go.mod h1:yx8Jj2fZNEkL/GYZyTLS4ZtZEZN8WtDEiEqG4kLK50w=
380380
cloud.google.com/go/monitoring v1.13.0/go.mod h1:k2yMBAB1H9JT/QETjNkgdCGD9bPF712XiLTVr+cBrpw=
381-
cloud.google.com/go/monitoring v1.21.1 h1:zWtbIoBMnU5LP9A/fz8LmWMGHpk4skdfeiaa66QdFGc=
382-
cloud.google.com/go/monitoring v1.21.1/go.mod h1:Rj++LKrlht9uBi8+Eb530dIrzG/cU/lB8mt+lbeFK1c=
381+
cloud.google.com/go/monitoring v1.21.2 h1:FChwVtClH19E7pJ+e0xUhJPGksctZNVOk2UhMmblmdU=
382+
cloud.google.com/go/monitoring v1.21.2/go.mod h1:hS3pXvaG8KgWTSz+dAdyzPrGUYmi2Q+WFX8g2hqVEZU=
383383
cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA=
384384
cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o=
385385
cloud.google.com/go/networkconnectivity v1.6.0/go.mod h1:OJOoEXW+0LAxHh89nXd64uGG+FbQoeH8DtxCHVOMlaM=
@@ -526,8 +526,8 @@ cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+
526526
cloud.google.com/go/spanner v1.41.0/go.mod h1:MLYDBJR/dY4Wt7ZaMIQ7rXOTLjYrmxLE/5ve9vFfWos=
527527
cloud.google.com/go/spanner v1.44.0/go.mod h1:G8XIgYdOK+Fbcpbs7p2fiprDw4CaZX63whnSMLVBxjk=
528528
cloud.google.com/go/spanner v1.45.0/go.mod h1:FIws5LowYz8YAE1J8fOS7DJup8ff7xJeetWEo5REA2M=
529-
cloud.google.com/go/spanner v1.70.0 h1:nj6p/GJTgMDiSQ1gQ034ItsKuJgHiMOjtOlONOg8PSo=
530-
cloud.google.com/go/spanner v1.70.0/go.mod h1:X5T0XftydYp0K1adeJQDJtdWpbrOeJ7wHecM4tK6FiE=
529+
cloud.google.com/go/spanner v1.72.0 h1:8hOxGVi0gaOWdxzDxyjYL4g/unjVUy2uje1T3okTgiQ=
530+
cloud.google.com/go/spanner v1.72.0/go.mod h1:mw98ua5ggQXVWwp83yjwggqEmW9t8rjs9Po1ohcUGW4=
531531
cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM=
532532
cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ=
533533
cloud.google.com/go/speech v1.8.0/go.mod h1:9bYIl1/tjsAnMgKGHKmBZzXKEkGgtU+MpdDPTE9f7y0=
@@ -658,8 +658,8 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH
658658
github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
659659
github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
660660
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
661-
github.com/cncf/xds/go v0.0.0-20240822171458-6449f94b4d59 h1:fLZ97KE86ELjEYJCEUVzmbhfzDxHHGwBrDVMd4XL6Bs=
662-
github.com/cncf/xds/go v0.0.0-20240822171458-6449f94b4d59/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
661+
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 h1:QVw89YDxXxEe+l8gU8ETbOasdwEV+avkR75ZzsVV9WI=
662+
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
663663
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
664664
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
665665
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -1351,8 +1351,8 @@ google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/
13511351
google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI=
13521352
google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0=
13531353
google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg=
1354-
google.golang.org/api v0.201.0 h1:+7AD9JNM3tREtawRMu8sOjSbb8VYcYXJG/2eEOmfDu0=
1355-
google.golang.org/api v0.201.0/go.mod h1:HVY0FCHVs89xIW9fzf/pBvOEm+OolHa86G/txFezyq4=
1354+
google.golang.org/api v0.205.0 h1:LFaxkAIpDb/GsrWV20dMMo5MR0h8UARTbn24LmD+0Pg=
1355+
google.golang.org/api v0.205.0/go.mod h1:NrK1EMqO8Xk6l6QwRAmrXXg2v6dzukhlOyvkYtnvUuc=
13561356
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
13571357
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
13581358
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -1492,12 +1492,12 @@ google.golang.org/genproto v0.0.0-20230323212658-478b75c54725/go.mod h1:UUQDJDOl
14921492
google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
14931493
google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
14941494
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
1495-
google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 h1:Df6WuGvthPzc+JiQ/G+m+sNX24kc0aTBqoDN/0yyykE=
1496-
google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53/go.mod h1:fheguH3Am2dGp1LfXkrvwqC/KlFq8F0nLq3LryOMrrE=
1497-
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 h1:T6rh4haD3GVYsgEfWExoCZA2o2FmbNyKpTuAxbEFPTg=
1498-
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:wp2WsuBYj6j8wUdo3ToZsdxxixbvQNAHqVJrTgi5E5M=
1499-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
1500-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
1495+
google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28 h1:KJjNNclfpIkVqrZlTWcgOOaVQ00LdBnoEaRfkUx760s=
1496+
google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:mt9/MofW7AWQ+Gy179ChOnvmJatV8YHUmrcedo9CIFI=
1497+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 h1:2oV8dfuIkM1Ti7DwXc0BJfnwr9csz4TDXI9EmiI+Rbw=
1498+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38/go.mod h1:vuAjtvlwkDKF6L1GQ0SokiRLCGFfeBUXWr/aFFkHACc=
1499+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE=
1500+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
15011501
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
15021502
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
15031503
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -1539,8 +1539,8 @@ google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5v
15391539
google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
15401540
google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
15411541
google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
1542-
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
1543-
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
1542+
google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=
1543+
google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA=
15441544
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
15451545
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
15461546
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=

‎driver.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
"google.golang.org/api/option"
3636
"google.golang.org/grpc"
3737
"google.golang.org/grpc/codes"
38+
"google.golang.org/grpc/credentials/insecure"
3839
"google.golang.org/grpc/status"
3940
"google.golang.org/protobuf/proto"
4041
"google.golang.org/protobuf/reflect/protoreflect"
@@ -205,9 +206,16 @@ func newConnector(d *Driver, dsn string) (*connector, error) {
205206
if strval, ok := connectorConfig.params["credentialsjson"]; ok {
206207
opts = append(opts, option.WithCredentialsJSON([]byte(strval)))
207208
}
209+
config := spanner.ClientConfig{
210+
SessionPoolConfig: spanner.DefaultSessionPoolConfig,
211+
}
208212
if strval, ok := connectorConfig.params["useplaintext"]; ok {
209213
if val, err := strconv.ParseBool(strval); err == nil && val {
210-
opts = append(opts, option.WithGRPCDialOption(grpc.WithInsecure()), option.WithoutAuthentication())
214+
opts = append(opts,
215+
option.WithGRPCDialOption(grpc.WithTransportCredentials(insecure.NewCredentials())),
216+
option.WithoutAuthentication())
217+
// TODO: Add connection string property for disabling native metrics.
218+
config.DisableNativeMetrics = true
211219
}
212220
}
213221
retryAbortsInternally := true
@@ -216,9 +224,6 @@ func newConnector(d *Driver, dsn string) (*connector, error) {
216224
retryAbortsInternally = false
217225
}
218226
}
219-
config := spanner.ClientConfig{
220-
SessionPoolConfig: spanner.DefaultSessionPoolConfig,
221-
}
222227
if strval, ok := connectorConfig.params["minsessions"]; ok {
223228
if val, err := strconv.ParseUint(strval, 10, 64); err == nil {
224229
config.MinOpened = val

‎driver_test.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,9 @@ func TestExtractDnsParts(t *testing.T) {
100100
},
101101
},
102102
wantSpannerConfig: spanner.ClientConfig{
103-
SessionPoolConfig: spanner.DefaultSessionPoolConfig,
104-
UserAgent: userAgent,
103+
SessionPoolConfig: spanner.DefaultSessionPoolConfig,
104+
UserAgent: userAgent,
105+
DisableNativeMetrics: true,
105106
},
106107
},
107108
{
@@ -149,8 +150,9 @@ func TestExtractDnsParts(t *testing.T) {
149150
},
150151
},
151152
wantSpannerConfig: spanner.ClientConfig{
152-
SessionPoolConfig: spanner.DefaultSessionPoolConfig,
153-
UserAgent: userAgent,
153+
SessionPoolConfig: spanner.DefaultSessionPoolConfig,
154+
UserAgent: userAgent,
155+
DisableNativeMetrics: true,
154156
},
155157
},
156158
{

‎driver_with_mockserver_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2584,6 +2584,7 @@ func setupMockedTestServerWithConfigAndClientOptions(t *testing.T, config spanne
25842584
opts = append(opts, clientOptions...)
25852585
ctx := context.Background()
25862586
formattedDatabase := fmt.Sprintf("projects/%s/instances/%s/databases/%s", "[PROJECT]", "[INSTANCE]", "[DATABASE]")
2587+
config.DisableNativeMetrics = true
25872588
client, err := spanner.NewClientWithConfig(ctx, formattedDatabase, config, opts...)
25882589
if err != nil {
25892590
t.Fatal(err)

‎examples/go.mod‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
11
module github.com/googleapis/go-sql-spanner/examples
22

3-
go 1.21
3+
go 1.22.7
4+
5+
toolchain go1.22.9
46

57
replace github.com/googleapis/go-sql-spanner => ../
68

79
require (
810
cloud.google.com/go v0.116.0
9-
cloud.google.com/go/spanner v1.70.0
11+
cloud.google.com/go/spanner v1.72.0
1012
github.com/docker/docker v25.0.6+incompatible
1113
github.com/docker/go-connections v0.4.0
1214
github.com/googleapis/go-sql-spanner v1.0.1
1315
)
1416

1517
require (
16-
cel.dev/expr v0.16.0 // indirect
17-
cloud.google.com/go/auth v0.9.8 // indirect
18-
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
18+
cel.dev/expr v0.16.1 // indirect
19+
cloud.google.com/go/auth v0.10.1 // indirect
20+
cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect
1921
cloud.google.com/go/compute/metadata v0.5.2 // indirect
20-
cloud.google.com/go/iam v1.2.1 // indirect
21-
cloud.google.com/go/longrunning v0.6.1 // indirect
22-
cloud.google.com/go/monitoring v1.21.1 // indirect
22+
cloud.google.com/go/iam v1.2.2 // indirect
23+
cloud.google.com/go/longrunning v0.6.2 // indirect
24+
cloud.google.com/go/monitoring v1.21.2 // indirect
2325
github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.0 // indirect
2426
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect
2527
github.com/Microsoft/go-winio v0.6.1 // indirect
2628
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
2729
github.com/cespare/xxhash/v2 v2.3.0 // indirect
28-
github.com/cncf/xds/go v0.0.0-20240822171458-6449f94b4d59 // indirect
30+
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
2931
github.com/containerd/log v0.1.0 // indirect
3032
github.com/distribution/reference v0.5.0 // indirect
3133
github.com/docker/go-units v0.5.0 // indirect
@@ -65,11 +67,11 @@ require (
6567
golang.org/x/text v0.19.0 // indirect
6668
golang.org/x/time v0.7.0 // indirect
6769
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
68-
google.golang.org/api v0.201.0 // indirect
69-
google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 // indirect
70-
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
71-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
72-
google.golang.org/grpc v1.67.1 // indirect
70+
google.golang.org/api v0.205.0 // indirect
71+
google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28 // indirect
72+
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
73+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
74+
google.golang.org/grpc v1.68.0 // indirect
7375
google.golang.org/protobuf v1.35.1 // indirect
7476
gotest.tools/v3 v3.5.1 // indirect
7577
)

0 commit comments

Comments
 (0)