Skip to content

Commit fefe0c3

Browse files
popovaanrkazants
andauthored
Fixed OVC app name in telemetry. (openvinotoolkit#27544)
### Details: - Fixed the issue, that '`Model Conversion API`' telemetry category includes `OVC` and all other tools, now `OVC` has a separate category "`OVC`". - Refactored `send_params_info()` method and fixed naming of telemetry init method. --------- Co-authored-by: Roman Kazantsev <roman.kazantsev@intel.com>
1 parent a661f0d commit fefe0c3

File tree

5 files changed

+28
-31
lines changed

5 files changed

+28
-31
lines changed

tools/ovc/openvino/tools/ovc/__init__.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
from openvino.tools.ovc.convert import convert_model
5-
from openvino.tools.ovc.telemetry_utils import is_optimum, init_mo_telemetry
5+
from openvino.tools.ovc.telemetry_utils import is_optimum, init_ovc_telemetry
66

77
import importlib.metadata as importlib_metadata
88

@@ -11,10 +11,10 @@
1111
except importlib_metadata.PackageNotFoundError:
1212
optimum_version = None
1313

14+
from openvino.runtime import get_version as get_rt_version # pylint: disable=no-name-in-module,import-error
15+
telemetry = init_ovc_telemetry('OpenVINO')
16+
telemetry.send_event("ov", "import", "general_import")
17+
1418
if is_optimum() and optimum_version is not None:
15-
from openvino.runtime import get_version as get_rt_version # pylint: disable=no-name-in-module,import-error
16-
telemetry = init_mo_telemetry("Optimum Intel", optimum_version)
17-
telemetry.send_event("ov", "import", "import_from_optimum,ov_version:{}".format(get_rt_version()))
18-
else:
19-
telemetry = init_mo_telemetry()
20-
telemetry.send_event("ov", "import", "general_import")
19+
telemetry = init_ovc_telemetry("Optimum Intel", optimum_version)
20+
telemetry.send_event("optimum", "import", "import_from_optimum,ov_version:{}".format(get_rt_version()))

tools/ovc/openvino/tools/ovc/__main__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import sys
55

66
from openvino.tools.ovc.main import main
7-
from openvino.tools.ovc.telemetry_utils import init_mo_telemetry
7+
from openvino.tools.ovc.telemetry_utils import init_ovc_telemetry
88

9-
init_mo_telemetry()
9+
init_ovc_telemetry()
1010
sys.exit(main())

tools/ovc/openvino/tools/ovc/convert_impl.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
from openvino.tools.ovc.utils import check_values_equal
3333
from openvino.tools.ovc.logger import init_logger
3434
from openvino.tools.ovc.telemetry_utils import send_params_info, send_conversion_result, \
35-
init_mo_telemetry
35+
init_ovc_telemetry
3636
from openvino.tools.ovc.moc_frontend.pytorch_frontend_utils import get_pytorch_decoder, \
3737
extract_input_info_from_example, get_pytorch_decoder_for_model_on_disk
3838
from openvino.tools.ovc.moc_frontend.paddle_frontend_utils import paddle_frontend_converter
@@ -428,7 +428,7 @@ def _convert(cli_parser: argparse.ArgumentParser, args, python_api_used):
428428
tracemalloc.start()
429429

430430
simplified_ie_version = VersionChecker().get_ie_simplified_version()
431-
telemetry = init_mo_telemetry()
431+
telemetry = init_ovc_telemetry()
432432
telemetry.start_session('ovc')
433433
telemetry.send_event('ovc', 'version', simplified_ie_version)
434434
# Initialize logger with 'ERROR' as default level to be able to form nice messages
@@ -484,12 +484,12 @@ def _convert(cli_parser: argparse.ArgumentParser, args, python_api_used):
484484

485485
argv.feManager = FrontEndManager()
486486

487-
# send telemetry with params info
488-
send_params_info(argv, cli_parser)
489-
490487
non_default_params = get_non_default_params(argv, cli_parser)
491488
argv.is_python_api_used = python_api_used
492489

490+
# send telemetry with params info
491+
send_params_info(non_default_params)
492+
493493
argv.framework = model_framework
494494

495495
orig_input_model = argv.input_model

tools/ovc/openvino/tools/ovc/ovc.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import sys
77

88
if __name__ == "__main__":
9-
from openvino.tools.ovc.telemetry_utils import init_mo_telemetry
9+
from openvino.tools.ovc.telemetry_utils import init_ovc_telemetry
1010
from openvino.tools.ovc.main import main
1111

12-
init_mo_telemetry()
12+
init_ovc_telemetry()
1313
sys.exit(main())

tools/ovc/openvino/tools/ovc/telemetry_utils.py

+12-15
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def is_optimum():
2525
return False
2626

2727

28-
def init_mo_telemetry(app_name='Model Conversion API', app_version=None):
28+
def init_ovc_telemetry(app_name='OVC', app_version=None):
2929
app_version = app_version if app_version is not None else get_rt_version()
3030
return init_telemetry_class(tid=get_tid(),
3131
app_name=app_name,
@@ -97,22 +97,19 @@ def arg_to_str(arg):
9797
return str(type(arg))
9898

9999

100-
def send_params_info(argv: argparse.Namespace, cli_parser: argparse.ArgumentParser):
100+
def send_params_info(params: dict):
101101
"""
102102
This function sends information about used command line parameters.
103-
:param argv: command line parameters.
104-
:param cli_parser: command line parameters parser.
103+
:param params: command-line parameters dictionary.
105104
"""
106105
t = tm.Telemetry()
107106
params_with_paths = get_params_with_paths_list()
108-
for arg in vars(argv):
109-
arg_value = getattr(argv, arg)
110-
if not check_values_equal(arg_value, cli_parser.get_default(arg)):
111-
if arg in params_with_paths:
112-
# If command line argument value is a directory or a path to file it is not sent
113-
# as it may contain confidential information. "1" value is used instead.
114-
param_str = arg + ":" + str(1)
115-
else:
116-
param_str = arg + ":" + arg_to_str(arg_value)
117-
118-
t.send_event('ovc', 'cli_parameters', param_str)
107+
for key, value in params.items():
108+
if key in params_with_paths:
109+
# If command line argument value is a directory or a path to file it is not sent
110+
# as it may contain confidential information. "1" value is used instead.
111+
param_str = key + ":" + str(1)
112+
else:
113+
param_str = key + ":" + arg_to_str(value)
114+
115+
t.send_event('ovc', 'cli_parameters', param_str)

0 commit comments

Comments
 (0)