huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try self-contained

This commit is contained in:
Pranav K 2020-01-09 19:02:28 -08:00
parent dd524df6bb
commit 1e62df1a2d
No known key found for this signature in database
GPG Key ID: F748807460A27E91
10 changed files with 85 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Components/benchmarkapps/Wasm.Performance/Driver/BenchmarkResultsStartup.cs
View File

@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Text.Json;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
@ -22,12 +23,13 @@ namespace Wasm.Performance.Driver
{
app.UseCors();
app.Run(async request =>
app.Run(async context =>
{
var result = await JsonSerializer.DeserializeAsync<List<BenchmarkResult>>(request.Request.Body, new JsonSerializerOptions
var result = await JsonSerializer.DeserializeAsync<List<BenchmarkResult>>(context.Request.Body, new JsonSerializerOptions
{
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
});
await context.Response.WriteAsync("OK");
Program.SetBenchmarkResult(result);
});
}

39
src/Components/benchmarkapps/Wasm.Performance/Driver/Program.cs
View File

@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.ExceptionServices;
@ -40,8 +39,10 @@ namespace Wasm.Performance.Driver
// This write is required for the benchmarking infrastructure.
Console.WriteLine("Application started.");
using var browser = await Selenium.CreateBrowser(seleniumPort);
var cancellationToken = new CancellationTokenSource(Timeout);
cancellationToken.Token.Register(() => benchmarkResult.TrySetException(new TimeoutException($"Timed out after {Timeout}")));
using var browser = await Selenium.CreateBrowser(seleniumPort, cancellationToken.Token);
using var testApp = StartTestApp();
using var benchmarkReceiver = StartBenchmarkResultReceiver();
@ -54,9 +55,6 @@ namespace Wasm.Performance.Driver
browser.Url = launchUrl;
browser.Navigate();
var cancellationToken = new CancellationTokenSource(Timeout);
cancellationToken.Token.Register(() => benchmarkResult.TrySetException(new TimeoutException($"Timed out after {Timeout}")));
var results = await benchmarkResult.Task;
FormatAsBenchmarksOutput(results);
@ -96,24 +94,45 @@ namespace Wasm.Performance.Driver
output.Metadata.Add(new BenchmarkMetadata
{
Source = "BlazorWasm",
Name = "Publish size (linked)",
ShortDescription = "Publish size - linked app (MB)",
LongDescription = "Publish size - linked app (MB)",
Name = "Publish size",
ShortDescription = "Publish size (KB)",
LongDescription = "Publish size (KB)",
Format = "n2",
});
var testAssembly = typeof(TestApp.Startup).Assembly;
var testAssemblyLocation = new FileInfo(testAssembly.Location);
var testApp = new DirectoryInfo(Path.Combine(
Path.GetDirectoryName(testAssembly.Location),
testAssemblyLocation.Directory.FullName,
testAssembly.GetName().Name));
output.Measurements.Add(new BenchmarkMeasurement
{
Timestamp = DateTime.UtcNow,
Name = "Publish size (linked)",
Name = "Publish size",
Value = GetDirectorySize(testApp) / 1024,
});
output.Metadata.Add(new BenchmarkMetadata
{
Source = "BlazorWasm",
Name = "Publish size (compressed)",
ShortDescription = "Publish size compressed app (KB)",
LongDescription = "Publish size - compressed app (KB)",
Format = "n2",
});
var gzip = new FileInfo(Path.Combine(
testAssemblyLocation.Directory.FullName,
$"{testAssembly.GetName().Name}.gzip"));
output.Measurements.Add(new BenchmarkMeasurement
{
Timestamp = DateTime.UtcNow,
Name = "Publish size (compressed)",
Value = (gzip.Exists ? gzip.Length : 0) / 1024,
});
Console.WriteLine("#StartJobStatistics");
Console.WriteLine(JsonSerializer.Serialize(output));
Console.WriteLine("#EndJobStatistics");

30
src/Components/benchmarkapps/Wasm.Performance/Driver/Selenium.cs
View File

@ -2,8 +2,10 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using OpenQA.Selenium;
using OpenQA.Selenium.Chrome;
@ -14,8 +16,9 @@ namespace Wasm.Performance.Driver
class Selenium
{
static bool RunHeadlessBrowser = true;
static bool PoolForBrowserLogs = true;
private static async ValueTask<Uri> WaitForServerAsync(int port)
private static async ValueTask<Uri> WaitForServerAsync(int port, CancellationToken cancellationToken)
{
var uri = new UriBuilder("http", "localhost", port, "/wd/hub/").Uri;
var httpClient = new HttpClient
@ -34,7 +37,7 @@ namespace Wasm.Performance.Driver
retries++;
try
{
var response = (await httpClient.GetAsync("status")).EnsureSuccessStatusCode();
var response = (await httpClient.GetAsync("status", cancellationToken)).EnsureSuccessStatusCode();
Console.WriteLine("Connected to Selenium");
return uri;
}
@ -52,9 +55,9 @@ namespace Wasm.Performance.Driver
throw new Exception($"Unable to connect to selenium-server at {uri}");
}
public static async Task<RemoteWebDriver> CreateBrowser(int port)
public static async Task<RemoteWebDriver> CreateBrowser(int port, CancellationToken cancellationToken)
{
var uri = await WaitForServerAsync(port);
var uri = await WaitForServerAsync(port, cancellationToken);
var options = new ChromeOptions();
@ -82,6 +85,25 @@ namespace Wasm.Performance.Driver
driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(1);
if (PoolForBrowserLogs)
{
// Run in background.
var logs = new RemoteLogs(driver);
_ = Task.Run(async () =>
{
while (!cancellationToken.IsCancellationRequested)
{
await Task.Delay(TimeSpan.FromSeconds(3));
var consoleLogs = logs.GetLog(LogType.Browser);
foreach (var entry in consoleLogs)
{
Console.WriteLine($"[Browser Log]: {entry.Timestamp}: {entry.Message}");
}
}
});
}
return driver;
}
catch (Exception ex)

8
src/Components/benchmarkapps/Wasm.Performance/README.md
View File

@ -5,7 +5,9 @@ See https://github.com/aspnet/Benchmarks#benchmarks for usage guidance on using
### Running the benchmarks
The TestApp is a regular BlazorWASM project and can be run using `dotnet run`. The Driver is an app that speaks the Benchmark protocol. You generally do not need to run the Driver locally, but if you were to do so, you require docker. Here are the commands you would need to run it locally:
The TestApp is a regular BlazorWASM project and can be run using `dotnet run`. The Driver is an app that connects against an existing Selenium server, and speaks the Benchmark protocol. You generally do not need to run the Driver locally, but if you were to do so, you can either start a selenium-server instance and run using `dotnet run [<selenium-server-port>]` or run it inside a Linux-based docker container.
Here are the commands you would need to run it locally inside docker:
1. `dotnet publish -c Release -r linux-x64 Driver/Wasm.Performance.Driver.csproj`
2. `docker build -t blazor-local -f ./local.dockerfile . `
@ -14,5 +16,5 @@ The TestApp is a regular BlazorWASM project and can be run using `dotnet run`. T
To run the benchmark app in the Benchmark server, run
```
dotnet run -- --config aspnetcore/src/Components/benchmarkapps/Wasm.Performance/benchmarks.compose.json --services.blazorwasmbenchmark.endpoints <BenchmarkServerUri>
```
dotnet run -- --config aspnetcore/src/Components/benchmarkapps/Wasm.Performance/benchmarks.compose.json application.endpoints <BenchmarkServerUri> --scenario blazorwasmbenchmark
```

5
src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/benchmarks/index.js
View File

@ -1,7 +1,7 @@
import { groups, BenchmarkEvent, onBenchmarkEvent } from './lib/minibench/minibench.js';
import { HtmlUI } from './lib/minibench/minibench.ui.js';
// import './appStartup.js';
// import './renderList.js';
import './appStartup.js';
import './renderList.js';
import './jsonHandling.js';
new HtmlUI('E2E Performance', '#display');
@ -21,6 +21,7 @@ if (location.href.indexOf('#automated') !== -1) {
break;
case BenchmarkEvent.benchmarkCompleted:
case BenchmarkEvent.benchmarkError:
console.log(`Completed benchmark ${args.name}`);
benchmarksResults.push(args);
break;
case BenchmarkEvent.runCompleted:

2
src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/benchmarks/lib/minibench/minibench.js
View File

@ -302,7 +302,7 @@ class Group extends EventEmitter {
}
const groups = [];
let reportBenchmarkEvent;
let reportBenchmarkEvent = () => {};
function group(name, configure) {
groups.push(new Group(name));

17
src/Components/benchmarkapps/Wasm.Performance/benchmarks.compose.json
View File

@ -1,16 +1,21 @@
{
"dependencies": [
"blazorwasmbenchmark"
],
"services": {
"$schema": "https://raw.githubusercontent.com/aspnet/Benchmarks/master/src/BenchmarksDriver2/benchmarks.schema.json",
"scenarios": {
"blazorwasmbenchmark": {
"application": {
"job": "blazorwasmbenchmark"
}
}
},
"jobs": {
"blazorwasmbenchmark": {
"source": {
"repository": "https://github.com/dotnet/AspNetCore.git",
"branchOrCommit": "prkrishn/blazor-benchmarking",
"branchOrCommit": "blazor-wasm",
"dockerfile": "src/Components/benchmarkapps/Wasm.Performance/dockerfile"
},
"waitForExit": true,
"readyStateText": "Application started."
}
}
}
}

4
src/Components/benchmarkapps/Wasm.Performance/dockerfile
View File

@ -11,7 +11,7 @@ RUN apt-get update \
nodejs \
git
ARG gitBranch=prkrishn/blazor-benchmarking
ARG gitBranch=blazor-wasm
WORKDIR /src
ADD https://api.github.com/repos/dotnet/aspnetcore/git/ref/heads/${gitBranch} /aspnetcore.commit
@ -29,4 +29,4 @@ FROM selenium/standalone-chrome:3.141.59-mercury as final
COPY --from=build ./app ./
COPY ./exec.sh ./
ENTRYPOINT [ "bash", "./exec.sh" ]
ENTRYPOINT [ "bash", "./exec.sh" ]

4
src/Components/benchmarkapps/Wasm.Performance/local.dockerfile
View File

@ -2,6 +2,6 @@ FROM selenium/standalone-chrome:3.141.59-mercury as final
WORKDIR /app
COPY ./Driver/bin/Release/netcoreapp3.1/linux-x64/publish ./
COPY ./exec.sh ./exec.sh
COPY ./exec.sh ./
ENTRYPOINT [ "bash", "./exec.sh" ]
ENTRYPOINT [ "bash", "./exec.sh" ]

6
src/Components/test/E2ETest/Tests/PerformanceTest.cs
View File

@ -52,10 +52,8 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests
() => runAllButton.Displayed || Browser.FindElements(By.CssSelector(".benchmark-error")).Any(),
TimeSpan.FromSeconds(60));
var finishedBenchmarks = Browser.FindElements(By.CssSelector(".benchmark-idle"));
var failedBenchmarks = Browser.FindElements(By.CssSelector(".benchmark-error"));
Assert.NotEmpty(finishedBenchmarks);
Assert.Empty(failedBenchmarks);
Browser.DoesNotExist(By.CssSelector(".benchmark-error")); // no failures
Browser.Exists(By.CssSelector(".benchmark-idle")); // everything's done
}
}
}