From be177021b0f370d229ec0ef0aaeff360a819645e Mon Sep 17 00:00:00 2001 From: Anastasiia Pnevskaia Date: Thu, 19 Oct 2023 13:26:21 +0200 Subject: [PATCH] Switching telemetry to opt-out and disabling telemetry in CI jobs (#20391) * Added disabling telemetry script to linux azure job, added debug checks to convert_model. * Telemetry disabling. * Disabling telemetry. * Config corrections. * Config corrections. * Update .github/workflows/mac.yml Co-authored-by: Andrey Kashchikhin * Debug output. * Win config correction. * Win config correction. * Debug output. * Debug output. * Added turning off telemetry to onnx azure tests config. * Corrected config. * Removed debug output. * Switch telemetry to opt-out. * Removed not needed blank lines. * Text correction. * Debug output. * Remove changes from CI configs, add CI var to dockers. * Config correction. * Debug output. * Config corrected. * Readme corrected. * Config changed. * Config changed. * Debug output. * Required version changed. * Remove debug output. --------- Co-authored-by: Andrey Kashchikhin --- README.md | 10 +++++ .../telemetry_information.md | 40 +++---------------- src/bindings/python/requirements.txt | 2 +- src/bindings/python/setup.cfg | 1 + tools/constraints.txt | 2 +- .../tools/mo/utils/telemetry_utils.py | 9 ++++- .../ovc/openvino/tools/ovc/telemetry_utils.py | 8 +++- 7 files changed, 32 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index bfc4a722c26..489ef7803cc 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,16 @@ OpenVINO™ Toolkit also contains several plugins which simplify loading models OpenVINO™ Toolkit is licensed under [Apache License Version 2.0](LICENSE). By contributing to the project, you agree to the license and copyright terms therein and release your contribution under these terms. +## Telemetry +OpenVINO™ collects software performance and usage data for the purpose of improving OpenVINO™ tools. This data is collected directly by OpenVINO™ or through the use of Google Analytics 4. +You can opt-out at any time by running the command: + +``` bash +opt_in_out --opt_out +``` + +More Information is available at https://docs.openvino.ai/latest/openvino_docs_telemetry_information.html. + ## Documentation ### User documentation diff --git a/docs/articles_en/about_openvino/additional_resources/telemetry_information.md b/docs/articles_en/about_openvino/additional_resources/telemetry_information.md index 4340a409237..b23a763ff97 100644 --- a/docs/articles_en/about_openvino/additional_resources/telemetry_information.md +++ b/docs/articles_en/about_openvino/additional_resources/telemetry_information.md @@ -3,13 +3,11 @@ @sphinxdirective .. meta:: - :description: Learn about OpenVINO™ telemetry, that with your explicit consent - collects only usage data to simplify debugging and further development. + :description: Learn about OpenVINO™ telemetry, that collects anonymous usage data for the purpose of improving OpenVINO™ tools. -To facilitate debugging and further development, OpenVINO™ asks its users for -a permission to collect telemetry data. It will not be collected -without an explicit consent on your part and will cover only OpenVINO™ usage information. +To facilitate debugging and further development, OpenVINO™ collects anonymous telemetry data. Anonymous telemetry data is collected by default, +but you can stop data collection anytime by running the command ``opt_in_out --opt_out``. It does not extend to any other Intel software, hardware, website usage, or other products. Google Analytics is used for telemetry purposes. Refer to @@ -18,34 +16,6 @@ Google Analytics is used for telemetry purposes. Refer to Enable or disable Telemetry reporting ########################################################### -First-run consent -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -On the first run of an application that collects telemetry data, you will be prompted -to opt in or out of telemetry collection with the following telemetry message: - -.. code-block:: console - - Intel would like your permission to collect software performance and usage data - for the purpose of improving Intel products and services. This data will be collected - directly by Intel or through the use of Google Analytics. This data will be stored - in countries where Intel or Google operate. - - You can opt-out at any time in the future by running ``opt_in_out --opt_in``. - - More Information is available at docs.openvino.ai. - - Please type ``Y`` to give your consent or ``N`` to decline. - -Choose your preference by typing ``Y`` to enable or ``N`` to disable telemetry. Your choice will -be confirmed by a corresponding disclaimer. If you do not reply to the telemetry message, -your telemetry data will not be collected. - -For the Neural Network Compression Framework (NNCF), which is not a command line application, -the telemetry message will not display. Telemetry data will only be collected from NNCF -if you have explicitly provided consent in another OpenVINO tool. - - Changing consent decision +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -82,8 +52,8 @@ Telemetry Data Collection Details .. tab-item:: Telemetry Data Retention :sync: telemetry-data-retention - Telemetry data is retained in Google Analytics for a maximum of 26 months. - Any raw data that has reached the 26-month threshold is deleted from Google Analytics on a monthly basis. + Telemetry data is retained in Google Analytics for a maximum of 14 months. + Any raw data that has reached the 14-month threshold is deleted from Google Analytics on a monthly basis. @endsphinxdirective \ No newline at end of file diff --git a/src/bindings/python/requirements.txt b/src/bindings/python/requirements.txt index 72438eeb2ec..c4d3c3e3556 100644 --- a/src/bindings/python/requirements.txt +++ b/src/bindings/python/requirements.txt @@ -1,3 +1,3 @@ numpy>=1.16.6 singledispatchmethod; python_version<'3.8' -openvino-telemetry>=2023.1.0 +openvino-telemetry>=2023.2.1 diff --git a/src/bindings/python/setup.cfg b/src/bindings/python/setup.cfg index 083c8e1de85..b9b15ef0ca1 100644 --- a/src/bindings/python/setup.cfg +++ b/src/bindings/python/setup.cfg @@ -13,6 +13,7 @@ setenv = OV_BACKEND = {env:OV_BACKEND:"CPU"} PYTHONPATH = {env:PYTHONPATH} OpenVINO_DIR = {env:OpenVINO_DIR} + CI = True passenv = http_proxy https_proxy diff --git a/tools/constraints.txt b/tools/constraints.txt index 18a3080d3a1..2e1588a005e 100644 --- a/tools/constraints.txt +++ b/tools/constraints.txt @@ -18,4 +18,4 @@ pyenchant>=3.0.0 test-generator==0.1.1 py>=1.9.0 urllib3>=1.26.4 -openvino-telemetry>=2023.1.0 +openvino-telemetry>=2023.2.1 diff --git a/tools/mo/openvino/tools/mo/utils/telemetry_utils.py b/tools/mo/openvino/tools/mo/utils/telemetry_utils.py index 802986edf4c..e2cdd0b53f6 100644 --- a/tools/mo/openvino/tools/mo/utils/telemetry_utils.py +++ b/tools/mo/openvino/tools/mo/utils/telemetry_utils.py @@ -22,8 +22,13 @@ except ImportError: def init_mo_telemetry(app_name='Model Optimizer'): - return tm.Telemetry(tid=get_tid(), app_name=app_name, app_version=get_rt_version(), backend='ga4') - + return tm.Telemetry(tid=get_tid(), + app_name=app_name, + app_version=get_rt_version(), + backend='ga4', + enable_opt_in_dialog=False, + disable_in_ci=True + ) def send_framework_info(framework: str): """ diff --git a/tools/ovc/openvino/tools/ovc/telemetry_utils.py b/tools/ovc/openvino/tools/ovc/telemetry_utils.py index 87e0132ccd1..42232b0839a 100644 --- a/tools/ovc/openvino/tools/ovc/telemetry_utils.py +++ b/tools/ovc/openvino/tools/ovc/telemetry_utils.py @@ -17,7 +17,13 @@ except ImportError: def init_mo_telemetry(app_name='Model Conversion API'): - return tm.Telemetry(tid=get_tid(), app_name=app_name, app_version=get_rt_version(), backend='ga4') + return tm.Telemetry(tid=get_tid(), + app_name=app_name, + app_version=get_rt_version(), + backend='ga4', + enable_opt_in_dialog=False, + disable_in_ci=True + ) def send_framework_info(framework: str): """