Skip to content

Commit 76b9c6f

Browse files
authored
Merge pull request #311 from ydb-platform/user-agent
Supported many user-agent records
2 parents 184d952 + bfcb029 commit 76b9c6f

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
* Supported many user-agent records
2+
13
## v3.30.0
24
* Added `ydb.RegisterParser(name string, parser func(value string) []ydb.Option)` function for register parser of specified param name (supporting additional params in connection string)
35
* Fixed writing `KeepInCacheFlag` in table traces

internal/meta/meta.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ type Option func(m *meta)
5656

5757
func WithUserAgentOption(userAgent string) Option {
5858
return func(m *meta) {
59-
m.userAgent = userAgent
59+
m.userAgents = append(m.userAgents, userAgent)
6060
}
6161
}
6262

@@ -90,7 +90,7 @@ type meta struct {
9090
credentials credentials.Credentials
9191
database string
9292
requestsType string
93-
userAgent string
93+
userAgents []string
9494
capabilities []string
9595
}
9696

@@ -114,10 +114,8 @@ func (m *meta) meta(ctx context.Context) (_ metadata.MD, err error) {
114114
}
115115
}
116116

117-
if m.userAgent != "" {
118-
if len(md.Get(HeaderUserAgent)) == 0 {
119-
md.Set(HeaderUserAgent, m.userAgent)
120-
}
117+
if len(m.userAgents) != 0 {
118+
md.Append(HeaderUserAgent, m.userAgents...)
121119
}
122120

123121
if len(m.capabilities) > 0 {

internal/meta/test/meta_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func TestMetaRequiredHeaders(t *testing.T) {
4141
testutil.Equal(t, []string{"database"}, md.Get(meta.HeaderDatabase))
4242
testutil.Equal(t, []string{"requestType"}, md.Get(meta.HeaderRequestType))
4343
testutil.Equal(t, []string{"token"}, md.Get(meta.HeaderTicket))
44-
testutil.Equal(t, []string{"userAgent"}, md.Get(meta.HeaderUserAgent))
44+
testutil.Equal(t, []string{"userAgent", "user-agent"}, md.Get(meta.HeaderUserAgent))
4545
testutil.Equal(t, []string{"traceID"}, md.Get(meta.HeaderTraceID))
4646
testutil.Equal(t, []string{
4747
"ydb-go-sdk/" + meta.VersionMajor + "." + meta.VersionMinor + "." + meta.VersionPatch,

0 commit comments

Comments
 (0)