[analyzer] update lib/crash_reporting.dart

Change-Id: Ie3b3ffc8a0e0351341f28ff26bbb3c82deb0b5dc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/124640
Reviewed-by: Mike Fairhurst <mfairhurst@google.com>
Commit-Queue: Devon Carew <devoncarew@google.com>

Author: devoncarew

pkg/analysis_server/lib/src/server/driver.dart

@@ -424,8 +424,13 @@ class Driver implements ServerStarter {
       analytics.setSessionValue('cd1', analysisServerOptions.clientVersion);
     }
 
+    final shouldSendCallback = () {
+      // TODO(devoncarew): Replace with a real enablement check.
+      return false;
+    };
+
     final crashReportSender =
-        new CrashReportSender('Dart_analysis_server', analytics);
+        new CrashReportSender('Dart_analysis_server', shouldSendCallback);
 
     if (telemetry.SHOW_ANALYTICS_UI) {
       if (results.wasParsed(ANALYTICS_FLAG)) {

pkg/telemetry/lib/crash_reporting.dart

@@ -7,22 +7,24 @@ import 'dart:io';
 
 import 'package:http/http.dart' as http;
 import 'package:stack_trace/stack_trace.dart';
-import 'package:usage/usage.dart';
 
 // Reporting disabled until we're set up on the backend.
 const bool CRASH_REPORTING_DISABLED = true;
 
+/// Tells crash backend that this is a Dart error (as opposed to, say, Java).
+const String _dartTypeId = 'DartError';
+
 /// Crash backend host.
 const String _crashServerHost = 'clients2.google.com';
 
 /// Path to the crash servlet.
-const String _crashEndpointPath = '/cr/report'; // or, staging_report
+const String _crashEndpointPath = '/cr/report'; // or, 'staging_report'
 
 /// The field corresponding to the multipart/form-data file attachment where
 /// crash backend expects to find the Dart stack trace.
 const String _stackTraceFileField = 'DartError';
 
-/// The name of the file attached as [stackTraceFileField].
+/// The name of the file attached as [_stackTraceFileField].
 ///
 /// The precise value is not important. It is ignored by the crash back end, but
 /// it must be supplied in the request.
@@ -36,41 +38,43 @@ class CrashReportSender {
       scheme: 'https', host: _crashServerHost, path: _crashEndpointPath);
 
   final String crashProductId;
-  final Analytics analytics;
+  final EnablementCallback shouldSend;
   final http.Client _httpClient;
 
   /// Create a new [CrashReportSender], using the data from the given
   /// [Analytics] instance.
-  CrashReportSender(this.crashProductId, this.analytics,
+  CrashReportSender(this.crashProductId, this.shouldSend,
       {http.Client httpClient})
       : _httpClient = httpClient ?? new http.Client();
 
   /// Sends one crash report.
   ///
   /// The report is populated from data in [error] and [stackTrace].
   Future sendReport(dynamic error, {StackTrace stackTrace}) async {
-    if (!analytics.enabled || CRASH_REPORTING_DISABLED) {
+    if (!shouldSend() || CRASH_REPORTING_DISABLED) {
       return;
     }
 
     try {
+      final String dartVersion = Platform.version.split(' ').first;
+
       final Uri uri = _baseUri.replace(
         queryParameters: <String, String>{
-          'product': analytics.trackingId,
-          'version': analytics.applicationVersion,
+          'product': crashProductId,
+          'version': dartVersion,
         },
       );
 
       final http.MultipartRequest req = new http.MultipartRequest('POST', uri);
-      req.fields['uuid'] = analytics.clientId;
       req.fields['product'] = crashProductId;
-      req.fields['version'] = analytics.applicationVersion;
+      req.fields['version'] = dartVersion;
       req.fields['osName'] = Platform.operatingSystem;
       req.fields['osVersion'] = Platform.operatingSystemVersion;
-      req.fields['type'] = 'DartError';
+      req.fields['type'] = _dartTypeId;
       req.fields['error_runtime_type'] = '${error.runtimeType}';
+      req.fields['error_message'] = '$error';
 
-      final Chain chain = new Chain.parse(stackTrace.toString());
+      final Chain chain = new Chain.forTrace(stackTrace);
       req.files.add(new http.MultipartFile.fromString(
           _stackTraceFileField, chain.terse.toString(),
           filename: _stackTraceFilename));
@@ -94,3 +98,7 @@ class CrashReportSender {
     _httpClient.close();
   }
 }
+
+/// A typedef to allow crash reporting to query as to whether it should send a
+/// crash report.
+typedef bool EnablementCallback();

pkg/telemetry/test/crash_reporting_test.dart

@@ -24,18 +24,20 @@ void main() {
     });
 
     test('CrashReportSender', () async {
+      EnablementCallback shouldSend = () {
+        return true;
+      };
+
       AnalyticsMock analytics = new AnalyticsMock()..enabled = true;
       CrashReportSender sender = new CrashReportSender(
-          analytics.trackingId, analytics,
+          analytics.trackingId, shouldSend,
           httpClient: mockClient);
 
       await sender.sendReport('test-error', stackTrace: StackTrace.current);
 
       String body = utf8.decode(request.bodyBytes);
       expect(body, contains('String')); // error.runtimeType
-      expect(body, contains(analytics.trackingId));
-      expect(body, contains('1.0.0'));
-      expect(body, contains(analytics.clientId));
+      expect(body, contains('test-error'));
     }, skip: CRASH_REPORTING_DISABLED);
   });
 }