{Telemetry|Feedback} add installer data

Dockerfile

@@ -68,4 +68,5 @@ WORKDIR /
 RUN rm -rf ./azure-cli && \
     dos2unix /root/.bashrc /usr/local/bin/az
 
+ENV AZ_INSTALLER=DOCKER
 CMD bash

build_scripts/windows/scripts/az.cmd

@@ -4,6 +4,7 @@
 ::
 
 @IF EXIST "%~dp0\..\python.exe" (
+  SET AZ_INSTALLER=MSI
   "%~dp0\..\python.exe" -IBm azure.cli %*
 ) ELSE (
   echo Failed to load python executable.

scripts/release/debian/prepare.sh

@@ -106,7 +106,7 @@ override_dh_install:
 ${TAB}mkdir -p debian/azure-cli/opt/az
 ${TAB}cp -a python_env/* debian/azure-cli/opt/az
 ${TAB}mkdir -p debian/azure-cli/usr/bin/
-${TAB}echo "\043!/usr/bin/env bash\n/opt/az/bin/python3 -Im azure.cli \"\044\100\"" > debian/azure-cli/usr/bin/az
+${TAB}echo "\043!/usr/bin/env bash\nAZ_INSTALLER=DEB /opt/az/bin/python3 -Im azure.cli \"\044\100\"" > debian/azure-cli/usr/bin/az
 ${TAB}chmod 0755 debian/azure-cli/usr/bin/az
 ${TAB}mkdir -p debian/azure-cli/etc/bash_completion.d/
 ${TAB}cat ${completion_script} > debian/azure-cli/etc/bash_completion.d/azure-cli

scripts/release/homebrew/docker/formula_template.txt

@@ -41,7 +41,7 @@ class AzureCli < Formula
 
     (bin/"az").write <<~EOS
       #!/usr/bin/env bash
-      #{libexec}/bin/python -m azure.cli \"$@\"
+      AZ_INSTALLER=HOMEBREW #{libexec}/bin/python -m azure.cli \"$@\"
     EOS
 
     bash_completion.install "az.completion" => "az"

scripts/release/rpm/azure-cli.spec

@@ -48,7 +48,7 @@ for d in %{buildroot}%{cli_lib_dir}/bin/*; do perl -p -i -e "s#%{buildroot}##g"
 # Create executable
 mkdir -p %{buildroot}%{_bindir}
 python_version=$(ls %{buildroot}%{cli_lib_dir}/lib/ | head -n 1)
-printf "#!/usr/bin/env bash\nPYTHONPATH=%{cli_lib_dir}/lib/${python_version}/site-packages /usr/bin/%{python_cmd} -sm azure.cli \"\$@\"" > %{buildroot}%{_bindir}/az
+printf "#!/usr/bin/env bash\nAZ_INSTALLER=RPM PYTHONPATH=%{cli_lib_dir}/lib/${python_version}/site-packages /usr/bin/%{python_cmd} -sm azure.cli \"\$@\"" > %{buildroot}%{_bindir}/az
 rm %{buildroot}%{cli_lib_dir}/bin/python* %{buildroot}%{cli_lib_dir}/bin/pip*
 
 # Set up tab completion

src/azure-cli-core/azure/cli/core/telemetry.py

@@ -173,6 +173,7 @@ def _get_azure_cli_properties(self):
         set_custom_properties(result, 'Feedback', self.feedback)
         set_custom_properties(result, 'ExtensionManagementDetail', self.extension_management_detail)
         set_custom_properties(result, 'Mode', self.mode)
+        set_custom_properties(result, 'Installer', os.getenv('AZ_INSTALLER'))
 
         return result
 

src/azure-cli-core/azure/cli/core/tests/test_util.py

@@ -213,6 +213,10 @@ def test_configured_default_setter(self):
 
     @mock.patch('azure.cli.core.__version__', '7.8.9')
     def test_get_az_user_agent(self):
+        with mock.patch.dict('os.environ', {'AZ_INSTALLER': 'PIP'}):
+            actual = get_az_user_agent()
+            self.assertEqual(actual, 'AZURECLI/7.8.9 (PIP)')
+
         actual = get_az_user_agent()
         self.assertEqual(actual, 'AZURECLI/7.8.9')
 

src/azure-cli-core/azure/cli/core/util.py

@@ -805,6 +805,11 @@ def get_az_user_agent():
 
     agents = ["AZURECLI/{}".format(core_version)]
 
+    _ENV_AZ_INSTALLER = 'AZ_INSTALLER'
+    import os
+    if _ENV_AZ_INSTALLER in os.environ:
+        agents.append('({})'.format(os.environ[_ENV_AZ_INSTALLER]))
+
     # msrest already has this
     # https://github.com/Azure/msrest-for-python/blob/4cc8bc84e96036f03b34716466230fb257e27b36/msrest/pipeline/universal.py#L70
     # if ENV_ADDITIONAL_USER_AGENT in os.environ:

src/azure-cli/az

@@ -13,4 +13,7 @@ else:
         os.environ.get('PYTHONPATH'),
     ])
 
-os.execl(sys.executable, sys.executable , '-m', 'azure.cli', *sys.argv[1:])
+if os.environ.get('AZ_INSTALLER') is None:
+    os.environ['AZ_INSTALLER'] = 'PIP'
+
+os.execl(sys.executable, sys.executable, '-m', 'azure.cli', *sys.argv[1:])

src/azure-cli/az.bat

@@ -2,6 +2,7 @@
 setlocal
 
 SET PYTHONPATH=%~dp0\src;%PYTHONPATH%
+SET AZ_INSTALLER=PIP
 
 IF EXIST "%~dp0\python.exe" (
   "%~dp0\python.exe" -m azure.cli %*

src/azure-cli/azure/cli/command_modules/feedback/custom.py

@@ -92,6 +92,7 @@
 ```
 {platform}
 {python_info}
+{installer}
 
 {cli_version}
 ```
@@ -514,6 +515,7 @@ def _build_issue_info_tup(command_log_file=None):
     format_dict["python_info"] = "Python {}".format(platform.python_version())
     format_dict["platform"] = "{}".format(platform.platform())
     format_dict["auto_gen_comment"] = _AUTO_GEN_COMMENT
+    format_dict["installer"] = "Installer: {}".format(os.getenv('AZ_INSTALLER') or '')
 
     pretty_url_name = _get_extension_repo_url(ext_name) if is_ext else _CLI_ISSUES_URL