dailydevops
diff --git a/‎Directory.Packages.props‎
Lines changed: 2 additions & 0 deletions b/‎Directory.Packages.props‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎HealthChecks.sln‎
Lines changed: 15 additions & 0 deletions b/‎HealthChecks.sln‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎src/NetEvolve.HealthChecks.Apache.ActiveMq/ActiveMqConfigure.cs‎
Lines changed: 43 additions & 0 deletions b/‎src/NetEvolve.HealthChecks.Apache.ActiveMq/ActiveMqConfigure.cs‎
Lines changed: 43 additions & 0 deletions
diff --git a/‎src/NetEvolve.HealthChecks.Apache.ActiveMq/ActiveMqHealthCheck.cs‎
Lines changed: 36 additions & 0 deletions b/‎src/NetEvolve.HealthChecks.Apache.ActiveMq/ActiveMqHealthCheck.cs‎
Lines changed: 36 additions & 0 deletions
diff --git a/‎src/NetEvolve.HealthChecks.Apache.ActiveMq/ActiveMqOptions.cs‎
Lines changed: 37 additions & 0 deletions b/‎src/NetEvolve.HealthChecks.Apache.ActiveMq/ActiveMqOptions.cs‎
Lines changed: 37 additions & 0 deletions
diff --git a/‎src/NetEvolve.HealthChecks.Apache.ActiveMq/ClientFactory.cs‎
Lines changed: 31 additions & 0 deletions b/‎src/NetEvolve.HealthChecks.Apache.ActiveMq/ClientFactory.cs‎
Lines changed: 31 additions & 0 deletions
diff --git a/‎src/NetEvolve.HealthChecks.Apache.ActiveMq/DependencyInjectionExtensions.cs‎
Lines changed: 67 additions & 0 deletions b/‎src/NetEvolve.HealthChecks.Apache.ActiveMq/DependencyInjectionExtensions.cs‎
Lines changed: 67 additions & 0 deletions
diff --git a/‎src/NetEvolve.HealthChecks.Apache.ActiveMq/NetEvolve.HealthChecks.Apache.ActiveMq.csproj‎
Lines changed: 14 additions & 0 deletions b/‎src/NetEvolve.HealthChecks.Apache.ActiveMq/NetEvolve.HealthChecks.Apache.ActiveMq.csproj‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎src/NetEvolve.HealthChecks.Apache.Kafka/NetEvolve.HealthChecks.Apache.Kafka.csproj‎
Lines changed: 1 addition & 1 deletion b/‎src/NetEvolve.HealthChecks.Apache.Kafka/NetEvolve.HealthChecks.Apache.Kafka.csproj‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/NetEvolve.HealthChecks.Tests.Architecture/HealthCheckArchitecture.cs‎
Lines changed: 4 additions & 0 deletions b/‎tests/NetEvolve.HealthChecks.Tests.Architecture/HealthCheckArchitecture.cs‎
Lines changed: 4 additions & 0 deletions
@@ -22,6 +22,7 @@
     />
   </ItemGroup>
   <ItemGroup>
+    <PackageVersion Include="Apache.NMS.ActiveMQ" Version="2.1.0" />
     <PackageVersion Include="Azure.Data.Tables" Version="12.10.0" />
     <PackageVersion Include="Azure.Identity" Version="1.13.2" />
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.24.0" />
@@ -48,6 +49,7 @@
     <PackageVersion Include="StackExchange.Redis" Version="2.8.31" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
     <PackageVersion Include="System.Text.Json" Version="9.0.4" />
+    <PackageVersion Include="Testcontainers.ActiveMq" Version="4.1.0" />
     <PackageVersion Include="Testcontainers.Azurite" Version="4.4.0" />
     <PackageVersion Include="Testcontainers.ClickHouse" Version="4.4.0" />
     <PackageVersion Include="Testcontainers.Kafka" Version="4.4.0" />
 
@@ -65,6 +65,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetEvolve.HealthChecks.Test
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetEvolve.HealthChecks.Tests.Architecture", "tests\NetEvolve.HealthChecks.Tests.Architecture\NetEvolve.HealthChecks.Tests.Architecture.csproj", "{17BCA132-1FBB-46C1-B6A1-60F64969383D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetEvolve.HealthChecks.Apache.ActiveMq", "src\NetEvolve.HealthChecks.Apache.ActiveMq\NetEvolve.HealthChecks.Apache.ActiveMq.csproj", "{1F26E911-E73F-409A-87FC-1214EF36FF61}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -315,6 +317,18 @@ Global
 		{17BCA132-1FBB-46C1-B6A1-60F64969383D}.Release|x64.Build.0 = Release|Any CPU
 		{17BCA132-1FBB-46C1-B6A1-60F64969383D}.Release|x86.ActiveCfg = Release|Any CPU
 		{17BCA132-1FBB-46C1-B6A1-60F64969383D}.Release|x86.Build.0 = Release|Any CPU
+		{1F26E911-E73F-409A-87FC-1214EF36FF61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F26E911-E73F-409A-87FC-1214EF36FF61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F26E911-E73F-409A-87FC-1214EF36FF61}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1F26E911-E73F-409A-87FC-1214EF36FF61}.Debug|x64.Build.0 = Debug|Any CPU
+		{1F26E911-E73F-409A-87FC-1214EF36FF61}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1F26E911-E73F-409A-87FC-1214EF36FF61}.Debug|x86.Build.0 = Debug|Any CPU
+		{1F26E911-E73F-409A-87FC-1214EF36FF61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F26E911-E73F-409A-87FC-1214EF36FF61}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F26E911-E73F-409A-87FC-1214EF36FF61}.Release|x64.ActiveCfg = Release|Any CPU
+		{1F26E911-E73F-409A-87FC-1214EF36FF61}.Release|x64.Build.0 = Release|Any CPU
+		{1F26E911-E73F-409A-87FC-1214EF36FF61}.Release|x86.ActiveCfg = Release|Any CPU
+		{1F26E911-E73F-409A-87FC-1214EF36FF61}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -340,6 +354,7 @@ Global
 		{66406BE8-0281-4C95-B90B-20CAE4516A16} = {E412EC77-2022-4A1D-AAC1-FDF1A4A45827}
 		{2B089420-E791-44E7-B471-F6F527B33E1C} = {E412EC77-2022-4A1D-AAC1-FDF1A4A45827}
 		{17BCA132-1FBB-46C1-B6A1-60F64969383D} = {E412EC77-2022-4A1D-AAC1-FDF1A4A45827}
+		{1F26E911-E73F-409A-87FC-1214EF36FF61} = {EF615D18-42E2-48A4-8EBA-E652DC574C56}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {28B4CC2B-39E8-49C0-9687-78121BD83A53}
 
@@ -0,0 +1,43 @@
+namespace NetEvolve.HealthChecks.Apache.ActiveMq;
+
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+using NetEvolve.Arguments;
+using static Microsoft.Extensions.Options.ValidateOptionsResult;
+
+internal sealed class ActiveMqConfigure
+    : IConfigureNamedOptions<ActiveMqOptions>,
+        IValidateOptions<ActiveMqOptions>
+{
+    private readonly IConfiguration _configuration;
+
+    public ActiveMqConfigure(IConfiguration configuration) => _configuration = configuration;
+
+    public void Configure(string? name, ActiveMqOptions options)
+    {
+        Argument.ThrowIfNullOrWhiteSpace(name);
+        _configuration.Bind($"HealthChecks:ActiveMq:{name}", options);
+    }
+
+    public void Configure(ActiveMqOptions options) => Configure(Options.DefaultName, options);
+
+    public ValidateOptionsResult Validate(string? name, ActiveMqOptions options)
+    {
+        if (string.IsNullOrWhiteSpace(name))
+        {
+            return Fail("The name cannot be null or whitespace.");
+        }
+
+        if (options is null)
+        {
+            return Fail("The option cannot be null.");
+        }
+
+        if (string.IsNullOrWhiteSpace(options.BrokerAddress))
+        {
+            return Fail("The broker address cannot be null or whitespace.");
+        }
+
+        return Success;
+    }
+}
@@ -0,0 +1,36 @@
+namespace NetEvolve.HealthChecks.Apache.ActiveMq;
+
+using System.Collections.Concurrent;
+using System.Threading;
+using System.Threading.Tasks;
+using global::Apache.NMS;
+using global::Apache.NMS.ActiveMQ;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using Microsoft.Extensions.Options;
+using NetEvolve.Extensions.Tasks;
+using NetEvolve.HealthChecks.Abstractions;
+
+internal sealed class ActiveMqHealthCheck : ConfigurableHealthCheckBase<ActiveMqOptions>
+{
+    public ActiveMqHealthCheck(IOptionsMonitor<ActiveMqOptions> optionsMonitor)
+        : base(optionsMonitor) { }
+
+    protected override async ValueTask<HealthCheckResult> ExecuteHealthCheckAsync(
+        string name,
+        HealthStatus failureStatus,
+        ActiveMqOptions options,
+        CancellationToken cancellationToken
+    )
+    {
+        using var client = await ClientFactory
+            .GetConnectionAsync(options, cancellationToken)
+            .ConfigureAwait(false);
+
+        var isValid = await client
+            .StartAsync()
+            .WithTimeoutAsync(options.Timeout, cancellationToken)
+            .ConfigureAwait(false);
+
+        return HealthCheckState(client.IsStarted && isValid, name);
+    }
+}
@@ -0,0 +1,37 @@
+namespace NetEvolve.HealthChecks.Apache.ActiveMq;
+
+public class ActiveMqOptions
+{
+    public string? BrokerAddress { get; set; }
+    public string? Username
+    {
+        get
+        {
+            if (string.IsNullOrWhiteSpace(field))
+            {
+                return null;
+            }
+
+            return field;
+        }
+        set;
+    }
+    public string? Password
+    {
+        get
+        {
+            if (string.IsNullOrWhiteSpace(field))
+            {
+                return null;
+            }
+
+            return field;
+        }
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets the timeout in milliseconds for executing the healthcheck.
+    /// </summary>
+    public int Timeout { get; set; } = 100;
+}
@@ -0,0 +1,31 @@
+namespace NetEvolve.HealthChecks.Apache.ActiveMq;
+
+using System.Collections.Concurrent;
+using System.Threading;
+using System.Threading.Tasks;
+using global::Apache.NMS;
+using global::Apache.NMS.ActiveMQ;
+
+internal static class ClientFactory
+{
+    private static readonly ConcurrentDictionary<string, ConnectionFactory> _factories = new(
+        StringComparer.OrdinalIgnoreCase
+    );
+
+    public static async ValueTask<IConnection> GetConnectionAsync(
+        ActiveMqOptions options,
+        CancellationToken cancellationToken
+    )
+    {
+        var factory = _factories.GetOrAdd(
+            options.BrokerAddress,
+            brokerAddress => new ConnectionFactory(brokerAddress)
+        );
+
+        return options.Username is null && options.Password is null
+            ? await factory.CreateConnectionAsync().ConfigureAwait(false)
+            : await factory
+                .CreateConnectionAsync(options.Username, options.Password)
+                .ConfigureAwait(false);
+    }
+}
@@ -0,0 +1,67 @@
+namespace NetEvolve.HealthChecks.Apache.ActiveMq;
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using NetEvolve.Arguments;
+using NetEvolve.HealthChecks.Abstractions;
+
+/// <summary>
+/// Extensions methods for <see cref="IHealthChecksBuilder"/> with custom Health Checks.
+/// </summary>
+public static class DependencyInjectionExtensions
+{
+    private static readonly string[] _defaultTags = ["activemq", "message-queue"];
+
+    /// <summary>
+    /// Add a health check for Apache ActiveMq.
+    /// </summary>
+    /// <param name="builder">The <see cref="IHealthChecksBuilder"/>.</param>
+    /// <param name="name">The name of the <see cref="ActiveMqHealthCheck"/>.</param>
+    /// <param name="options">An optional action to configure.</param>
+    /// <param name="tags">A list of additional tags that can be used to filter sets of health checks. Optional.</param>
+    /// <exception cref="ArgumentNullException">The <paramref name="builder"/> is <see langword="null" />.</exception>
+    /// <exception cref="ArgumentNullException">The <paramref name="name"/> is <see langword="null" />.</exception>
+    /// <exception cref="ArgumentException">The <paramref name="name"/> is <see langword="null" /> or <c>whitespace</c>.</exception>
+    /// <exception cref="ArgumentException">The <paramref name="name"/> is already in use.</exception>
+    /// <exception cref="ArgumentNullException">The <paramref name="tags"/> is <see langword="null" />.</exception>
+    public static IHealthChecksBuilder AddActiveMq(
+        [NotNull] this IHealthChecksBuilder builder,
+        [NotNull] string name,
+        Action<ActiveMqOptions>? options = null,
+        params string[] tags
+    )
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+        Argument.ThrowIfNullOrEmpty(name);
+        ArgumentNullException.ThrowIfNull(tags);
+
+        if (!builder.IsServiceTypeRegistered<ActiveMqCheckMarker>())
+        {
+            _ = builder
+                .Services.AddSingleton<ActiveMqCheckMarker>()
+                .AddSingleton<ActiveMqHealthCheck>()
+                .ConfigureOptions<ActiveMqConfigure>();
+        }
+
+        if (builder.IsNameAlreadyUsed<ActiveMqHealthCheck>(name))
+        {
+            throw new ArgumentException($"Name `{name}` already in use.", nameof(name), null);
+        }
+
+        if (options is not null)
+        {
+            _ = builder.Services.Configure(name, options);
+        }
+
+        return builder.AddCheck<ActiveMqHealthCheck>(
+            name,
+            HealthStatus.Unhealthy,
+            _defaultTags.Union(tags, StringComparer.OrdinalIgnoreCase)
+        );
+    }
+
+    private sealed partial class ActiveMqCheckMarker;
+}
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>$(_ProjectTargetFrameworks)</TargetFrameworks>
+    <Description>Contains HealthChecks for Apache ActiveMq, based on the NuGet package `Apache.NMS.ActiveMQ`.</Description>
+    <PackageTags>$(PackageTags);apache;activemq;</PackageTags>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Apache.NMS.ActiveMQ" />
+    <PackageReference Include="NetEvolve.Extensions.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\NetEvolve.HealthChecks.Abstractions\NetEvolve.HealthChecks.Abstractions.csproj" />
+  </ItemGroup>
+</Project>
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(_ProjectTargetFrameworks)</TargetFrameworks>
     <Description>Contains HealthChecks for Apache Kafka, based on the NuGet package `Confluent.Kafka`.</Description>
-    <PackageTags>$(PackageTags);kafka;</PackageTags>
+    <PackageTags>$(PackageTags);apache;kafka;</PackageTags>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" />
 
@@ -19,10 +19,14 @@ private static Architecture LoadArchitecture()
     {
         System.Reflection.Assembly[] assemblies =
         [
+            // Apache
+            typeof(Apache.ActiveMq.ActiveMqHealthCheck).Assembly,
             typeof(Apache.Kafka.KafkaCheck).Assembly,
+            // Azure
             typeof(Azure.Blobs.BlobContainerAvailableHealthCheck).Assembly,
             typeof(Azure.Queues.QueueClientAvailableHealthCheck).Assembly,
             typeof(Azure.Tables.TableClientAvailableHealthCheck).Assembly,
+            // others
             typeof(ClickHouse.ClickHouseCheck).Assembly,
             typeof(Dapr.DaprHealthCheck).Assembly,
             typeof(MySql.MySqlCheck).Assembly,