Skip to content

Commit bd85442

Browse files
stevenhrahul2393
andauthored
feat(spanner): configurable logger (#6958)
Expose logger in ClientConfig so consumers can set a logger. This is useful when using spannertest which logs a lot of harmless errors. Fixes: #6957 Co-authored-by: rahul2393 <[email protected]>
1 parent d5e2e0f commit bd85442

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

spanner/client.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ type ClientConfig struct {
143143
// Recommended format: ``application-or-tool-ID/major.minor.version``.
144144
UserAgent string
145145

146-
// logger is the logger to use for this client. If it is nil, all logging
146+
// Logger is the logger to use for this client. If it is nil, all logging
147147
// will be directed to the standard logger.
148-
logger *log.Logger
148+
Logger *log.Logger
149149
}
150150

151151
func contextWithOutgoingMetadata(ctx context.Context, md metadata.MD) context.Context {
@@ -220,7 +220,7 @@ func NewClientWithConfig(ctx context.Context, database string, config ClientConf
220220
config.incStep = DefaultSessionPoolConfig.incStep
221221
}
222222
// Create a session client.
223-
sc := newSessionClient(pool, database, config.UserAgent, sessionLabels, metadata.Pairs(resourcePrefixHeader, database), config.logger, config.CallOptions)
223+
sc := newSessionClient(pool, database, config.UserAgent, sessionLabels, metadata.Pairs(resourcePrefixHeader, database), config.Logger, config.CallOptions)
224224
// Create a session pool.
225225
config.SessionPoolConfig.sessionLabels = sessionLabels
226226
sp, err := newSessionPool(sc, config.SessionPoolConfig)
@@ -231,7 +231,7 @@ func NewClientWithConfig(ctx context.Context, database string, config ClientConf
231231
c = &Client{
232232
sc: sc,
233233
idleSessions: sp,
234-
logger: config.logger,
234+
logger: config.Logger,
235235
qo: getQueryOptions(config.QueryOptions),
236236
ro: config.ReadOptions,
237237
ao: config.ApplyOptions,

spanner/pdml_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func TestPartitionedUpdate_WithDeadline(t *testing.T) {
114114
logger := log.New(os.Stderr, "", log.LstdFlags)
115115
server, client, teardown := setupMockedTestServerWithConfig(t, ClientConfig{
116116
SessionPoolConfig: DefaultSessionPoolConfig,
117-
logger: logger,
117+
Logger: logger,
118118
})
119119
defer teardown()
120120

spanner/session_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@ func TestErrorOnPrepareSession(t *testing.T) {
11221122
WriteSessions: 0.5,
11231123
HealthCheckInterval: time.Millisecond,
11241124
},
1125-
logger: logger,
1125+
Logger: logger,
11261126
})
11271127
defer teardown()
11281128
// Discard logging until trying to prepare sessions has stopped.
@@ -1244,7 +1244,7 @@ func TestSessionNotFoundOnPrepareSession(t *testing.T) {
12441244
HealthCheckInterval: time.Millisecond,
12451245
healthCheckSampleInterval: time.Millisecond,
12461246
},
1247-
logger: logger,
1247+
Logger: logger,
12481248
})
12491249
defer teardown()
12501250
// Discard logging until trying to prepare sessions has stopped.

0 commit comments

Comments
 (0)