Skip to content

Commit

Permalink
Strip off package name for telemetry policy (#21894)
Browse files Browse the repository at this point in the history
If a fully qualified module name is provided.
  • Loading branch information
jhendrixMSFT committed Nov 6, 2023
1 parent 8c1a496 commit 440232e
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
4 changes: 4 additions & 0 deletions sdk/azcore/runtime/policy_telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ func NewTelemetryPolicy(mod, ver string, o *policy.TelemetryOptions) policy.Poli
b.WriteString(o.ApplicationID)
b.WriteRune(' ')
}
// mod might be the fully qualified name. in that case, we just want the package name
if i := strings.LastIndex(mod, "/"); i > -1 {
mod = mod[i+1:]
}
b.WriteString(formatTelemetry(mod, ver))
b.WriteRune(' ')
b.WriteString(platformInfo)
Expand Down
18 changes: 18 additions & 0 deletions sdk/azcore/runtime/policy_telemetry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,24 @@ func TestPolicyTelemetryDefault(t *testing.T) {
}
}

func TestPolicyTelemetryDefaultFullQualified(t *testing.T) {
srv, close := mock.NewServer()
defer close()
srv.SetResponse()
pl := exported.NewPipeline(srv, NewTelemetryPolicy("github.com/foo/bar/test", "v1.2.3", nil))
req, err := NewRequest(context.Background(), http.MethodGet, srv.URL())
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
resp, err := pl.Do(req)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if v := resp.Request.Header.Get(shared.HeaderUserAgent); v != "azsdk-go-test/v1.2.3 "+platformInfo {
t.Fatalf("unexpected user agent value: %s", v)
}
}

func TestPolicyTelemetryPreserveExisting(t *testing.T) {
srv, close := mock.NewServer()
defer close()
Expand Down

0 comments on commit 440232e

Please sign in to comment.