Merge pull request #769 from szypulka/patch-2

Fix exception on empty uploader tags in NeUploader
yandex · Jul 9, 2019 · 9ed52ec · 9ed52ec
2 parents b2e6d29 + c4c3c42
commit 9ed52ec
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/yandextank/plugins/NeUploader/plugin.py b/yandextank/plugins/NeUploader/plugin.py
@@ -1,4 +1,3 @@
-""" Plugin uploading metrics from yhttps://wiki.yandex-team.ru/hr/gor/moebius/andextank to Luna. """
 import logging
 
 import pandas
@@ -154,16 +153,11 @@ def filter_df_by_case(df, case):
         return df if case == '__overall__' else df.loc[df['tag'] == case]
 
     def map_uploader_tags(self, uploader_tags):
-        return dict(
-            [
-                ('component', uploader_tags.get('component')),
-                ('description', uploader_tags.get('job_dsc')),
-                ('name', self.cfg.get('test_name', uploader_tags.get('job_name'))),
-                ('person', uploader_tags.get('person')),
-                ('task', uploader_tags.get('task')),
-                ('version', uploader_tags.get('version')),
-                ('lunapark_jobno', uploader_tags.get('job_no'))
-            ] + [
-                (k, v) for k, v in uploader_tags.get('meta', {}).items()
-            ]
-        )
+        if not uploader_tags:
+            logger.info('No uploader metainfo found')
+            return {}
+        else:
+            meta_tags_names = ['component', 'description', 'name', 'person', 'task', 'version', 'lunapark_jobno']
+            meta_tags = {key: uploader_tags.get(key, self.cfg.get(key)) for key in meta_tags_names}
+            meta_tags.update({k: v for k, v in uploader_tags.get('meta', {}).items()})
+            return meta_tags