Merge branch 'main' of github.com:alexmickelson/canvasManagement

This commit is contained in:
2024-01-03 10:36:11 -07:00
12 changed files with 168 additions and 44 deletions

View File

@@ -8,6 +8,10 @@
<PackageReference Include="BlazorMonaco" Version="3.0.0" />
<PackageReference Include="dotenv.net" Version="3.1.2" />
<PackageReference Include="Markdig" Version="0.31.0" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
</ItemGroup>
<PropertyGroup>

View File

@@ -1,7 +1,5 @@
@page "/"
@using CanvasModel.EnrollmentTerms
@using Management.Web.Shared.Course
@using Management.Web.Shared.Semester
@using CanvasModel.Courses
@using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage
@using LocalModels
@@ -47,7 +45,7 @@
<CurrentFiles RefreshKey="refreshKey" />
</div>
</div>
@if(!showNewFile)
{
<div class="text-center">
@@ -79,4 +77,4 @@
<br>
@* <MonacoEditorDemo /> *@
@* <MonacoEditorDemo /> *@

View File

@@ -10,13 +10,14 @@ global using LocalModels;
global using Management.Planner;
global using Management.Web.Shared.Components;
global using Management.Web.Shared;
global using Management.Web.Shared.Components.Forms;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
using dotenv.net;
using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.AspNetCore.Hosting.Server.Features;
using OpenTelemetry.Logs;
using OpenTelemetry.Metrics;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace;
DotEnv.Load();
@@ -32,6 +33,42 @@ if (canvas_url == null)
Environment.SetEnvironmentVariable("CANVAS_URL", "https://snow.instructure.com");
}
const string serviceName = "canvas-management";
// builder.Logging.AddOpenTelemetry(options =>
// {
// options
// .SetResourceBuilder(
// ResourceBuilder
// .CreateDefault()
// .AddService(serviceName)
// )
// .AddOtlpExporter(o =>
// {
// o.Endpoint = new Uri("http://localhost:4317/");
// })
// .AddConsoleExporter();
// });
builder.Services.AddOpenTelemetry()
.ConfigureResource(resource => resource.AddService(serviceName))
.WithTracing(tracing => tracing
.AddSource(DiagnosticsConfig.SourceName)
.AddOtlpExporter(o =>
{
o.Endpoint = new Uri("http://localhost:4317/");
})
.AddAspNetCoreInstrumentation()
.AddConsoleExporter()
);
// .WithMetrics(metrics => metrics
// .AddOtlpExporter(o => {
// o.Endpoint = new Uri("http://localhost:4317/");
// })
// .AddAspNetCoreInstrumentation()
// .AddConsoleExporter()
// );
// Add services to the container.
builder.Services.AddRazorPages();
builder.Services.AddServerSideBlazor();
@@ -59,7 +96,7 @@ builder.Services.AddScoped<DragContainer>();
builder.Services.AddSignalR(e =>
{
e.MaximumReceiveMessageSize = 102400000;
e.MaximumReceiveMessageSize = 102400000;
});
@@ -90,7 +127,7 @@ var addresses = app.Services.GetService<IServer>()?.Features.Get<IServerAddresse
foreach (var address in addresses)
{
Console.WriteLine("Running at: " + address);
Console.WriteLine("Running at: " + address);
}
app.WaitForShutdown();
app.WaitForShutdown();

View File

@@ -2,8 +2,8 @@
"DetailedErrors": true,
"Logging": {
"LogLevel": {
"Default": "Error",
"Microsoft.AspNetCore": "Error"
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
}
}

View File

@@ -1,7 +1,7 @@
{
"Logging": {
"LogLevel": {
"Default": "Error",
"Default": "Trace",
"Microsoft.AspNetCore": "Warning"
}
},