summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/protocol
diff options
context:
space:
mode:
authorlipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-15 19:13:48 +0000
committerlipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-15 19:13:48 +0000
commit201e5a4b694913138a5f4acda8b0e5a9d166d8c8 (patch)
treed7d977f4d03bb53cfb070e2e4b972085d241ae81 /chrome/browser/sync/protocol
parent241109b52c26585ba262e95f7f07fda23307cc27 (diff)
downloadchromium_src-201e5a4b694913138a5f4acda8b0e5a9d166d8c8.zip
chromium_src-201e5a4b694913138a5f4acda8b0e5a9d166d8c8.tar.gz
chromium_src-201e5a4b694913138a5f4acda8b0e5a9d166d8c8.tar.bz2
Revert 105667 - Send important client side event information to the server. We create a class called DebugInfoEventListener which implements 2 interfaces. one being the syncmanager::observer to observe events from syncmanager.
The other being DebugInfoGetter so that syncer can call this class to give the debug information in protobuf format. The implementation of this class uses a queue. And it limits the number of events to 6. if more than 6 events are in the queue we delete the oldest event. Also we send this information to the server only once per sync cycle during the first getudpdates command. also includes the unit test. BUG=100058 TEST= Review URL: http://codereview.chromium.org/8189003 TBR=lipalani@chromium.org Review URL: http://codereview.chromium.org/8313002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/protocol')
-rw-r--r--chrome/browser/sync/protocol/client_debug_info.proto60
-rw-r--r--chrome/browser/sync/protocol/sync.proto6
-rw-r--r--chrome/browser/sync/protocol/sync_proto.gyp1
3 files changed, 0 insertions, 67 deletions
diff --git a/chrome/browser/sync/protocol/client_debug_info.proto b/chrome/browser/sync/protocol/client_debug_info.proto
deleted file mode 100644
index b443e36..0000000
--- a/chrome/browser/sync/protocol/client_debug_info.proto
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) 2011 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.
-//
-// Common sync protocol for encrypted data.
-
-// Update proto_value_conversions{.h,.cc,_unittest.cc} if you change
-// any fields in this file.
-
-syntax = "proto2";
-
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
-package sync_pb;
-
-// The additional info here is from SyncerStatus. They get sent when the event
-// SYNC_CYCLE_COMPLETED is sent.
-message SyncCycleCompletedEventInfo {
- optional bool syncer_stuck = 1;
- optional int32 num_blocking_conflicts = 2;
- optional int32 num_non_blocking_conflicts = 3;
-}
-
-message DebugEventInfo {
- // These events are sent by |SyncManager| class. Note: In the code they each
- // of these events have some additional info but we are not sending them to
- // server.
- enum EventType {
- AUTH_ERROR = 1; // Auth error. Note this gets generated even during
- // successful auth with the error set to none.
- UPDATED_TOKEN = 2; // Client received an updated token.
- PASSPHRASE_REQUIRED = 3; // Cryptographer needs passphrase.
- PASSPHRASE_ACCEPTED = 4; // Passphrase was accepted by cryptographer.
- INITIALIZATION_COMPLETE = 5; // Sync Initialization is complete.
-
- // |STOP_SYNCING_PERMANENTLY| event should never be seen by the server in
- // the absence of bugs.
- STOP_SYNCING_PERMANENTLY = 6; // Server sent stop syncing permanently.
-
- ENCRYPTION_COMPLETE = 7; // Client has finished encrypting all data.
- ACTIONABLE_ERROR = 8; // Client received an actionable error.
- }
- optional EventType type = 1;
- optional SyncCycleCompletedEventInfo sync_cycle_completed_event_info = 2;
-}
-
-message DebugInfo {
- repeated DebugEventInfo events = 1;
-
- // Whether cryptographer is ready to encrypt and decrypt data.
- optional bool cryptographer_ready = 2;
-
- // Cryptographer has pending keys which indicates the correct passphrase
- // has not been provided yet.
- optional bool cryptographer_has_pending_keys = 3;
-
- // Indicates client has dropped some events to save bandwidth.
- optional bool events_dropped = 4;
-} \ No newline at end of file
diff --git a/chrome/browser/sync/protocol/sync.proto b/chrome/browser/sync/protocol/sync.proto
index b4e1826..cb4be4f 100644
--- a/chrome/browser/sync/protocol/sync.proto
+++ b/chrome/browser/sync/protocol/sync.proto
@@ -15,7 +15,6 @@ option retain_unknown_fields = true;
package sync_pb;
import "encryption.proto";
-import "client_debug_info.proto";
// Used for inspecting how long we spent performing operations in different
// backends. All times must be in millis.
@@ -439,11 +438,6 @@ message ClientToServerMessage {
// The client sets this if it detects a sync issue. The server will tell it
// if it should perform a refresh.
optional bool sync_problem_detected = 8 [default = false];
-
- // Client side state information for debugging purpose.
- // This is only sent on the first getupdates of every sync cycle,
- // as an optimization to save bandwidth.
- optional DebugInfo debug_info = 10;
};
message CommitResponse {
diff --git a/chrome/browser/sync/protocol/sync_proto.gyp b/chrome/browser/sync/protocol/sync_proto.gyp
index 9f5bde1..3af79f4 100644
--- a/chrome/browser/sync/protocol/sync_proto.gyp
+++ b/chrome/browser/sync/protocol/sync_proto.gyp
@@ -17,7 +17,6 @@
'app_specifics.proto',
'autofill_specifics.proto',
'bookmark_specifics.proto',
- 'client_debug_info.proto',
'extension_setting_specifics.proto',
'extension_specifics.proto',
'nigori_specifics.proto',