| Index: telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend.py
|
| diff --git a/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend.py b/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend.py
|
| index 1114deb4b29fb708bda7cf0102fb1a8bb9e56102..94a8ff60944d89d7a472d555f1c5c2fa0c329095 100644
|
| --- a/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend.py
|
| +++ b/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend.py
|
| @@ -271,7 +271,7 @@ class TracingBackend(object):
|
| def _NotificationHandler(self, res):
|
| if 'Tracing.dataCollected' == res.get('method'):
|
| value = res.get('params', {}).get('value')
|
| - self._trace_data_builder.AddEventsTo(
|
| + self._trace_data_builder.AddTraceFor(
|
| trace_data_module.CHROME_TRACE_PART, value)
|
| elif 'Tracing.tracingComplete' == res.get('method'):
|
| stream_handle = res.get('params', {}).get('stream')
|
| @@ -282,22 +282,10 @@ class TracingBackend(object):
|
| reader.Read(self._ReceivedAllTraceDataFromStream)
|
|
|
| def _ReceivedAllTraceDataFromStream(self, data):
|
| + # For now we still unpack trace data to dictionary form.
|
| trace = json.loads(data)
|
| - if type(trace) == dict:
|
| - for part in trace_data_module.ALL_TRACE_PARTS:
|
| - field_name = part.raw_field_name
|
| - if field_name in trace:
|
| - self._trace_data_builder.AddEventsTo(part, trace[field_name])
|
| -
|
| - if 'metadata' in trace:
|
| - self._trace_data_builder.SetMetadataFor(
|
| - trace_data_module.CHROME_TRACE_PART, trace['metadata'])
|
| -
|
| - elif type(trace) == list:
|
| - self._trace_data_builder.AddEventsTo(
|
| + self._trace_data_builder.AddTraceFor(
|
| trace_data_module.CHROME_TRACE_PART, trace)
|
| - else:
|
| - raise TracingUnexpectedResponseException('Unexpected trace type')
|
| self._has_received_all_tracing_data = True
|
|
|
| def Close(self):
|
|
|