From 425f9acb88516b23ce6b388f1deef3151601f446 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Mon, 15 Jun 2020 20:39:09 +0200 Subject: [PATCH] Set aci user agent for MS metrics --- azure/aci.go | 5 +++++ azure/resourcegroup.go | 2 ++ 2 files changed, 7 insertions(+) diff --git a/azure/aci.go b/azure/aci.go index ebce23044..19c4f09d4 100644 --- a/azure/aci.go +++ b/azure/aci.go @@ -21,6 +21,9 @@ import ( "github.com/docker/api/context/store" ) + +const aciDockerUserAgent = "docker-cli" + func createACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) error { containerGroupsClient, err := getContainerGroupsClient(aciContext.SubscriptionID) if err != nil { @@ -238,6 +241,7 @@ func getContainerGroupsClient(subscriptionID string) (containerinstance.Containe } containerGroupsClient := containerinstance.NewContainerGroupsClient(subscriptionID) containerGroupsClient.Authorizer = auth + containerGroupsClient.UserAgent= aciDockerUserAgent containerGroupsClient.PollingDelay = 5 * time.Second containerGroupsClient.RetryAttempts = 30 containerGroupsClient.RetryDuration = 1 * time.Second @@ -250,6 +254,7 @@ func getContainerClient(subscriptionID string) (containerinstance.ContainerClien return containerinstance.ContainerClient{}, err } containerClient := containerinstance.NewContainerClient(subscriptionID) + containerClient.UserAgent=aciDockerUserAgent containerClient.Authorizer = auth return containerClient, nil } diff --git a/azure/resourcegroup.go b/azure/resourcegroup.go index d63770706..c757adcc8 100644 --- a/azure/resourcegroup.go +++ b/azure/resourcegroup.go @@ -94,6 +94,7 @@ func getSubscriptionsClient() (subscription.SubscriptionsClient, error) { return subscription.SubscriptionsClient{}, errors.Wrap(errdefs.ErrLoginFailed, err.Error()) } subc.Authorizer = authorizer + subc.UserAgent=aciDockerUserAgent return subc, nil } @@ -101,5 +102,6 @@ func getGroupsClient(subscriptionID string) resources.GroupsClient { groupsClient := resources.NewGroupsClient(subscriptionID) authorizer, _ := login.NewAuthorizerFromLogin() groupsClient.Authorizer = authorizer + groupsClient.UserAgent=aciDockerUserAgent return groupsClient }