Skip to content

Commit cbe2793

Browse files
committed
[analytics] stop collecting context creation style data
Bug: #60411 Change-Id: I987557393cfc1b92b5d00467f5aedc9674eba07c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/417946 Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 0d28703 commit cbe2793

File tree

3 files changed

+5
-62
lines changed

3 files changed

+5
-62
lines changed

pkg/analysis_server/lib/src/analysis_server.dart

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -943,27 +943,9 @@ abstract class AnalysisServer {
943943

944944
var rootPaths = packagesFileMap.keys.toList();
945945
rootPaths.sort((first, second) => first.length.compareTo(second.length));
946-
var styleCounts = [
947-
0, // neither
948-
0, // only packages
949-
0, // only options -- (No longer incremented. Options files do not imply unique contexts.)
950-
0, // both -- (No longer incremented. Options files do not imply unique contexts.)
951-
];
952-
var packagesFiles = <File>{};
953-
for (var rootPath in rootPaths) {
954-
var packagesFile = packagesFileMap[rootPath];
955-
var hasUniquePackageFile =
956-
packagesFile != null && packagesFiles.add(packagesFile);
957-
var style = hasUniquePackageFile ? 1 : 0;
958-
styleCounts[style]++;
959-
}
960946

961947
analyticsManager.analysisComplete(
962948
numberOfContexts: driverMap.length,
963-
contextsWithoutFiles: styleCounts[0],
964-
contextsFromPackagesFiles: styleCounts[1],
965-
contextsFromOptionsFiles: styleCounts[2],
966-
contextsFromBothFiles: styleCounts[3],
967949
immediateFileCount: immediateFileCount,
968950
immediateFileLineCount: immediateFileLineCount,
969951
transitiveFileCount: transitiveFileCount,

pkg/analysis_server/lib/src/analytics/analytics_manager.dart

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ class AnalyticsManager {
102102
/// number of unique transitive files.
103103
void analysisComplete({
104104
required int numberOfContexts,
105-
required int contextsWithoutFiles,
106-
required int contextsFromPackagesFiles,
107-
required int contextsFromOptionsFiles,
108-
required int contextsFromBothFiles,
109105
required int immediateFileCount,
110106
required int immediateFileLineCount,
111107
required int transitiveFileCount,
@@ -118,10 +114,6 @@ class AnalyticsManager {
118114
// analysis or keeping all of the data and sending back percentile.
119115
_contextStructure ??= ContextStructure(
120116
numberOfContexts: numberOfContexts,
121-
contextsWithoutFiles: contextsWithoutFiles,
122-
contextsFromPackagesFiles: contextsFromPackagesFiles,
123-
contextsFromOptionsFiles: contextsFromOptionsFiles,
124-
contextsFromBothFiles: contextsFromBothFiles,
125117
immediateFileCount: immediateFileCount,
126118
immediateFileLineCount: immediateFileLineCount,
127119
transitiveFileCount: transitiveFileCount,
@@ -451,18 +443,6 @@ class AnalyticsManager {
451443
h3('Analysis data');
452444
buffer.writeln('<ul>');
453445
li('numberOfContexts: ${json.encode(analysisData.numberOfContexts)}');
454-
li(
455-
'contextsWithoutFiles: ${json.encode(analysisData.contextsWithoutFiles)}',
456-
);
457-
li(
458-
'contextsFromPackagesFiles: ${json.encode(analysisData.contextsFromPackagesFiles)}',
459-
);
460-
li(
461-
'contextsFromOptionsFiles: ${json.encode(analysisData.contextsFromOptionsFiles)}',
462-
);
463-
li(
464-
'contextsFromBothFiles: ${json.encode(analysisData.contextsFromBothFiles)}',
465-
);
466446
li('immediateFileCount: ${json.encode(analysisData.immediateFileCount)}');
467447
li(
468448
'immediateFileLineCount: ${json.encode(analysisData.immediateFileLineCount)}',
@@ -516,10 +496,11 @@ class AnalyticsManager {
516496
analytics.send(
517497
Event.contextStructure(
518498
numberOfContexts: contextStructure.numberOfContexts,
519-
contextsWithoutFiles: contextStructure.contextsWithoutFiles,
520-
contextsFromPackagesFiles: contextStructure.contextsFromPackagesFiles,
521-
contextsFromOptionsFiles: contextStructure.contextsFromOptionsFiles,
522-
contextsFromBothFiles: contextStructure.contextsFromBothFiles,
499+
// TODO(pq): remove context creation data if we can safely change report shape (https://github.com/dart-lang/sdk/issues/60411)
500+
contextsWithoutFiles: 0,
501+
contextsFromPackagesFiles: 0,
502+
contextsFromOptionsFiles: 0,
503+
contextsFromBothFiles: 0,
523504
immediateFileCount: contextStructure.immediateFileCount,
524505
immediateFileLineCount: contextStructure.immediateFileLineCount,
525506
transitiveFileCount: contextStructure.transitiveFileCount,

pkg/analysis_server/lib/src/analytics/context_structure.dart

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,6 @@ class ContextStructure {
2323
/// The number of analysis contexts being analyzed.
2424
final int numberOfContexts;
2525

26-
/// The number of contexts that were created that have neither a packages nor
27-
/// an options file.
28-
final int contextsWithoutFiles;
29-
30-
/// The number of contexts that were created that have a unique packages file
31-
/// and either no options file or an inherited options file.
32-
final int contextsFromPackagesFiles;
33-
34-
/// The number of contexts that were created that have a unique options file
35-
/// and either no packages file or an inherited packages file.
36-
final int contextsFromOptionsFiles;
37-
38-
/// The number of contexts that were created that have both a unique packages
39-
/// file and a unique options file.
40-
final int contextsFromBothFiles;
41-
4226
/// The number of immediate files that were analyzed.
4327
final int immediateFileCount;
4428

@@ -64,10 +48,6 @@ class ContextStructure {
6448
/// Initialize a newly created data holder.
6549
ContextStructure({
6650
required this.numberOfContexts,
67-
required this.contextsWithoutFiles,
68-
required this.contextsFromPackagesFiles,
69-
required this.contextsFromOptionsFiles,
70-
required this.contextsFromBothFiles,
7151
required this.immediateFileCount,
7252
required this.immediateFileLineCount,
7353
required this.transitiveFileCount,

0 commit comments

Comments
 (0)