Merge branch 'net6.0' of https://github.com/dodyg/practical-aspnetcore into net6.0

dodyg · dodyg · commit c95119e0e0a1 · 2023-09-25T10:42:33.000+03:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Samples for ASP.NET Core 6.0, 7.0 and 8.0 RC 1 (496)
+# Samples for ASP.NET Core 6.0, 7.0 and 8.0 RC 1 (497)
 
 - Samples for ASP.NET Core **8.0 RC 1** is available [here](/projects/.net8) (34).
 - Samples for ASP.NET Core **7.0** is available [here](/projects/.net7) (45).
@@ -30,7 +30,7 @@ Greetings from Cairo, Egypt. You can [sponsor](https://github.com/sponsors/dodyg
 | [Health Check](/projects/health-check)                          | 6   |                                                                              |
 | [IHttpClientFactory](/projects/httpclientfactory)               | 4   |                                                                              |
 | [IHostedService](/projects/ihosted-service)                     | 2   |                                                                              |
-| [Logging](/projects/logging)                                    | 3   |                                                                              |
+| [Logging](/projects/logging)                                    | 4   |                                                                              |
 | [Localization and Globalization](/projects/localization)        | 6   |                                                                              |
 | [Middleware](/projects/middleware)                              | 14  |                                                                              |
 | [Mini Apps](/projects/mini)                                     | 2   |                                                                              |
diff --git a/projects/.net7/grpc-13/grpc-server.csproj b/projects/.net7/grpc-13/grpc-server.csproj
@@ -10,7 +10,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Google.Protobuf" Version="3.21.6" />
-    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.49.0" />
+    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.52.0" />
     <PackageReference Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/projects/.net7/grpc-14/grpc-server.csproj b/projects/.net7/grpc-14/grpc-server.csproj
@@ -10,7 +10,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Google.Protobuf" Version="3.21.6" />
-    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.49.0" />
+    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.52.0" />
     <PackageReference Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/projects/.net7/grpc-15/grpc-server.csproj b/projects/.net7/grpc-15/grpc-server.csproj
@@ -10,7 +10,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Google.Protobuf" Version="3.21.6" />
-    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.49.0" />
+    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.52.0" />
     <PackageReference Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/projects/.net7/grpc-16/grpc-server.csproj b/projects/.net7/grpc-16/grpc-server.csproj
@@ -10,7 +10,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Google.Protobuf" Version="3.21.6" />
-    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.49.0" />
+    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.52.0" />
     <PackageReference Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/projects/.net7/grpc-17/grpc-server.csproj b/projects/.net7/grpc-17/grpc-server.csproj
@@ -10,7 +10,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Google.Protobuf" Version="3.21.6" />
-    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.49.0" />
+    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.52.0" />
     <PackageReference Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/projects/caching/caching-4/Program.cs b/projects/caching/caching-4/Program.cs
@@ -23,6 +23,8 @@
 
 app.Run(async context =>
 {
+    if (context.Request.Path == "/favicon.ico") return;//skip favicon request
+
     var log = context.RequestServices.GetService<ILoggerFactory>().CreateLogger("app");
     var cache = context.RequestServices.GetService<IMemoryCache>();
     var greeting = cache.Get(CACHE_KEY) as string;
diff --git a/projects/logging/README.md b/projects/logging/README.md
@@ -1,4 +1,4 @@
-# Logging (3)
+# Logging (4)
 
 * [Basic Logging](/projects/logging/logging-1)
 
@@ -12,4 +12,8 @@
 
   This example shows how to display log to console in structured JSON logs.
 
+* [Logging to Grafana Loki](/projects/logging/logging-Loki)
+
+  This example shows how to log to [Grafana Loki](https://grafana.com/oss/loki/).
+
   dotnet6
diff --git a/projects/logging/logging-Loki/Program.cs b/projects/logging/logging-Loki/Program.cs
@@ -0,0 +1,25 @@
+using LokiLoggingProvider.Options;
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Logging.AddLoki(configure =>
+{
+    configure.Client = PushClient.Grpc;
+    configure.StaticLabels.JobName = "LokiWebApplication";
+});
+
+var app = builder.Build();
+
+app.MapGet("/test", (ILoggerFactory loggerFactory) =>
+{
+    var logger = loggerFactory.CreateLogger("Start");
+    logger.LogTrace("Trace message");
+    logger.LogDebug("Debug message");
+    logger.LogInformation("Information message");
+    logger.LogWarning("Warning message");
+    logger.LogError("Error message");
+    logger.LogCritical("Critical message");
+    return "OK";
+});
+
+app.Run();
diff --git a/projects/logging/logging-Loki/README.md b/projects/logging/logging-Loki/README.md
@@ -0,0 +1,20 @@
+# Log into Grafana Loki 
+
+This example shows how to log to [Grafana Loki](https://grafana.com/oss/loki/). The Docker is used for the software hosting.
+
+ - open a command-line window in the folder and execute:
+ 
+ ```sh
+docker compose up
+ ```
+  - make sure that [Grafana Loki](https://grafana.com/oss/loki/) and [Grafana Dashboard](https://grafana.com/grafana/) containers are succesfully installed
+  - Compile and run the application
+ ```sh
+ dotnet build
+ dotnet run
+  ```
+  - Navigate to /test endpoint. The response should be 'OK'. The console window should contain **info**, **warn**, **fail** and **crit** log messages.
+  - Navigate in a browser to the Grafana Dashboard website: <http://localhost:3000/>
+  - Add a loki data source <http://loki:3100>
+  - Go to the 'Explore data' page and add Label filter:  ``job="LokiWebApplication"``. Press the 'Run query' button
+  - Log messages should be shown
diff --git a/projects/logging/logging-Loki/docker-compose.yml b/projects/logging/logging-Loki/docker-compose.yml
@@ -0,0 +1,29 @@
+version: '3.7'
+
+volumes:
+    grafana: ~
+    loki: ~
+
+services:
+    loki:
+        image: "grafana/loki:latest"
+        hostname: logs
+        command: -config.file=/etc/loki/local-config.yaml
+        volumes:
+            - loki:/loki
+        ports:
+            - "3100:3100" # http and Grafana data source
+            - "9095:9095" # grpc
+    grafana:
+        image: grafana/grafana-oss:latest-ubuntu
+        hostname: grafana
+        ports: 
+            - "3000:3000" #UI
+        volumes:
+            - grafana:/var/lib/grafana
+        environment:
+            - GF_AUTH_ANONYMOUS_ENABLED=true
+            - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
+            - GF_AUTH_DISABLE_LOGIN_FORM=true
+        depends_on:
+            - loki
diff --git a/projects/logging/logging-Loki/logging-Loki.csproj b/projects/logging/logging-Loki/logging-Loki.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="LokiLoggingProvider" Version="1.0.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/projects/signalr/signalr-1/Client/package-lock.json b/projects/signalr/signalr-1/Client/package-lock.json
diff --git a/projects/yarp/basic-demo/Yarp.Demo.Proxy/Yarp.Demo.Proxy.csproj b/projects/yarp/basic-demo/Yarp.Demo.Proxy/Yarp.Demo.Proxy.csproj
@@ -4,6 +4,6 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup> 
-    <PackageReference Include="Yarp.ReverseProxy" Version="1.0.1" />
+    <PackageReference Include="Yarp.ReverseProxy" Version="1.1.2" />
    </ItemGroup> 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`
`24`	`24`	`app.Run(async context =>`
`25`	`25`	`{`
	`26`	`+ if (context.Request.Path == "/favicon.ico") return;//skip favicon request`
	`27`	`+`
`26`	`28`	`var log = context.RequestServices.GetService<ILoggerFactory>().CreateLogger("app");`
`27`	`29`	`var cache = context.RequestServices.GetService<IMemoryCache>();`
`28`	`30`	`var greeting = cache.Get(CACHE_KEY) as string;`