ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-01-14 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade DeviceStatus service to .NET 8 and add OpenTelemetry

Browse Source
This commit is contained in:
Chris Kaczor
2024-01-27 15:57:01 -05:00
parent 7b2a0c2fea
commit d8fd6d13f9
10 changed files with 101 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
DeviceStatus/Service/Controllers/StatusController.cs
View File

@@ -1,21 +1,14 @@
using Microsoft.AspNetCore.Mvc;
namespace Service.Controllers
{
[Route("[controller]")]
[ApiController]
public class StatusController : ControllerBase
{
private readonly DeviceRepository _deviceRepository;
public StatusController(DeviceRepository deviceRepository)
{
_deviceRepository = deviceRepository;
}
namespace ChrisKaczor.HomeMonitor.DeviceStatus.Service.Controllers;
[HttpGet("recent")]
public ActionResult<IEnumerable<Device>> GetRecent()
{
return _deviceRepository.Values;
}
[Route("[controller]")]
[ApiController]
public class StatusController(DeviceRepository deviceRepository) : ControllerBase
{
[HttpGet("recent")]
public ActionResult<IEnumerable<Device>> GetRecent()
{
return deviceRepository.Values;
}
}
}

16
DeviceStatus/Service/Device.cs
View File

@@ -1,22 +1,22 @@
using System.Text.Json.Serialization;
namespace Service;
namespace ChrisKaczor.HomeMonitor.DeviceStatus.Service;
public class Device
{
[JsonPropertyName("name")]
public string Name { get; }
[JsonPropertyName("status")]
public bool Status { get; private set; }
public Device(string name, string statusString)
{
Name = name;
Update(statusString);
}
public void Update(string statusString)
[JsonPropertyName("name")]
public string Name { get; }
[JsonPropertyName("status")]
public bool Status { get; private set; }
private void Update(string statusString)
{
Status = statusString == "1";
}

4
DeviceStatus/Service/DeviceRepository.cs
View File

@@ -1,3 +1,3 @@
namespace Service;
namespace ChrisKaczor.HomeMonitor.DeviceStatus.Service;
public class DeviceRepository : Dictionary<string, Device> { }
public class DeviceRepository : Dictionary<string, Device>;

6
DeviceStatus/Service/Dockerfile
View File

@@ -1,8 +1,8 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base
WORKDIR /app
EXPOSE 80
EXPOSE 8080
FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
WORKDIR /src
COPY ["./Service.csproj", "./"]
RUN dotnet restore "Service.csproj"

15
DeviceStatus/Service/LaundryMonitor.cs
View File

@@ -1,20 +1,13 @@
using RestSharp;
namespace Service;
namespace ChrisKaczor.HomeMonitor.DeviceStatus.Service;
public class LaundryMonitor
public class LaundryMonitor(IConfiguration configuration)
{
private readonly string _botToken = configuration["Telegram:BotToken"]!;
private readonly string _chatId = configuration["Telegram:ChatId"]!;
private readonly RestClient _restClient = new();
private readonly string _botToken;
private readonly string _chatId;
public LaundryMonitor(IConfiguration configuration)
{
_botToken = configuration["Telegram:BotToken"];
_chatId = configuration["Telegram:ChatId"];
}
public async Task HandleDeviceMessage(Device device)
{
try

55
DeviceStatus/Service/MessageHandler.cs
View File

@@ -3,33 +3,34 @@ using MQTTnet;
using MQTTnet.Client;
using System.Text.Json;
namespace Service;
namespace ChrisKaczor.HomeMonitor.DeviceStatus.Service;
public class MessageHandler : IHostedService
{
private IMqttClient? _mqttClient;
private HubConnection? _hubConnection;
private readonly IConfiguration _configuration;
private readonly DeviceRepository _deviceRepository;
private readonly LaundryMonitor _laundryMonitor;
private readonly Dictionary<string, Timer> _deviceTimers = new();
private readonly ILogger _logger;
private readonly TimeSpan _deviceDelayTime;
private readonly DeviceRepository _deviceRepository;
private readonly Dictionary<string, Timer> _deviceTimers = new();
private readonly LaundryMonitor _laundryMonitor;
private HubConnection? _hubConnection;
private IMqttClient? _mqttClient;
public MessageHandler(IConfiguration configuration, DeviceRepository deviceRepository, LaundryMonitor laundryMonitor)
public MessageHandler(IConfiguration configuration, DeviceRepository deviceRepository, LaundryMonitor laundryMonitor, ILogger<MessageHandler> logger)
{
_configuration = configuration;
_logger = logger;
_deviceRepository = deviceRepository;
_laundryMonitor = laundryMonitor;
_deviceDelayTime = TimeSpan.Parse(_configuration["DeviceStatus:DelayTime"]);
_deviceDelayTime = TimeSpan.Parse(_configuration["DeviceStatus:DelayTime"]!);
}
public async Task StartAsync(CancellationToken cancellationToken)
{
if (!string.IsNullOrEmpty(_configuration["Hub:DeviceStatus"]))
{
_hubConnection = new HubConnectionBuilder().WithUrl(_configuration["Hub:DeviceStatus"]).Build();
_hubConnection = new HubConnectionBuilder().WithUrl(_configuration["Hub:DeviceStatus"]!).Build();
_hubConnection.On("RequestLatestStatus", async () => await RequestLatestStatus());
await _hubConnection.StartAsync(cancellationToken);
@@ -45,16 +46,21 @@ public class MessageHandler : IHostedService
await _mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder()
.WithTopicFilter(
f =>
{
f.WithTopic("device-status/#");
})
.WithTopicFilter(f => f.WithTopic("device-status/#"))
.Build();
await _mqttClient.SubscribeAsync(mqttSubscribeOptions, CancellationToken.None);
}
public async Task StopAsync(CancellationToken cancellationToken)
{
if (_hubConnection != null)
await _hubConnection.StopAsync(cancellationToken);
if (_mqttClient != null)
await _mqttClient.DisconnectAsync(new MqttClientDisconnectOptionsBuilder().Build(), CancellationToken.None);
}
private async Task OnApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs arg)
{
var topic = arg.ApplicationMessage.Topic;
@@ -65,8 +71,8 @@ public class MessageHandler : IHostedService
var newDevice = new Device(deviceName, payload);
if (_deviceTimers.ContainsKey(newDevice.Name))
await _deviceTimers[newDevice.Name].DisposeAsync();
if (_deviceTimers.TryGetValue(newDevice.Name, out var deviceTimer))
await deviceTimer.DisposeAsync();
if (!_deviceRepository.ContainsKey(newDevice.Name) || newDevice.Status)
{
@@ -95,7 +101,7 @@ public class MessageHandler : IHostedService
private async void OnDeviceTimer(object? state)
{
var device = (Device)state!;
var device = (Device) state!;
await HandleDeviceMessage(device);
@@ -141,17 +147,8 @@ public class MessageHandler : IHostedService
}
}
public async Task StopAsync(CancellationToken cancellationToken)
private void WriteLog(string message)
{
if (_hubConnection != null)
await _hubConnection.StopAsync(cancellationToken);
if (_mqttClient != null)
await _mqttClient.DisconnectAsync(new MqttClientDisconnectOptionsBuilder().Build(), CancellationToken.None);
}
private static void WriteLog(string message)
{
Console.WriteLine(message);
_logger.LogInformation(message);
}
}

57
DeviceStatus/Service/Program.cs
View File

@@ -1,29 +1,40 @@
using Service;
using ChrisKaczor.Common.OpenTelemetry;
using System.Reflection;
var builder = WebApplication.CreateBuilder(args);
namespace ChrisKaczor.HomeMonitor.DeviceStatus.Service;
builder.Host.ConfigureAppConfiguration((_, config) => config.AddEnvironmentVariables());
builder.Services.AddControllers();
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen();
builder.Services.AddHostedService<MessageHandler>();
builder.Services.AddSingleton<DeviceRepository>();
builder.Services.AddSingleton<LaundryMonitor>();
var app = builder.Build();
if (app.Environment.IsDevelopment())
public static class Program
{
app.UseSwagger();
app.UseSwaggerUI();
}
public static void Main(string[] args)
{
var builder = WebApplication.CreateBuilder(args);
app.UseAuthorization();
builder.Configuration.AddEnvironmentVariables();
app.MapControllers();
builder.Services.AddCommonOpenTelemetry(Assembly.GetExecutingAssembly().GetName().Name, builder.Configuration["Telemetry:Endpoint"], nameof(MessageHandler));
app.Run();
builder.Services.AddControllers();
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen();
builder.Services.AddHostedService<MessageHandler>();
builder.Services.AddSingleton<DeviceRepository>();
builder.Services.AddSingleton<LaundryMonitor>();
var app = builder.Build();
if (app.Environment.IsDevelopment())
{
app.UseSwagger();
app.UseSwaggerUI();
}
app.UseAuthorization();
app.MapControllers();
app.Run();
}
}

14
DeviceStatus/Service/Service.csproj
View File

@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<AssemblyName>ChrisKaczor.HomeMonitor.DeviceStatus.Service</AssemblyName>
<RootNamespace>ChrisKaczor.HomeMonitor.DeviceStatus.Service</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.8" />
<PackageReference Include="MQTTnet" Version="4.1.0.247" />
<PackageReference Include="MQTTnet.AspNetCore" Version="4.1.0.247" />
<PackageReference Include="RestSharp" Version="108.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
<PackageReference Include="ChrisKaczor.Common.OpenTelemetry" Version="1.0.1" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.1" />
<PackageReference Include="MQTTnet" Version="4.3.3.952" />
<PackageReference Include="RestSharp" Version="110.2.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
</Project>

7
DeviceStatus/Service/appsettings.json
View File

@@ -1,8 +1,8 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
"Default": "Warning",
"Microsoft": "Information"
}
},
"AllowedHosts": "*",
@@ -18,5 +18,8 @@
},
"Mqtt": {
"Server": "mosquitto"
},
"Telemetry": {
"Endpoint": "http://signoz-otel-collector.platform:4317/"
}
}

4
DeviceStatus/Service/deploy/manifest.yaml
View File

@@ -51,7 +51,7 @@ metadata:
spec:
ports:
- name: client
port: 80
port: 8080
selector:
app: device-status-service
type: ClusterIP
@@ -75,7 +75,7 @@ spec:
- kind: Service
name: device-status-service
namespace: home-monitor
port: 80
port: 8080
---
apiVersion: traefik.containo.us/v1alpha1
kind: Middleware