Merge pull request #22 from platzi/amines/21

Amines/21

Author: aminespinoza10

.github/workflows/pull_request_review.yml

@@ -5,6 +5,9 @@ on:
     branches:
       - main 
 
+env:
+  AZURE_MONITOR_CONNECTION_STRING: ${{ secrets.AZURE_MONITOR_KEY }}
+
 jobs:
   build-and-test:
     runs-on: ubuntu-latest

docs/clase13.md

@@ -38,7 +38,7 @@ jobs:
 
     - name: Terraform init
       id: init
-      run: terraform init -backend-config="sas_token={{secrets.SAS_TOKEN}}
+      run: terraform init -backend-config="{{secrets.SAS_TOKEN}}"
 
     - name: Terraform validate
       id: validate

docs/clase14.md

@@ -0,0 +1,66 @@
+# Material de la clase 14
+
+Aquí tienes el material para la clase 14
+
+El formato de JSON que necesitas para tus credenciales es el siguiente:
+
+```json
+{
+    "clientSecret":  "<password>",
+    "subscriptionId":  "<subscriptionId>",
+    "tenantId":  "<tenant>",
+    "clientId":  "<appId>"
+}
+```
+
+Luego sigue el código para actualizar la Github Action
+
+```yml
+name: API Contactos CI/CD
+
+on:
+  push:
+    branches: [ "main" ]
+
+env:
+  IMAGE_BASE_NAME: aminespinoza/apicontactos:latest
+  RESOURCE_GROUP: rg--warm-wren
+  ENVIRONMENT_NAME: devops-env
+
+jobs:
+  API_Image:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: src/ApiContactos
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+        
+      - name: Azure Login
+        uses: Azure/[email protected]
+        with:
+          creds: ${{ secrets.AZURE_CREDENTIALS }} 
+        
+      - name: Install az containerapp extension
+        run: |
+          az config set extension.use_dynamic_install=yes_without_prompt
+          
+      - name: Build Docker NET image
+        run: | 
+          docker build --platform linux -t $IMAGE_BASE_NAME .
+          
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Deploy image to hub
+        run: |
+          docker push $IMAGE_BASE_NAME
+          
+      - name: Deploy Container App
+        run: |
+          az containerapp up --name contactosapi --image $IMAGE_BASE_NAME --resource-group $RESOURCE_GROUP --environment $ENVIRONMENT_NAME --ingress external --target-port 8080
+```

docs/clase15.md

@@ -0,0 +1,94 @@
+# Material para la clase 15
+
+Agrega los siguientes paquetes de Nuget.
+
+```bash
+dotnet add package OpenTelemetry.Extensions.Hosting
+dotnet add package OpenTelemetry.Instrumentation.AspNetCore
+dotnet add package OpenTelemetry.Instrumentation.Http
+dotnet add package Azure.Monitor.OpenTelemetry.Exporter
+
+```
+
+Crea el archivo appsettings.json (asegúrate de NO SUBIR ESTE ARCHIVO A TU CONTROL DE VERSIONES).
+
+```json
+{
+  "AzureMonitor": {
+    "ConnectionString": "InstrumentationKey=<your-instrumentation-key>;IngestionEndpoint=https://<your-ingestion-endpoint>"
+  }
+}
+```
+
+Actualiza tu archivo Program.cs
+
+```csharp
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
+using OpenTelemetry.Metrics;
+using Azure.Monitor.OpenTelemetry.Exporter;
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddOpenTelemetry()
+    .WithMetrics(metricsBuilder =>
+    {
+        metricsBuilder
+            .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("ApiContactos"))
+            .AddAspNetCoreInstrumentation()
+            .AddHttpClientInstrumentation()
+            .AddAzureMonitorMetricExporter(o =>
+            {
+                o.ConnectionString = builder.Configuration["AzureMonitor:ConnectionString"] 
+                     ?? Environment.GetEnvironmentVariable("AZURE_MONITOR_CONNECTION_STRING");
+            });
+    })
+    .WithTracing(tracingBuilder =>
+    {
+        tracingBuilder
+            .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("ApiContactos"))
+            .AddAspNetCoreInstrumentation()
+            .AddHttpClientInstrumentation()
+            .AddAzureMonitorTraceExporter(o =>
+            {
+                o.ConnectionString = builder.Configuration["AzureMonitor:ConnectionString"];
+            });
+    });
+
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
+
+var app = builder.Build();
+app.UseSwagger();
+app.UseSwaggerUI();
+app.UseHttpsRedirection();
+
+var summaries = new[]
+{
+    "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
+};
+
+app.MapGet("/weatherforecast", () =>
+{
+    var forecast =  Enumerable.Range(1, 5).Select(index =>
+        new WeatherForecast
+        (
+            DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
+            Random.Shared.Next(-20, 55),
+            summaries[Random.Shared.Next(summaries.Length)]
+        ))
+        .ToArray();
+    return forecast;
+})
+.WithName("GetWeatherForecast")
+.WithOpenApi();
+
+app.Run();
+
+record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary)
+{
+    public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
+}
+
+public partial class Program { }
+```

docs/clase16.md

@@ -0,0 +1,16 @@
+# Material para la clase 16
+
+Estas son las consultas que vas a utilizar:
+
+```kql
+requests
+| where success == 'True'
+
+requests
+| summarize AverageDuration = avg(duration)
+
+requests
+| summarize OperationCount = count() by operation_Name
+| sort by OperationCount desc
+| top 1 by OperationCount
+```

docs/clase18.md

@@ -0,0 +1,66 @@
+# Material para la clase 18
+
+Agrega este nuevo método.
+
+```csharp
+app.MapGet("/obtenercontactos", () =>
+{
+    var contactos = new List<string> { "Amin Espinoza", "Oscar Barajas", "Pepe Rodelo" };
+    return contactos;
+})
+.WithName("ObtenerContactos")
+.WithOpenApi();
+
+app.Run();
+```
+
+Después agrega la prueba para esta nueva funcionalidad.
+
+```csharp
+using System.Net;
+using System.Text.Json;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Xunit;
+
+public class ContactosTest : IClassFixture<WebApplicationFactory<Program>>
+{
+    private readonly WebApplicationFactory<Program> _factory;
+
+    public ContactosTest(WebApplicationFactory<Program> factory)
+    {
+        _factory = factory;
+    }
+
+    [Fact]
+    public async Task ObtenerContactos_ReturnsExpectedContactList()
+    {
+        // Arrange
+        var client = _factory.CreateClient();
+
+        // Act
+        var response = await client.GetAsync("/obtenercontactos");
+
+        // Assert
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+        var responseString = await response.Content.ReadAsStringAsync();
+        var contactos = JsonSerializer.Deserialize<List<string>>(responseString, new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true
+        });
+
+        Assert.NotNull(contactos);
+        Assert.Equal(3, contactos.Count);
+        Assert.Contains("Amin Espinoza", contactos);
+        Assert.Contains("Oscar Barajas", contactos);
+        Assert.Contains("Pepe Rodelo", contactos);
+    }
+}
+```
+
+Modifica el acceso a tus variables de ambiente.
+
+```csharp
+o.ConnectionString = builder.Configuration["AzureMonitor:ConnectionString"] 
+                     ?? Environment.GetEnvironmentVariable("AZURE_MONITOR_CONNECTION_STRING");
+```

src/ContactosAPI/ContactosAPI.csproj

@@ -7,7 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.12" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
   </ItemGroup>
 

src/ContactosAPI/Program.cs

@@ -1,12 +1,40 @@
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
+using OpenTelemetry.Metrics;
+using Azure.Monitor.OpenTelemetry.Exporter;
+
 var builder = WebApplication.CreateBuilder(args);
 
-// Add services to the container.
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+builder.Services.AddOpenTelemetry()
+    .WithMetrics(metricsBuilder =>
+    {
+        metricsBuilder
+            .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("ApiContactos"))
+            .AddAspNetCoreInstrumentation()
+            .AddHttpClientInstrumentation()
+            .AddAzureMonitorMetricExporter(o =>
+            {
+                o.ConnectionString = builder.Configuration["AzureMonitor:ConnectionString"] 
+                     ?? Environment.GetEnvironmentVariable("AZURE_MONITOR_CONNECTION_STRING");
+            });
+    })
+    .WithTracing(tracingBuilder =>
+    {
+        tracingBuilder
+            .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("ApiContactos"))
+            .AddAspNetCoreInstrumentation()
+            .AddHttpClientInstrumentation()
+            .AddAzureMonitorTraceExporter(o =>
+            {
+                o.ConnectionString = builder.Configuration["AzureMonitor:ConnectionString"] 
+                     ?? Environment.GetEnvironmentVariable("AZURE_MONITOR_CONNECTION_STRING");
+            });
+    });
+
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
 
 var app = builder.Build();
-
 app.UseSwagger();
 app.UseSwaggerUI();
 app.UseHttpsRedirection();
@@ -38,4 +66,4 @@ record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary)
     public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
 }
 
-public partial class Program { } 
+public partial class Program { }