Merge branch 'charlesmchen/moreCallServiceAnalytics'

Signal/src/call/CallService.swift

@@ -338,6 +338,7 @@ protocol CallServiceObserver: class {
             // Don't let the outgoing call ring forever. We don't support inbound ringing forever anyway.
             let timeout: Promise<Void> = after(interval: TimeInterval(connectingTimeoutSeconds)).then { () -> Void in
                 // rejecting a promise by throwing is safely a no-op if the promise has already been fulfilled
+                OWSProdInfo(OWSAnalyticsEvents.callServiceErrorTimeoutWhileConnectingOutgoing(), file:#file, function:#function, line:#line)
                 throw CallError.timeout(description: "timed out waiting to receive call answer")
             }
 
@@ -350,8 +351,10 @@ protocol CallServiceObserver: class {
             Logger.error("\(self.TAG) placing call \(call.identifiersForLogs) failed with error: \(error)")
 
             if let callError = error as? CallError {
+                OWSProdInfo(OWSAnalyticsEvents.callServiceErrorOutgoingConnectionFailedInternal(), file:#file, function:#function, line:#line)
                 self.handleFailedCall(failedCall: call, error: callError)
             } else {
+                OWSProdInfo(OWSAnalyticsEvents.callServiceErrorOutgoingConnectionFailedExternal(), file:#file, function:#function, line:#line)
                 let externalError = CallError.externalError(underlyingError: error)
                 self.handleFailedCall(failedCall: call, error: externalError)
             }
@@ -422,8 +425,10 @@ protocol CallServiceObserver: class {
             Logger.debug("\(self.TAG) successfully set remote description")
         }.catch { error in
             if let callError = error as? CallError {
+                OWSProdInfo(OWSAnalyticsEvents.callServiceErrorHandleReceivedErrorInternal(), file:#file, function:#function, line:#line)
                 self.handleFailedCall(failedCall: call, error: callError)
             } else {
+                OWSProdInfo(OWSAnalyticsEvents.callServiceErrorHandleReceivedErrorExternal(), file:#file, function:#function, line:#line)
                 let externalError = CallError.externalError(underlyingError: error)
                 self.handleFailedCall(failedCall: call, error: externalError)
             }
@@ -630,6 +635,7 @@ protocol CallServiceObserver: class {
 
             let timeout: Promise<Void> = after(interval: TimeInterval(connectingTimeoutSeconds)).then { () -> Void in
                 // rejecting a promise by throwing is safely a no-op if the promise has already been fulfilled
+                OWSProdInfo(OWSAnalyticsEvents.callServiceErrorTimeoutWhileConnectingIncoming(), file:#file, function:#function, line:#line)
                 throw CallError.timeout(description: "timed out waiting for call to connect")
             }
 
@@ -648,8 +654,10 @@ protocol CallServiceObserver: class {
                 return
             }
             if let callError = error as? CallError {
+                OWSProdInfo(OWSAnalyticsEvents.callServiceErrorIncomingConnectionFailedInternal(), file:#file, function:#function, line:#line)
                 self.handleFailedCall(failedCall: newCall, error: callError)
             } else {
+                OWSProdInfo(OWSAnalyticsEvents.callServiceErrorIncomingConnectionFailedExternal(), file:#file, function:#function, line:#line)
                 let externalError = CallError.externalError(underlyingError: error)
                 self.handleFailedCall(failedCall: newCall, error: externalError)
             }
@@ -689,6 +697,7 @@ protocol CallServiceObserver: class {
 
             peerConnectionClient.addRemoteIceCandidate(RTCIceCandidate(sdp: sdp, sdpMLineIndex: lineIndex, sdpMid: mid))
         }.catch { error in
+            OWSProdInfo(OWSAnalyticsEvents.callServiceErrorHandleRemoteAddedIceCandidate(), file:#file, function:#function, line:#line)
             Logger.error("\(self.TAG) in \(#function) waitForPeerConnectionClient failed with error: \(error)")
         }.retainUntilComplete()
     }
@@ -738,6 +747,7 @@ protocol CallServiceObserver: class {
                 return
             }
         }.catch { error in
+            OWSProdInfo(OWSAnalyticsEvents.callServiceErrorHandleLocalAddedIceCandidate(), file:#file, function:#function, line:#line)
             Logger.error("\(self.TAG) in \(#function) waitUntilReadyToSendIceUpdates failed with error: \(error)")
         }.retainUntilComplete()
     }
@@ -1002,6 +1012,7 @@ protocol CallServiceObserver: class {
         let sendPromise = self.messageSender.sendCallMessage(callMessage).then {
             Logger.debug("\(self.TAG) successfully sent hangup call message to \(call.thread.contactIdentifier())")
         }.catch { error in
+            OWSProdInfo(OWSAnalyticsEvents.callServiceErrorHandleLocalHungupCall(), file:#file, function:#function, line:#line)
             Logger.error("\(self.TAG) failed to send hangup call message to \(call.thread.contactIdentifier()) with error: \(error)")
         }
         sendPromise.retainUntilComplete()

Signal/src/util/OWSAnalytics.swift

@@ -4,8 +4,18 @@
 
 import Foundation
 
+func FormatAnalyticsLocation(file: String, function: String) -> NSString {
+    return "\((file as NSString).lastPathComponent):\(function)" as NSString
+}
+
 func OWSProdError(_ eventName: String, file: String, function: String, line: Int32) {
-    let location = "\((file as NSString).lastPathComponent):\(function)"
+    let location = FormatAnalyticsLocation(file: file, function: function)
+    OWSAnalytics
+        .logEvent(eventName, severity: .error, parameters: nil, location: location.utf8String!, line:line)
+}
+
+func OWSProdInfo(_ eventName: String, file: String, function: String, line: Int32) {
+    let location = FormatAnalyticsLocation(file: file, function: function)
     OWSAnalytics
-        .logEvent(eventName, severity: .error, parameters: nil, location: (location as NSString).utf8String!, line:line)
+        .logEvent(eventName, severity: .info, parameters: nil, location: location.utf8String!, line:line)
 }

SignalServiceKit/src/Util/OWSAnalyticsEvents.h

@@ -40,6 +40,28 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (NSString *)callServiceCouldNotCreateReadyToSendIceUpdatesPromise;
 
++ (NSString *)callServiceErrorHandleLocalAddedIceCandidate;
+
++ (NSString *)callServiceErrorHandleLocalHungupCall;
+
++ (NSString *)callServiceErrorHandleReceivedErrorExternal;
+
++ (NSString *)callServiceErrorHandleReceivedErrorInternal;
+
++ (NSString *)callServiceErrorHandleRemoteAddedIceCandidate;
+
++ (NSString *)callServiceErrorIncomingConnectionFailedExternal;
+
++ (NSString *)callServiceErrorIncomingConnectionFailedInternal;
+
++ (NSString *)callServiceErrorOutgoingConnectionFailedExternal;
+
++ (NSString *)callServiceErrorOutgoingConnectionFailedInternal;
+
++ (NSString *)callServiceErrorTimeoutWhileConnectingIncoming;
+
++ (NSString *)callServiceErrorTimeoutWhileConnectingOutgoing;
+
 + (NSString *)callServiceMissingFulfillReadyToSendIceUpdatesPromise;
 
 + (NSString *)callServicePeerConnectionAlreadySet;

SignalServiceKit/src/Util/OWSAnalyticsEvents.m

@@ -82,6 +82,61 @@ NS_ASSUME_NONNULL_BEGIN
     return @"call_service_could_not_create_ready_to_send_ice_updates_promise";
 }
 
++ (NSString *)callServiceErrorHandleLocalAddedIceCandidate
+{
+    return @"call_service_error_handle_local_added_ice_candidate";
+}
+
++ (NSString *)callServiceErrorHandleLocalHungupCall
+{
+    return @"call_service_error_handle_local_hungup_call";
+}
+
++ (NSString *)callServiceErrorHandleReceivedErrorExternal
+{
+    return @"call_service_error_handle_received_error_external";
+}
+
++ (NSString *)callServiceErrorHandleReceivedErrorInternal
+{
+    return @"call_service_error_handle_received_error_internal";
+}
+
++ (NSString *)callServiceErrorHandleRemoteAddedIceCandidate
+{
+    return @"call_service_error_handle_remote_added_ice_candidate";
+}
+
++ (NSString *)callServiceErrorIncomingConnectionFailedExternal
+{
+    return @"call_service_error_incoming_connection_failed_external";
+}
+
++ (NSString *)callServiceErrorIncomingConnectionFailedInternal
+{
+    return @"call_service_error_incoming_connection_failed_internal";
+}
+
++ (NSString *)callServiceErrorOutgoingConnectionFailedExternal
+{
+    return @"call_service_error_outgoing_connection_failed_external";
+}
+
++ (NSString *)callServiceErrorOutgoingConnectionFailedInternal
+{
+    return @"call_service_error_outgoing_connection_failed_internal";
+}
+
++ (NSString *)callServiceErrorTimeoutWhileConnectingIncoming
+{
+    return @"call_service_error_timeout_while_connecting_incoming";
+}
+
++ (NSString *)callServiceErrorTimeoutWhileConnectingOutgoing
+{
+    return @"call_service_error_timeout_while_connecting_outgoing";
+}
+
 + (NSString *)callServiceMissingFulfillReadyToSendIceUpdatesPromise
 {
     return @"call_service_missing_fulfill_ready_to_send_ice_updates_promise";