Revert of Re-land "Make Buildbot masters send ts_mon metrics, and add standard HTTP server metrics.

third_party/buildbot_8_4p1/buildbot/status/web/baseweb.py

 # This file is part of Buildbot.  Buildbot is free software: you can
 # redistribute it and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation, version 2.
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 # details.
 #
 # You should have received a copy of the GNU General Public License along with
 # this program; if not, write to the Free Software Foundation, Inc., 51
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
 
 
-import os, time, weakref
+import os, weakref
 
 from zope.interface import implements
 from twisted.python import log
 from twisted.application import strports, service
 from twisted.web import server, distrib, static
 from twisted.spread import pb
 from twisted.web.util import Redirect
 
 from buildbot.interfaces import IStatusReceiver
 
 from buildbot.status.web.base import StaticFile, createJinjaEnv
 from buildbot.status.web.feeds import Rss20StatusResource, \
      Atom10StatusResource
 from buildbot.status.web.waterfall import WaterfallStatusResource
 from buildbot.status.web.console import ConsoleStatusResource
 from buildbot.status.web.olpb import OneLinePerBuild
 from buildbot.status.web.grid import GridStatusResource, TransposedGridStatusResource
 from buildbot.status.web.changes import ChangesResource
 from buildbot.status.web.builder import BuildersResource
 from buildbot.status.web.buildstatus import BuildStatusStatusResource
 from buildbot.status.web.slaves import BuildSlavesResource
 from buildbot.status.web.status_json import JsonStatusResource
 from buildbot.status.web.about import AboutBuildbot
 from buildbot.status.web.authz import Authz
 from buildbot.status.web.auth import AuthFailResource
 from buildbot.status.web.root import RootPage
 from buildbot.status.web.change_hook import ChangeHookResource
 
-from infra_libs.ts_mon.common import http_metrics
-
 # this class contains the WebStatus class.  Basic utilities are in base.py,
 # and specific pages are each in their own module.
 
 class WebStatus(service.MultiService):
     implements(IStatusReceiver)
     # TODO: IStatusReceiver is really about things which subscribe to hear
     # about buildbot events. We need a different interface (perhaps a parent
     # of IStatusReceiver) for status targets that don't subscribe, like the
     # WebStatus class. buildbot.master.BuildMaster.loadConfig:737 asserts
     # that everything in c['status'] provides IStatusReceiver, but really it
@@ skipping 323 matching lines @@
         def either(a,b): # a if a else b for py2.4
             if a:
                 return a
             else:
                 return b
         
         rotateLength = either(self.logRotateLength, self.master.log_rotation.rotateLength)
         maxRotatedFiles = either(self.maxRotatedFiles, self.master.log_rotation.maxRotatedFiles)
 
         if not self.site:
-
-            class MonitoredRequest(server.Request):
-                def __init__(self, *args, **kwargs):
-                    server.Request.__init__(self, *args, **kwargs)
-                    self.startTime = time.time()
-
-                def render(self, resrc):
-                    self.resourceClassName = resrc.__class__.__name__
-                    server.Request.render(self, resrc)
-
+            
             class RotateLogSite(server.Site):
-                requestFactory = MonitoredRequest
-
-                def log(self, request):
-                    server.Site.log(self, request)
-
-                    durationMsec = 1000 * (time.time() - request.startTime)
-
-                    requestLength = request.getHeader('content-length')
-                    if requestLength is not None:
-                      requestLength = int(requestLength)
-
-                    http_metrics.update_http_server_metrics(
-                        request.resourceClassName,
-                        request.code,
-                        durationMsec,
-                        requestLength,
-                        request.sentLength,
-                        request.getHeader('user-agent') or '')
-
                 def _openLogFile(self, path):
                     try:
                         from twisted.python.logfile import LogFile
                         log.msg("Setting up http.log rotating %s files of %s bytes each" %
                                 (maxRotatedFiles, rotateLength))            
                         if hasattr(LogFile, "fromFullPath"): # not present in Twisted-2.5.0
                             return LogFile.fromFullPath(path, rotateLength=rotateLength, maxRotatedFiles=maxRotatedFiles)
                         else:
                             log.msg("WebStatus: rotated http logs are not supported on this version of Twisted")
                     except ImportError, e:
@@ skipping 86 matching lines @@
     # What happened to getControl?!
     #
     # instead of passing control objects all over the place in the web
     # code, at the few places where a control instance is required we
     # find the requisite object manually, starting at the buildmaster.
     # This is in preparation for removal of the IControl hierarchy
     # entirely.
 
 # resources can get access to the IStatus by calling
 # request.site.buildbot_service.getStatus()