Changeset 238197 in webkit


Ignore:
Timestamp:
Nov 14, 2018, 1:59:06 PM (7 years ago)
Author:
Joseph Pecoraro
Message:

Web Inspector: Include target identifier in protocol logging
​https://bugs.webkit.org/show_bug.cgi?id=191478

Reviewed by Devin Rousso.

  • UserInterface/Protocol/Connection.js:

(InspectorBackend.Connection.prototype._dispatchResponse):
(InspectorBackend.Connection.prototype._dispatchEvent):
(InspectorBackend.Connection.prototype._sendMessageToBackend):
Call tracer log methods with the connection.

  • UserInterface/Debug/CapturingProtocolTracer.js:
  • UserInterface/Protocol/ProtocolTracer.js:
  • UserInterface/Protocol/LoggingProtocolTracer.js:

(WI.LoggingProtocolTracer):
(WI.LoggingProtocolTracer.prototype.logFrontendException):
(WI.LoggingProtocolTracer.prototype.logFrontendRequest):
(WI.LoggingProtocolTracer.prototype.logWillHandleResponse):
(WI.LoggingProtocolTracer.prototype.logDidHandleResponse):
(WI.LoggingProtocolTracer.prototype.logDidHandleEvent):
Include the connection in log methods.

(WI.LoggingProtocolTracer.prototype.logProtocolError):
Removed, this is never called.

(WI.LoggingProtocolTracer.prototype._processEntry):
Include the target identifier in entry messages.

Location:
trunk/Source/WebInspectorUI
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebInspectorUI/ChangeLog

    r238192 r238197  
     12018-11-14  Joseph Pecoraro  <pecoraro@apple.com>
     2
     3        Web Inspector: Include target identifier in protocol logging
     4        https://bugs.webkit.org/show_bug.cgi?id=191478
     5
     6        Reviewed by Devin Rousso.
     7
     8        * UserInterface/Protocol/Connection.js:
     9        (InspectorBackend.Connection.prototype._dispatchResponse):
     10        (InspectorBackend.Connection.prototype._dispatchEvent):
     11        (InspectorBackend.Connection.prototype._sendMessageToBackend):
     12        Call tracer log methods with the connection.
     13
     14        * UserInterface/Debug/CapturingProtocolTracer.js:
     15        * UserInterface/Protocol/ProtocolTracer.js:
     16        * UserInterface/Protocol/LoggingProtocolTracer.js:
     17        (WI.LoggingProtocolTracer):
     18        (WI.LoggingProtocolTracer.prototype.logFrontendException):
     19        (WI.LoggingProtocolTracer.prototype.logFrontendRequest):
     20        (WI.LoggingProtocolTracer.prototype.logWillHandleResponse):
     21        (WI.LoggingProtocolTracer.prototype.logDidHandleResponse):
     22        (WI.LoggingProtocolTracer.prototype.logDidHandleEvent):
     23        Include the connection in log methods.
     24
     25        (WI.LoggingProtocolTracer.prototype.logProtocolError):
     26        Removed, this is never called.
     27               
     28        (WI.LoggingProtocolTracer.prototype._processEntry):
     29        Include the target identifier in entry messages.
     30
    1312018-11-14  Joseph Pecoraro  <pecoraro@apple.com>
    232

  • trunk/Source/WebInspectorUI/UserInterface/Debug/CapturingProtocolTracer.js

    r220119 r238197  
    4040    }
    4141
    42     logFrontendException(message, exception)
     42    logFrontendException(connection, message, exception)
    4343    {
    4444        this._processEntry({type: "exception", message: this._stringifyMessage(message), exception});
    4545    }
    4646
    47     logProtocolError(message, error)
    48     {
    49         this._processEntry({type: "error", message: this._stringifyMessage(message), error});
    50     }
    51 
    52     logFrontendRequest(message)
     47    logFrontendRequest(connection, message)
    5348    {
    5449        this._processEntry({type: "request", message: this._stringifyMessage(message)});
    5550    }
    5651
    57     logDidHandleResponse(message, timings = null)
     52    logDidHandleResponse(connection, message, timings = null)
    5853    {
    5954        let entry = {type: "response", message: this._stringifyMessage(message)};
    … …  
    6459    }
    6560
    66     logDidHandleEvent(message, timings = null)
     61    logDidHandleEvent(connection, message, timings = null)
    6762    {
    6863        let entry = {type: "event", message: this._stringifyMessage(message)};

  • trunk/Source/WebInspectorUI/UserInterface/Protocol/Connection.js

    r238192 r238197  
    109109        let processingStartTimestamp = performance.now();
    110110        for (let tracer of InspectorBackend.activeTracers)
    111             tracer.logWillHandleResponse(messageObject);
     111            tracer.logWillHandleResponse(this, messageObject);
    112112
    113113        InspectorBackend.currentDispatchState.request = request;
    … …  
    128128
    129129        for (let tracer of InspectorBackend.activeTracers)
    130             tracer.logDidHandleResponse(messageObject, {rtt: roundTripTime, dispatch: processingTime});
     130            tracer.logDidHandleResponse(this, messageObject, {rtt: roundTripTime, dispatch: processingTime});
    131131
    132132        if (this._deferredScripts.length && !this._pendingResponses.size)
    … …  
    187187        let processingStartTimestamp = performance.now();
    188188        for (let tracer of InspectorBackend.activeTracers)
    189             tracer.logWillHandleEvent(messageObject);
     189            tracer.logWillHandleEvent(this, messageObject);
    190190
    191191        InspectorBackend.currentDispatchState.event = messageObject;
    … …  
    195195        } catch (e) {
    196196            for (let tracer of InspectorBackend.activeTracers)
    197                 tracer.logFrontendException(messageObject, e);
     197                tracer.logFrontendException(this, messageObject, e);
    198198
    199199            WI.reportInternalError(e, {"cause": `An uncaught exception was thrown while handling event: ${qualifiedName}`});
    … …  
    204204        let processingDuration = (performance.now() - processingStartTimestamp).toFixed(3);
    205205        for (let tracer of InspectorBackend.activeTracers)
    206             tracer.logDidHandleEvent(messageObject, {dispatch: processingDuration});
     206            tracer.logDidHandleEvent(this, messageObject, {dispatch: processingDuration});
    207207    }
    208208
    … …  
    258258    {
    259259        for (let tracer of InspectorBackend.activeTracers)
    260             tracer.logFrontendRequest(messageObject);
     260            tracer.logFrontendRequest(this, messageObject);
    261261
    262262        this.sendMessageToBackend(JSON.stringify(messageObject));

  • trunk/Source/WebInspectorUI/UserInterface/Protocol/LoggingProtocolTracer.js

    r220119 r238197  
    3232        this._dumpMessagesToConsole = false;
    3333        this._dumpTimingDataToConsole = false;
    34         this._logToConsole = window.InspectorTest ? InspectorFrontendHost.unbufferedLog.bind(InspectorFrontendHost) : console.log.bind(console);
     34        this._logToConsole = window.InspectorTest ? InspectorFrontendHost.unbufferedLog.bind(InspectorFrontendHost) : console.log;
    3535    }
    3636
    … …  
    5757    }
    5858
    59     logFrontendException(message, exception)
     59    logFrontendException(connection, message, exception)
    6060    {
    61         this._processEntry({type: "exception", message, exception});
     61        this._processEntry({type: "exception", connection, message, exception});
    6262    }
    6363
    64     logProtocolError(message, error)
     64    logFrontendRequest(connection, message)
    6565    {
    66         this._processEntry({type: "error", message, error});
     66        this._processEntry({type: "request", connection, message});
    6767    }
    6868
    69     logFrontendRequest(message)
     69    logWillHandleResponse(connection, message)
    7070    {
    71         this._processEntry({type: "request", message});
    72     }
    73 
    74     logWillHandleResponse(message)
    75     {
    76         let entry = {type: "response", message};
     71        let entry = {type: "response", connection, message};
    7772        this._processEntry(entry);
    7873    }
    7974
    80     logDidHandleResponse(message, timings = null)
     75    logDidHandleResponse(connection, message, timings = null)
    8176    {
    82         let entry = {type: "response", message};
     77        let entry = {type: "response", connection, message};
    8378        if (timings)
    8479            entry.timings = Object.shallowCopy(timings);
    … …  
    8782    }
    8883
    89     logWillHandleEvent(message)
     84    logWillHandleEvent(connection, message)
    9085    {
    91         let entry = {type: "event", message};
     86        let entry = {type: "event", connection, message};
    9287        this._processEntry(entry);
    9388    }
    9489
    95     logDidHandleEvent(message, timings = null)
     90    logDidHandleEvent(connection, message, timings = null)
    9691    {
    97         let entry = {type: "event", message};
     92        let entry = {type: "event", connection, message};
    9893        if (timings)
    9994            entry.timings = Object.shallowCopy(timings);
    … …  
    110105                this._logToConsole(`time-stats: Handling: ${entry.timings.dispatch || NaN}ms`);
    111106        } else if (this._dumpMessagesToConsole && !entry.timings) {
    112             this._logToConsole(`${entry.type}: ${JSON.stringify(entry.message)}`);
     107            let connection = entry.connection;
     108            let targetId = connection && connection.target ? connection.target.identifier : "unknown";
     109            this._logToConsole(`${entry.type} (${targetId}): ${JSON.stringify(entry.message)}`);
    113110            if (entry.exception) {
    114111                this._logToConsole(entry.exception);

  • trunk/Source/WebInspectorUI/UserInterface/Protocol/ProtocolTracer.js

    r220119 r238197  
    3333    }
    3434
    35     logFrontendException(message, exception)
     35    logFrontendException(connection, message, exception)
    3636    {
    3737        // To be overridden by subclasses.
    3838    }
    3939
    40     logProtocolError(message, error)
     40    logFrontendRequest(connection, message)
    4141    {
    4242        // To be overridden by subclasses.
    4343    }
    4444
    45     logFrontendRequest(message)
     45    logWillHandleResponse(connection, message)
    4646    {
    4747        // To be overridden by subclasses.
    4848    }
    4949
    50     logWillHandleResponse(message)
     50    logDidHandleResponse(connection, message, timings = null)
    5151    {
    5252        // To be overridden by subclasses.
    5353    }
    5454
    55     logDidHandleResponse(message, timings = null)
     55    logWillHandleEvent(connection, message)
    5656    {
    5757        // To be overridden by subclasses.
    5858    }
    5959
    60     logWillHandleEvent(message)
    61     {
    62         // To be overridden by subclasses.
    63     }
    64 
    65     logDidHandleEvent(message, timings = null)
     60    logDidHandleEvent(connection, message, timings = null)
    6661    {
    6762        // To be overridden by subclasses.
Note: See TracChangeset for help on using the changeset viewer.