buildbucket: fix instrumentation

appengine/cr-buildbucket/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 functools
 import json
 import logging
 
 from google.appengine.ext import ndb
 
@@ skipping 154 matching lines @@
 
 
 def buildbucket_api_method(
     request_message_class, response_message_class, **kwargs):
   """Extends auth.endpoints_method by converting service errors."""
 
   endpoints_decorator = auth.endpoints_method(
     request_message_class, response_message_class, **kwargs)
 
   def decorator(fn):
+    fn = catch_errors(fn, response_message_class)
+    fn = endpoints_decorator(fn)
+    fn = ndb.toplevel(fn)
     def ts_mon_time():
       return utils.datetime_to_timestamp(utils.utcnow()) / 1000000.0
     fn = gae_ts_mon.instrument_endpoint(time_fn=ts_mon_time)(fn)
-    fn = catch_errors(fn, response_message_class)
-    fn = endpoints_decorator(fn)
-    fn = ndb.toplevel(fn)
     return fn
 
   return decorator
 
 
 def parse_json(json_data, param_name):
   if not json_data:
     return None
   try:
     return json.loads(json_data)
@@ skipping 419 matching lines @@
     ),
     DeleteManyBuildsResponse,
     path='bucket/{bucket}/delete', http_method='POST')
   @auth.public
   def delete_many_builds(self, request):
     """Deletes scheduled or started builds in a bucket."""
     service.delete_many_builds(
       request.bucket, request.status,
       tags=request.tag[:], created_by=request.created_by)
     return self.DeleteManyBuildsResponse()