Swapping NoopAnalytics for noop from package:unified_analytics

Change-Id: I3419a128830ae434fa37bd10a1fc8a3da146fd89
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/313880
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Elias Yishak <eliasyishak@google.com>
This commit is contained in:
eliasyishak 2023-07-14 19:15:20 +00:00 committed by Commit Queue
parent 6233cede64
commit 34f0e26d45
8 changed files with 12 additions and 70 deletions

View file

@ -9,7 +9,6 @@ import 'package:analysis_server/lsp_protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_constants.dart';
import 'package:analysis_server/src/analytics/active_request_data.dart';
import 'package:analysis_server/src/analytics/context_structure.dart';
import 'package:analysis_server/src/analytics/noop_analytics.dart';
import 'package:analysis_server/src/analytics/notification_data.dart';
import 'package:analysis_server/src/analytics/plugin_data.dart';
import 'package:analysis_server/src/analytics/request_data.dart';
@ -90,7 +89,7 @@ class AnalyticsManager {
/// Initialize a newly created analytics manager to report to the [analytics]
/// service.
AnalyticsManager(this.analytics) {
if (analytics is! NoopAnalytics) {
if (analytics is! NoOpAnalytics) {
periodicTimer = Timer.periodic(Duration(minutes: 30), (_) {
_sendPeriodicData();
});

View file

@ -1,55 +0,0 @@
// Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
import 'package:http/src/response.dart';
import 'package:unified_analytics/unified_analytics.dart';
/// An implementation of [Analytics] that's appropriate to use when analytics
/// will be disabled for the current session, including tests.
class NoopAnalytics implements Analytics {
@override
String get getConsentMessage => throw UnimplementedError();
@override
bool get okToSend => false;
@override
Map<String, ToolInfo> get parsedTools => throw UnimplementedError();
@override
bool get shouldShowMessage => false;
@override
bool get telemetryEnabled => false;
@override
Map<String, Map<String, Object?>> get userPropertyMap =>
throw UnimplementedError();
@override
void clientShowedMessage() {
// Ignored
}
@override
void close() {
// Ignored
}
@override
LogFileStats? logFileStats() {
throw UnimplementedError();
}
@override
Future<Response>? send(Event event) {
// Ignored
return null;
}
@override
Future<void> setTelemetry(bool reportingBool) {
throw UnimplementedError();
}
}

View file

@ -10,7 +10,6 @@ import 'dart:math';
import 'package:analysis_server/protocol/protocol_constants.dart'
show PROTOCOL_VERSION;
import 'package:analysis_server/src/analytics/analytics_manager.dart';
import 'package:analysis_server/src/analytics/noop_analytics.dart';
import 'package:analysis_server/src/legacy_analysis_server.dart';
import 'package:analysis_server/src/lsp/lsp_socket_server.dart';
import 'package:analysis_server/src/server/crash_reporting.dart';
@ -220,7 +219,7 @@ class Driver implements ServerStarter {
// Create the analytics manager.
AnalyticsManager analyticsManager;
if (disableAnalyticsForSession) {
analyticsManager = AnalyticsManager(NoopAnalytics());
analyticsManager = AnalyticsManager(NoOpAnalytics());
} else {
// TODO(jcollins): implement a full map of `clientId`s to tools to cover
// more analyzer entry points than vscode.
@ -228,7 +227,7 @@ class Driver implements ServerStarter {
analyticsManager = AnalyticsManager(_createAnalytics(
defaultSdk, defaultSdkPath, DashTool.vscodePlugins));
} else {
analyticsManager = AnalyticsManager(NoopAnalytics());
analyticsManager = AnalyticsManager(NoOpAnalytics());
}
}

View file

@ -5,7 +5,6 @@
import 'dart:async';
import 'package:analysis_server/src/analytics/analytics_manager.dart';
import 'package:analysis_server/src/analytics/noop_analytics.dart';
import 'package:analysis_server/src/legacy_analysis_server.dart';
import 'package:analysis_server/src/protocol_server.dart';
import 'package:analysis_server/src/server/crash_reporting_attachments.dart';
@ -22,6 +21,7 @@ import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
import 'package:analyzer/src/util/file_paths.dart' as file_paths;
import 'package:meta/meta.dart';
import 'package:test/test.dart';
import 'package:unified_analytics/unified_analytics.dart';
import 'mocks.dart';
import 'src/utilities/mock_packages.dart';
@ -188,7 +188,7 @@ class ContextResolutionTest with ResourceProviderMixin {
resourceProvider,
AnalysisServerOptions(),
DartSdkManager(sdkRoot.path),
AnalyticsManager(NoopAnalytics()),
AnalyticsManager(NoOpAnalytics()),
CrashReportingAttachmentsBuilder.empty,
InstrumentationService.NULL_SERVICE,
dartFixPromptManager: dartFixPromptManager,

View file

@ -6,7 +6,6 @@ import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_constants.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/analytics/analytics_manager.dart';
import 'package:analysis_server/src/analytics/noop_analytics.dart';
import 'package:analysis_server/src/legacy_analysis_server.dart';
import 'package:analysis_server/src/server/crash_reporting_attachments.dart';
import 'package:analysis_server/src/utilities/mocks.dart';
@ -20,6 +19,7 @@ import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
import 'package:unified_analytics/unified_analytics.dart';
void main() {
defineReflectiveSuite(() {
@ -54,7 +54,7 @@ class AnalysisServerTest with ResourceProviderMixin {
resourceProvider,
AnalysisServerOptions(),
DartSdkManager(sdkRoot.path),
AnalyticsManager(NoopAnalytics()),
AnalyticsManager(NoOpAnalytics()),
CrashReportingAttachmentsBuilder.empty,
InstrumentationService.NULL_SERVICE);
}

View file

@ -6,7 +6,6 @@ import 'dart:async';
import 'package:analysis_server/lsp_protocol/protocol.dart';
import 'package:analysis_server/src/analytics/analytics_manager.dart';
import 'package:analysis_server/src/analytics/noop_analytics.dart';
import 'package:analysis_server/src/legacy_analysis_server.dart';
import 'package:analysis_server/src/lsp/constants.dart';
import 'package:analysis_server/src/lsp/json_parsing.dart';
@ -29,6 +28,7 @@ import 'package:analyzer_plugin/src/protocol/protocol_internal.dart' as plugin;
import 'package:collection/collection.dart';
import 'package:path/path.dart' as path;
import 'package:test/test.dart' hide expect;
import 'package:unified_analytics/unified_analytics.dart';
import '../mocks.dart';
import '../mocks_lsp.dart';
@ -270,7 +270,7 @@ abstract class AbstractLspAnalysisServerTest
resourceProvider,
serverOptions,
DartSdkManager(sdkRoot.path),
AnalyticsManager(NoopAnalytics()),
AnalyticsManager(NoOpAnalytics()),
CrashReportingAttachmentsBuilder.empty,
InstrumentationService.NULL_SERVICE,
httpClient: httpClient,

View file

@ -6,7 +6,6 @@ import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_constants.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/analytics/analytics_manager.dart';
import 'package:analysis_server/src/analytics/noop_analytics.dart';
import 'package:analysis_server/src/legacy_analysis_server.dart';
import 'package:analysis_server/src/server/crash_reporting_attachments.dart';
import 'package:analysis_server/src/server/error_notifier.dart';
@ -15,6 +14,7 @@ import 'package:analysis_server/src/utilities/mocks.dart';
import 'package:analyzer/src/generated/engine.dart';
import 'package:analyzer/src/generated/sdk.dart';
import 'package:test/test.dart';
import 'package:unified_analytics/unified_analytics.dart';
void main() {
group('SocketServer', () {
@ -73,7 +73,7 @@ class SocketServerTest {
errorNotifier,
null,
null,
AnalyticsManager(NoopAnalytics()),
AnalyticsManager(NoOpAnalytics()),
null);
server.createAnalysisServer(channel);

View file

@ -7,7 +7,6 @@ import 'dart:convert';
import 'package:analysis_server/lsp_protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_constants.dart';
import 'package:analysis_server/src/analytics/analytics_manager.dart';
import 'package:analysis_server/src/analytics/noop_analytics.dart';
import 'package:analysis_server/src/analytics/percentile_calculator.dart';
import 'package:analysis_server/src/plugin/plugin_manager.dart';
import 'package:analysis_server/src/protocol_server.dart';
@ -564,7 +563,7 @@ class _IsPositiveInt extends Matcher {
}
/// An implementation of [Analytics] specialized for testing.
class _MockAnalytics implements NoopAnalytics {
class _MockAnalytics implements NoOpAnalytics {
List<Event> events = [];
_MockAnalytics();