Merge branch 'main' of https://github.com/MicrosoftDocs/mslearn-dotne…

…t-cloudnative
jorgearteiro · Dec 22, 2023 · d01f411 · d01f411
2 parents bc40243 + 510d8b5
commit d01f411
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/.devcontainer/dotnet-observability/devcontainer.json b/.devcontainer/dotnet-observability/devcontainer.json
@@ -19,6 +19,9 @@
           }
       },
       "forwardPorts": [
+          3000,
+          9090,
+          9411,
           32000,
           32001
       ],
@@ -29,6 +32,15 @@
           "cpus": 4
       },
       "portsAttributes": {
+          "3000": {
+              "label": "Grafana"
+          },
+          "9090": {
+              "label": "Prometheus"
+          },
+          "9411": {
+              "label": "Zipkin"
+          },
           "32001": {
               "label": "Back End"
           },

diff --git a/dotnet-observability/eShopLite/Products/Products.csproj b/dotnet-observability/eShopLite/Products/Products.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.*-*" />
     <PackageReference Include="Microsoft.Extensions.Telemetry" Version="8.0.*-*" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.*-*" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.6.*-*" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.*-*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/dotnet-observability/eShopLite/Products/Program.cs b/dotnet-observability/eShopLite/Products/Program.cs
@@ -1,11 +1,13 @@
-using Microsoft.EntityFrameworkCore;
+vusing Microsoft.EntityFrameworkCore;
 using Products.Data;
 using Products.Endpoints;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddDbContext<ProductDataContext>(options =>
     options.UseSqlite(builder.Configuration.GetConnectionString("ProductsContext") ?? throw new InvalidOperationException("Connection string 'ProductsContext' not found.")));
 
+// Add observability code here
+
 // Add services to the container.
 var app = builder.Build();
 

diff --git a/dotnet-observability/eShopLite/Store/Program.cs b/dotnet-observability/eShopLite/Store/Program.cs
@@ -15,7 +15,7 @@
 builder.Services.AddRazorComponents()
     .AddInteractiveServerComponents();
 
-// Add logging
+// Add observability code here
 
 
 var app = builder.Build();

diff --git a/dotnet-observability/eShopLite/Store/Store.csproj b/dotnet-observability/eShopLite/Store/Store.csproj
@@ -13,8 +13,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Telemetry" Version="8.0.*-*" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.6.*-*" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.6.*-*" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.*-*" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.*-*" />
   </ItemGroup>
 
 </Project>