swarming: always append task's OS dimension to step name

scripts/slave/recipe_modules/swarming/api.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import datetime
 import functools
 
 from recipe_engine.types import freeze
 from recipe_engine import recipe_api
 
@@ skipping 458 matching lines @@
       assert isinstance(value, basestring), value
       args.extend(['--dimension', name, value])
     for name, value in sorted(task.env.iteritems()):
       assert isinstance(value, basestring), value
       args.extend(['--env', name, value])
 
     # Default tags.
     tags = set(task.tags)
     tags.update(self._default_tags)
     tags.add('data:' + task.isolated_hash)
     tags.add('name:' + task.title)

[M-A Ruel, 2016/02/22 16:11:49]

The more I was thinking about it, while it's not related to this CL but since
this CL already updates most expectations, do you mind doing a split(' ')[0]
here?

The goal would have to have tags "name:base_unittests" and
"stepname:base_unittests (with patch) on Ubuntu 14.04".

It's kind of a hack but it would get us going to be able to better analyze the
load per test. wdyt?

[Paweł Hajdan Jr., 2016/02/24 16:24:19]

Sure, uploaded https://codereview.chromium.org/1733683002 .

     mastername = self.m.properties.get('mastername')
     if mastername:
       tags.add('master:' + mastername)
     if task.buildername:
       tags.add('buildername:' + task.buildername)
     if task.buildnumber:
       tags.add('buildnumber:%d' % task.buildnumber)
     if task.dimensions.get('os'):
       tags.add('os:' + task.dimensions['os'])
     if self.m.properties.get('slavename'):
@@ skipping 253 matching lines @@
         step_result.isolated_script_results = self.m.json.loads(results_raw)
 
         self._display_pending(summary, step_result.presentation)
       except Exception as e:
         self.m.step.active_result.presentation.logs['no_results_exc'] = [str(e)]
         self.m.step.active_result.isolated_script_results = None
 
   def _get_step_name(self, prefix, task):
     """SwarmingTask -> name of a step of a waterfall.
 
-    Will take a task title (+ step name prefix) and optionally append
-    OS dimension to it in case the task is triggered on OS that is different
-    from OS this recipe is running on. It shortens step names for the most
-    common case of triggering a task on the same OS as one that recipe
-    is running on.
+    Will take a task title (+ step name prefix) and append OS dimension to it.
 
     Args:
       prefix: prefix to append to task title, like 'trigger'.
       task: SwarmingTask instance.
 
     Returns:
-      '[<prefix>] <task title> (on <OS>)' where <OS> is optional.
+      '[<prefix>] <task title> on <OS>'
     """
     prefix = '[%s] ' % prefix if prefix else ''
-
     task_os = task.dimensions['os']
-    bot_os = self.prefered_os_dimension(self.m.platform.name)
-    suffix = '' if task_os == bot_os else ' on %s' % task_os
-
-    return ''.join((prefix, task.title, suffix))
+    # Note: properly detecting dimensions of the bot the recipe is running
+    # on is somewhat non-trivial. It is not safe to assume it uses default
+    # or preferred dimensions for its OS. For example, the version of the OS
+    # can differ.
+    return ''.join((prefix, task.title, ' on %s' % task_os))
 
   def get_collect_cmd_args(self, task):
     """SwarmingTask -> argument list for 'swarming.py' command."""
     args = [
       'collect',
       '--swarming', self.swarming_server,
       '--decorate',
       '--print-status-updates',
     ]
     if self.verbose:
@@ skipping 145 matching lines @@
 
   def get_shard_view_url(self, index):
     """Returns URL of HTML page with shard details or None if not available.
 
     Works only after the task has been successfully triggered.
     """
     if self._trigger_output and self._trigger_output.get('tasks'):
       for shard_dict in self._trigger_output['tasks'].itervalues():
         if shard_dict['shard_index'] == index:
           return shard_dict['view_url']