Skip to content

Commit 30dced1

Browse files
author
Casey Hillers
committed
remove github dependency
1 parent 6b0dc8e commit 30dced1

8 files changed

Lines changed: 28 additions & 121 deletions

File tree

‎packages/metrics_center/lib/src/common.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class MetricPoint extends Equatable {
5050
/// Interface to write [MetricPoint].
5151
abstract class MetricDestination {
5252
/// Insert new data points or modify old ones with matching id.
53-
Future<void> update(List<MetricPoint> points);
53+
Future<void> update(List<MetricPoint> points, DateTime commitTime);
5454
}
5555

5656
/// Create `AuthClient` in case we only have an access token without the full

‎packages/metrics_center/lib/src/flutter.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ class FlutterDestination extends MetricDestination {
5252
}
5353

5454
@override
55-
Future<void> update(List<MetricPoint> points) async {
56-
await _skiaPerfDestination.update(points);
55+
Future<void> update(List<MetricPoint> points, DateTime commitTime) async {
56+
await _skiaPerfDestination.update(points, commitTime);
5757
}
5858

5959
final SkiaPerfDestination _skiaPerfDestination;

‎packages/metrics_center/lib/src/github_helper.dart‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎packages/metrics_center/lib/src/skiaperf.dart‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import 'package:googleapis_auth/auth_io.dart';
1212
import 'common.dart';
1313
import 'constants.dart';
1414
import 'gcs_lock.dart';
15-
import 'github_helper.dart';
1615

1716
/// A [MetricPoint] modeled after the format that Skia Perf expects.
1817
///
@@ -317,16 +316,13 @@ class SkiaPerfGcsAdaptor {
317316
/// json files can be put in that leaf directory. We intend to use multiple
318317
/// json files in the future to scale up the system if too many writes are
319318
/// competing for the same json file.
320-
static Future<String> computeObjectName(String githubRepo, String revision,
321-
{GithubHelper githubHelper}) async {
319+
static Future<String> computeObjectName(String githubRepo, String revision, DateTime commitTime) async {
322320
assert(_githubRepoToGcsName[githubRepo] != null);
323321
final String topComponent = _githubRepoToGcsName[githubRepo];
324-
final DateTime t = await (githubHelper ?? GithubHelper())
325-
.getCommitDateTime(githubRepo, revision);
326-
final String month = t.month.toString().padLeft(2, '0');
327-
final String day = t.day.toString().padLeft(2, '0');
328-
final String hour = t.hour.toString().padLeft(2, '0');
329-
final String dateComponents = '${t.year}/$month/$day/$hour';
322+
final String month = commitTime.month.toString().padLeft(2, '0');
323+
final String day = commitTime.day.toString().padLeft(2, '0');
324+
final String hour = commitTime.hour.toString().padLeft(2, '0');
325+
final String dateComponents = '${commitTime.year}/$month/$day/$hour';
330326
return '$topComponent/$dateComponents/$revision/values.json';
331327
}
332328

@@ -392,7 +388,7 @@ class SkiaPerfDestination extends MetricDestination {
392388
}
393389

394390
@override
395-
Future<void> update(List<MetricPoint> points) async {
391+
Future<void> update(List<MetricPoint> points, DateTime commitTime) async {
396392
// 1st, create a map based on git repo, git revision, and point id. Git repo
397393
// and git revision are the top level components of the Skia perf GCS object
398394
// name.
@@ -411,7 +407,7 @@ class SkiaPerfDestination extends MetricDestination {
411407
for (final String repo in pointMap.keys) {
412408
for (final String revision in pointMap[repo].keys) {
413409
final String objectName =
414-
await SkiaPerfGcsAdaptor.computeObjectName(repo, revision);
410+
await SkiaPerfGcsAdaptor.computeObjectName(repo, revision, commitTime);
415411
final Map<String, SkiaPerfPoint> newPoints = pointMap[repo][revision];
416412
// If too many bots are writing the metrics of a git revision into this
417413
// single json file (with name `objectName`), the contention on the lock

‎packages/metrics_center/pubspec.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ environment:
99
sdk: '>=2.10.0 <3.0.0'
1010

1111
dependencies:
12-
args: ^1.6.0
1312
crypto: ^2.1.5
1413
equatable: ^1.2.5
1514
gcloud: ^0.7.3
16-
github: ^8.1.0
1715
googleapis: ^0.56.1
1816
googleapis_auth: ^0.2.12
1917
http: ^0.12.2

‎packages/metrics_center/test/flutter_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ void main() {
4444
final FlutterDestination dst =
4545
await FlutterDestination.makeFromCredentialsJson(credentialsJson,
4646
isTesting: true);
47-
dst.update(<FlutterEngineMetricPoint>[simplePoint]);
47+
dst.update(<FlutterEngineMetricPoint>[simplePoint], DateTime.fromMillisecondsSinceEpoch(123));
4848
}, skip: credentialsJson == null);
4949
}

‎packages/metrics_center/test/github_helper_test.dart‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎packages/metrics_center/test/skiaperf_test.dart‎

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import 'package:metrics_center/metrics_center.dart';
1313
import 'package:mockito/mockito.dart';
1414

1515
import 'package:metrics_center/src/constants.dart';
16-
import 'package:metrics_center/src/github_helper.dart';
1716
import 'package:metrics_center/src/gcs_lock.dart';
1817

1918
import 'common.dart';
@@ -23,8 +22,6 @@ class MockBucket extends Mock implements Bucket {}
2322

2423
class MockObjectInfo extends Mock implements ObjectInfo {}
2524

26-
class MockGithubHelper extends Mock implements GithubHelper {}
27-
2825
class MockGcsLock implements GcsLock {
2926
@override
3027
Future<void> protectedRun(
@@ -317,35 +314,27 @@ Future<void> main() async {
317314
});
318315

319316
test('SkiaPerfGcsAdaptor computes name correctly', () async {
320-
final MockGithubHelper mockHelper = MockGithubHelper();
321-
when(mockHelper.getCommitDateTime(
322-
kFlutterFrameworkRepo, kFrameworkRevision1))
323-
.thenAnswer((_) => Future<DateTime>.value(DateTime(2019, 12, 4, 23)));
324317
expect(
325318
await SkiaPerfGcsAdaptor.computeObjectName(
326319
kFlutterFrameworkRepo,
327320
kFrameworkRevision1,
328-
githubHelper: mockHelper,
321+
DateTime.fromMillisecondsSinceEpoch(1575529660000),
329322
),
330323
equals('flutter-flutter/2019/12/04/23/$kFrameworkRevision1/values.json'),
331324
);
332-
when(mockHelper.getCommitDateTime(kFlutterEngineRepo, kEngineRevision1))
333-
.thenAnswer((_) => Future<DateTime>.value(DateTime(2019, 12, 3, 20)));
334325
expect(
335326
await SkiaPerfGcsAdaptor.computeObjectName(
336327
kFlutterEngineRepo,
337328
kEngineRevision1,
338-
githubHelper: mockHelper,
329+
DateTime.fromMillisecondsSinceEpoch(1575432460000),
339330
),
340331
equals('flutter-engine/2019/12/03/20/$kEngineRevision1/values.json'),
341332
);
342-
when(mockHelper.getCommitDateTime(kFlutterEngineRepo, kEngineRevision2))
343-
.thenAnswer((_) => Future<DateTime>.value(DateTime(2020, 1, 3, 15)));
344333
expect(
345334
await SkiaPerfGcsAdaptor.computeObjectName(
346335
kFlutterEngineRepo,
347336
kEngineRevision2,
348-
githubHelper: mockHelper,
337+
DateTime.fromMillisecondsSinceEpoch(1578092860000),
349338
),
350339
equals('flutter-engine/2020/01/03/15/$kEngineRevision2/values.json'),
351340
);
@@ -356,7 +345,7 @@ Future<void> main() async {
356345
final SkiaPerfGcsAdaptor skiaPerfGcs = SkiaPerfGcsAdaptor(testBucket);
357346

358347
final String testObjectName = await SkiaPerfGcsAdaptor.computeObjectName(
359-
kFlutterFrameworkRepo, kFrameworkRevision1);
348+
kFlutterFrameworkRepo, kFrameworkRevision1, DateTime.fromMillisecondsSinceEpoch(123));
360349

361350
final List<SkiaPerfPoint> writePoints = <SkiaPerfPoint>[
362351
SkiaPerfPoint.fromPoint(cocoonPointRev1Metric1),
@@ -393,7 +382,7 @@ Future<void> main() async {
393382
final MockBucket testBucket = MockBucket();
394383
final SkiaPerfGcsAdaptor skiaPerfGcs = SkiaPerfGcsAdaptor(testBucket);
395384
final String testObjectName = await SkiaPerfGcsAdaptor.computeObjectName(
396-
kFlutterFrameworkRepo, kFrameworkRevision1);
385+
kFlutterFrameworkRepo, kFrameworkRevision1, DateTime.fromMillisecondsSinceEpoch(123));
397386
when(testBucket.info(testObjectName))
398387
.thenThrow(Exception('No such object'));
399388
expect((await skiaPerfGcs.readPoints(testObjectName)).length, 0);
@@ -423,7 +412,7 @@ Future<void> main() async {
423412
final SkiaPerfGcsAdaptor skiaPerfGcs = SkiaPerfGcsAdaptor(testBucket);
424413

425414
final String testObjectName = await SkiaPerfGcsAdaptor.computeObjectName(
426-
kFlutterFrameworkRepo, kFrameworkRevision1);
415+
kFlutterFrameworkRepo, kFrameworkRevision1, DateTime.fromMillisecondsSinceEpoch(123));
427416

428417
await skiaPerfGcs.writePoints(testObjectName, <SkiaPerfPoint>[
429418
SkiaPerfPoint.fromPoint(cocoonPointRev1Metric1),
@@ -452,7 +441,7 @@ Future<void> main() async {
452441
final SkiaPerfGcsAdaptor skiaPerfGcs = SkiaPerfGcsAdaptor(testBucket);
453442

454443
final String testObjectName = await SkiaPerfGcsAdaptor.computeObjectName(
455-
kFlutterEngineRepo, engineRevision);
444+
kFlutterEngineRepo, engineRevision, DateTime.fromMillisecondsSinceEpoch(123));
456445

457446
await skiaPerfGcs.writePoints(testObjectName, <SkiaPerfPoint>[
458447
SkiaPerfPoint.fromPoint(enginePoint1),
@@ -505,18 +494,18 @@ Future<void> main() async {
505494
() async {
506495
expect(
507496
await SkiaPerfGcsAdaptor.computeObjectName(
508-
kFlutterFrameworkRepo, kFrameworkRevision1),
497+
kFlutterFrameworkRepo, kFrameworkRevision1, DateTime.fromMillisecondsSinceEpoch(1575529660000),),
509498
equals(
510499
'flutter-flutter/2019/12/04/23/$kFrameworkRevision1/values.json'),
511500
);
512501
expect(
513502
await SkiaPerfGcsAdaptor.computeObjectName(
514-
kFlutterEngineRepo, kEngineRevision1),
503+
kFlutterEngineRepo, kEngineRevision1, DateTime.fromMillisecondsSinceEpoch(1575432460000),),
515504
equals('flutter-engine/2019/12/03/20/$kEngineRevision1/values.json'),
516505
);
517506
expect(
518507
await SkiaPerfGcsAdaptor.computeObjectName(
519-
kFlutterEngineRepo, kEngineRevision2),
508+
kFlutterEngineRepo, kEngineRevision2, DateTime.fromMillisecondsSinceEpoch(1578092860000),),
520509
equals('flutter-engine/2020/01/03/15/$kEngineRevision2/values.json'),
521510
);
522511
},
@@ -527,11 +516,11 @@ Future<void> main() async {
527516
final SkiaPerfGcsAdaptor mockGcs = MockSkiaPerfGcsAdaptor();
528517
final GcsLock mockLock = MockGcsLock();
529518
final SkiaPerfDestination dst = SkiaPerfDestination(mockGcs, mockLock);
530-
await dst.update(<MetricPoint>[cocoonPointRev1Metric1]);
531-
await dst.update(<MetricPoint>[cocoonPointRev1Metric2]);
519+
await dst.update(<MetricPoint>[cocoonPointRev1Metric1], DateTime.fromMillisecondsSinceEpoch(123));
520+
await dst.update(<MetricPoint>[cocoonPointRev1Metric2], DateTime.fromMillisecondsSinceEpoch(123));
532521
List<SkiaPerfPoint> points = await mockGcs.readPoints(
533522
await SkiaPerfGcsAdaptor.computeObjectName(
534-
kFlutterFrameworkRepo, kFrameworkRevision1));
523+
kFlutterFrameworkRepo, kFrameworkRevision1, DateTime.fromMillisecondsSinceEpoch(123)));
535524
expect(points.length, equals(2));
536525
expectSetMatch(
537526
points.map((SkiaPerfPoint p) => p.testName), <String>[kTaskName]);
@@ -543,26 +532,26 @@ Future<void> main() async {
543532
final MetricPoint updated =
544533
MetricPoint(kValue3, cocoonPointRev1Metric1.tags);
545534

546-
await dst.update(<MetricPoint>[updated, cocoonPointRev2Metric1]);
535+
await dst.update(<MetricPoint>[updated, cocoonPointRev2Metric1], DateTime.fromMillisecondsSinceEpoch(123));
547536

548537
points = await mockGcs.readPoints(
549538
await SkiaPerfGcsAdaptor.computeObjectName(
550-
kFlutterFrameworkRepo, kFrameworkRevision2));
539+
kFlutterFrameworkRepo, kFrameworkRevision2, DateTime.fromMillisecondsSinceEpoch(123)));
551540
expect(points.length, equals(1));
552541
expect(points[0].gitHash, equals(kFrameworkRevision2));
553542
expect(points[0].value, equals(kValue3));
554543

555544
points = await mockGcs.readPoints(
556545
await SkiaPerfGcsAdaptor.computeObjectName(
557-
kFlutterFrameworkRepo, kFrameworkRevision1));
546+
kFlutterFrameworkRepo, kFrameworkRevision1, DateTime.fromMillisecondsSinceEpoch(123)));
558547
expectSetMatch(
559548
points.map((SkiaPerfPoint p) => p.value), <double>[kValue2, kValue3]);
560549
});
561550

562551
Future<void> skiaPerfDestinationIntegrationTest() async {
563552
final SkiaPerfDestination destination =
564553
SkiaPerfDestination(SkiaPerfGcsAdaptor(testBucket), testLock);
565-
await destination.update(<MetricPoint>[cocoonPointRev1Metric1]);
554+
await destination.update(<MetricPoint>[cocoonPointRev1Metric1], DateTime.fromMillisecondsSinceEpoch(123));
566555
}
567556

568557
test(

0 commit comments

Comments
 (0)