GRPC switch

Reviewed-on: #106

.dockerignore

@@ -27,4 +27,6 @@ README.md
 !.git/config
 !.git/packed-refs
 !.git/refs/heads/**
-
+# Ensure the build output is NOT ignored
+!**/bin/Release/**/publish/
+!**/publish/

.drone.yml

@@ -1,47 +1,68 @@
 ---
 kind: pipeline
 type: docker
-name: package
+name: build-and-package
-
-clone:
-  disable: true
 
 steps:
-  - name: clone
+  - name: build-test-publish
-    image: alpine/git
+    image: nexus.khongisa.co.za/sdk:10.0
     commands:
-      - git clone https://gitea.khongisa.co.za/MngomaLab/webapitest.git .
+      - dotnet restore --source https://nexus.khongisa.co.za/repository/nuget-group/index.json --no-cache
-      - git checkout ${DRONE_COMMIT}
+      - dotnet build --configuration Release --no-restore
+      - dotnet test --configuration Release --no-build
+      - dotnet publish --configuration Release --no-build
 
-  - name: dotnet publish
+  - name: docker-build-and-push
-    image: mcr.microsoft.com/dotnet/sdk:8.0
-    commands:
-      - dotnet publish --configuration Release
-      - ls ./SampleApi/bin/Release/net8.0/publish/
-  
-  - name: docker login
-    image: docker:20.10
-    environment:
-      DOCKER_USERNAME:
-        from_secret: docker_username
-      DOCKER_PASSWORD:
-        from_secret: docker_password
-    commands:
-      - echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
-      - docker info | grep "Registry"
-
-  - name: docker build and push
     image: plugins/docker
     settings:
-      repo: khwezi/webapitest
+      registry: nexus.khongisa.co.za
-      registry: index.docker.io      
+      repo: nexus.khongisa.co.za/webapitest
-      username:
+      tags: [ "${DRONE_BUILD_NUMBER}", "latest" ]
-        from_secret: docker_username
+      username: { from_secret: docker_username }
-      password: 
+      password: { from_secret: docker_password }
-        from_secret: docker_password
+
-      dockerfile: Dockerfile
+  - name: vulnerability-scan
-      context: .
+    image: aquasec/trivy:0.50.1
-      force_tag: true
+    environment:
-      tags:
+      TRIVY_USERNAME: { from_secret: docker_username }
-        - latest
+      TRIVY_PASSWORD: { from_secret: docker_password }
-        - ${DRONE_BUILD_NUMBER}
+    commands:
+      - trivy image --image-src remote --exit-code 1 --severity CRITICAL nexus.khongisa.co.za/webapitest:${DRONE_BUILD_NUMBER}
+
+trigger:
+  branch:
+    - main
+  event:
+    exclude:
+      - promote
+
+---
+kind: pipeline
+type: docker
+name: deploy-to-uat
+
+depends_on:
+  - build-and-package
+
+steps:
+  - name: uat-deployment
+    image: appleboy/drone-ssh
+    settings:
+      host: { from_secret: ssh_host }
+      username: { from_secret: ssh_user }
+      password: { from_secret: ssh_password }
+      script:
+        - echo $DOCKER_PASSWORD | docker login nexus.khongisa.co.za -u $DOCKER_USERNAME --password-stdin
+        - docker pull nexus.khongisa.co.za/webapitest:latest
+        - docker stop webapi 2>/dev/null || true
+        - docker rm webapi 2>/dev/null || true
+        - docker run -d --name webapi --restart unless-stopped -e ASPNETCORE_ENVIRONMENT=Development -p 4000:8081 nexus.khongisa.co.za/webapitest:latest
+    environment:
+      DOCKER_USERNAME: { from_secret: docker_username }
+      DOCKER_PASSWORD: { from_secret: docker_password }
+
+trigger:
+  event:
+    - promote
+  target:
+    - staging

Dockerfile

@@ -1,9 +1,11 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM nexus.khongisa.co.za/aspnet:10.0 AS final
 WORKDIR /app
 
-COPY ./SampleApi/bin/Release/net8.0/publish/ .
+USER app
+
+COPY --chown=app:app ./SampleApi/bin/Release/net10.0/publish/ .
 
-ENV ASPNETCORE_HTTP_PORTS=8081
 EXPOSE 8081
+ENV ASPNETCORE_HTTP_PORTS=8081
 
 ENTRYPOINT ["dotnet", "SampleApi.dll"]

SampleApi/Controllers/DemoController.cs

@@ -0,0 +1,51 @@
+using Microsoft.AspNetCore.Mvc;
+using System.Diagnostics;
+
+// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
+
+namespace SampleApi.Controllers
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class DemoController : ControllerBase
+    {
+        private static readonly ActivitySource MyActivitySource = new("SampleApi");
+
+        // GET: api/<DemoController>
+        [HttpGet]
+        public IEnumerable<string> Get(ILogger<DemoController> logger)
+        {
+            using var activity = MyActivitySource.StartActivity("ManualTraceTest");
+            activity?.SetTag("test.status", "success");
+
+            logger.LogInformation("sample api log");
+
+            return new string[] { "value1", "value2" };
+        }
+
+        // GET api/<DemoController>/5
+        [HttpGet("{id}")]
+        public string Get(int id)
+        {
+            return "value";
+        }
+
+        // POST api/<DemoController>
+        [HttpPost]
+        public void Post([FromBody] string value)
+        {
+        }
+
+        // PUT api/<DemoController>/5
+        [HttpPut("{id}")]
+        public void Put(int id, [FromBody] string value)
+        {
+        }
+
+        // DELETE api/<DemoController>/5
+        [HttpDelete("{id}")]
+        public void Delete(int id)
+        {
+        }
+    }
+}

SampleApi/Program.cs

@@ -1,25 +1,81 @@
+using OpenTelemetry.Exporter;
+using OpenTelemetry.Logs;
+using OpenTelemetry.Metrics;
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
+using System.Diagnostics.Metrics;
+
 var builder = WebApplication.CreateBuilder(args);
 
-// Add services to the container.
+// ONLY FOR TESTING: Allow untrusted certificates
+var handler = new HttpClientHandler
+{
+    ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true
+};
+builder.Services.AddHttpClient("OtlpClient").ConfigurePrimaryHttpMessageHandler(() => handler);
+
+// 1. Define Resource Information
+var resourceBuilder = ResourceBuilder.CreateDefault()
+    .AddService("SampleApi");
+
+// 2. Configuration Variables 
+// Using the API Key from your aspire-dashboard-auth secret
+var oltpApiKey = "mc3G63K2j5ZOEsi0AjMojLTXm1KEZFctzIIjSwDiTGut8qGSkPuWwxGP1RbscJUo";
+
+// Pointing to your Traefik IngressRoute. 
+// The SDK will append /v1/traces, /v1/metrics, etc., to this base URL
+var oltpAddress = "https://aspire.khongisa.co.za/otlp-grpc";
+//var oltpAddress = "https://aspire.khongisa.co.za/otlp-http";
 
 builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
 
+// 3. Configure OpenTelemetry Logging
+builder.Logging.AddOpenTelemetry(logging =>
+{
+    logging.SetResourceBuilder(resourceBuilder);
+    logging.AddOtlpExporter(opt =>
+    {
+        opt.Endpoint = new Uri(oltpAddress);
+        opt.Protocol = OtlpExportProtocol.Grpc; // Switched to gRPC
+        // Note: Headers are only needed if you re-enable ApiKey auth mode
+    });
+});
+
+// 4. Configure Tracing and Metrics
+builder.Services.AddOpenTelemetry()
+    .WithTracing(tracing => tracing
+        .SetResourceBuilder(resourceBuilder)
+        .AddAspNetCoreInstrumentation()
+        .AddHttpClientInstrumentation()
+        .AddOtlpExporter(opt =>
+        {
+            opt.Endpoint = new Uri(oltpAddress);
+            opt.Protocol = OtlpExportProtocol.Grpc;
+        }))
+    .WithMetrics(metrics => metrics
+        .SetResourceBuilder(resourceBuilder)
+        .AddMeter("SampleApi")
+        .AddAspNetCoreInstrumentation()
+        .AddRuntimeInstrumentation()
+        .AddOtlpExporter(opt =>
+        {
+            opt.Endpoint = new Uri(oltpAddress);
+            opt.Protocol = OtlpExportProtocol.Grpc;
+        }));
+
 var app = builder.Build();
 
-// Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
     app.UseSwaggerUI();
 }
 
-app.UseHttpsRedirection();
+app.UseRouting();
-
 app.UseAuthorization();
-
 app.MapControllers();
 
 app.Run();
+app.Run();

SampleApi/Properties/launchSettings.json

@@ -8,7 +8,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5221"
+      "applicationUrl": "http://0.0.0.0:5000"
     },
     "https": {
       "commandName": "Project",

SampleApi/SampleApi.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>cfe6b4ce-2d40-4273-b3a3-e4df67304fc5</UserSecretsId>
@@ -9,8 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
+    <PackageReference Include="Polly" Version="8.6.6" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.7" />
   </ItemGroup>
 
 </Project>