Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions user-management/CodeAnalysis.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>

<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(MSBuildProjectExtension)' == '.csproj' ">
<EnableNETAnalyzers>true</EnableNETAnalyzers>
</PropertyGroup>
<ItemGroup Condition=" '$(MSBuildProjectExtension)' == '.csproj' ">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
</ItemGroup>
<PropertyGroup Condition=" '$(MSBuildProjectExtension)' == '.csproj' ">
<AnalysisMode>All</AnalysisMode>
<AnalysisLevel>9.0</AnalysisLevel>
<_SkipUpgradeNetAnalyzersNuGetWarning>false</_SkipUpgradeNetAnalyzersNuGetWarning>
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<!-- CA2007 is calling .ConfigureAwait(false), which isn't required for non-libraries -->
<NoWarn>$(NoWarn);CA2007</NoWarn>
</PropertyGroup>
</Project>
15 changes: 15 additions & 0 deletions user-management/Directory.build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Project>
<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<!-- Configure code analysis. -->
<AnalysisLevel>latest</AnalysisLevel>
<AnalysisMode>All</AnalysisMode>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
</PropertyGroup>
<Import Project="$(MSBuildThisFileDirectory)\CodeAnalysis.props"
Condition=" '$(SkipCodeAnalysis)' != 'True' " />
</Project>
128 changes: 128 additions & 0 deletions user-management/Stickerlandia.UserManagement copy.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Adapters", "Adapters", "{3582F79E-2187-4CCD-836D-48EE30BC64A8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FE220876-2B87-4095-8BD2-039049503C72}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.IntegrationTest", "tests\Stickerlandia.UserManagement.IntegrationTest\Stickerlandia.UserManagement.IntegrationTest.csproj", "{4DDC795B-2EA4-4123-B631-F0D8CAA99BA6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.UnitTest", "tests\Stickerlandia.UserManagement.UnitTest\Stickerlandia.UserManagement.UnitTest.csproj", "{7BD95F13-FE66-43A0-A48A-8D5903E37F7D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.Api", "src\Stickerlandia.UserManagement.Api\Stickerlandia.UserManagement.Api.csproj", "{488873C6-4BFA-4D6E-9364-D672C15EA2D9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.Core", "src\Stickerlandia.UserManagement.Core\Stickerlandia.UserManagement.Core.csproj", "{A93481EC-FDED-4740-902D-B5D911402CBA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.Azure", "src\Stickerlandia.UserManagement.Azure\Stickerlandia.UserManagement.Azure.csproj", "{1F6841EA-97F0-4079-967A-42F816E4FD1F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.FunctionApp", "src\Stickerlandia.UserManagement.FunctionApp\Stickerlandia.UserManagement.FunctionApp.csproj", "{ABDA3664-3B8A-40A5-8038-5150E660B11E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.Aspire", "src\Stickerlandia.UserManagement.Aspire\Stickerlandia.UserManagement.Aspire.csproj", "{E481765C-9B3F-4F5E-B351-076415595A8B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.AWS", "src\Stickerlandia.UserManagement.AWS\Stickerlandia.UserManagement.AWS.csproj", "{9A175F6D-120D-4AF2-B407-B1499B70BE9E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{FC9DDF76-8DAC-4498-8926-8883F984709C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.Agnostic", "src\Stickerlandia.UserManagement.Agnostic\Stickerlandia.UserManagement.Agnostic.csproj", "{295E8315-2CD2-4CD8-B7F4-21EF587B74A9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.Lambda", "src\Stickerlandia.UserManagement.Lambda\src\Stickerlandia.UserManagement.Lambda\Stickerlandia.UserManagement.Lambda.csproj", "{5C770F92-B6E7-4270-A041-A32F385DA6C4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driving", "Driving", "{924749FC-98D5-40A6-8F4B-BA9BFDEDDEC3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driven", "Driven", "{86CA6782-DAF7-4130-9B10-02DE0680DF78}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.Auth", "src\Stickerlandia.UserManagement.Auth\Stickerlandia.UserManagement.Auth.csproj", "{408EFE63-AA9C-46BD-ADD5-AB917BB4E9E6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.Worker", "src\Stickerlandia.UserManagement.Worker\Stickerlandia.UserManagement.Worker.csproj", "{ED36763B-8971-4CC9-A4FE-16924F1961C0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.ServiceDefaults", "src\Stickerlandia.UserManagement.ServiceDefaults\Stickerlandia.UserManagement.ServiceDefaults.csproj", "{7C28228C-4B3D-4AAE-95E6-4669413BD06C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.MigrationService", "src\Stickerlandia.UserManagement.MigrationService\Stickerlandia.UserManagement.MigrationService.csproj", "{91536DB3-CBA5-44DE-943C-76F8577793FE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4DDC795B-2EA4-4123-B631-F0D8CAA99BA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4DDC795B-2EA4-4123-B631-F0D8CAA99BA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4DDC795B-2EA4-4123-B631-F0D8CAA99BA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4DDC795B-2EA4-4123-B631-F0D8CAA99BA6}.Release|Any CPU.Build.0 = Release|Any CPU
{7BD95F13-FE66-43A0-A48A-8D5903E37F7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7BD95F13-FE66-43A0-A48A-8D5903E37F7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7BD95F13-FE66-43A0-A48A-8D5903E37F7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7BD95F13-FE66-43A0-A48A-8D5903E37F7D}.Release|Any CPU.Build.0 = Release|Any CPU
{488873C6-4BFA-4D6E-9364-D672C15EA2D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{488873C6-4BFA-4D6E-9364-D672C15EA2D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{488873C6-4BFA-4D6E-9364-D672C15EA2D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{488873C6-4BFA-4D6E-9364-D672C15EA2D9}.Release|Any CPU.Build.0 = Release|Any CPU
{A93481EC-FDED-4740-902D-B5D911402CBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A93481EC-FDED-4740-902D-B5D911402CBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A93481EC-FDED-4740-902D-B5D911402CBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A93481EC-FDED-4740-902D-B5D911402CBA}.Release|Any CPU.Build.0 = Release|Any CPU
{1F6841EA-97F0-4079-967A-42F816E4FD1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1F6841EA-97F0-4079-967A-42F816E4FD1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1F6841EA-97F0-4079-967A-42F816E4FD1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1F6841EA-97F0-4079-967A-42F816E4FD1F}.Release|Any CPU.Build.0 = Release|Any CPU
{ABDA3664-3B8A-40A5-8038-5150E660B11E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ABDA3664-3B8A-40A5-8038-5150E660B11E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ABDA3664-3B8A-40A5-8038-5150E660B11E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ABDA3664-3B8A-40A5-8038-5150E660B11E}.Release|Any CPU.Build.0 = Release|Any CPU
{E481765C-9B3F-4F5E-B351-076415595A8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E481765C-9B3F-4F5E-B351-076415595A8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E481765C-9B3F-4F5E-B351-076415595A8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E481765C-9B3F-4F5E-B351-076415595A8B}.Release|Any CPU.Build.0 = Release|Any CPU
{9A175F6D-120D-4AF2-B407-B1499B70BE9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9A175F6D-120D-4AF2-B407-B1499B70BE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9A175F6D-120D-4AF2-B407-B1499B70BE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9A175F6D-120D-4AF2-B407-B1499B70BE9E}.Release|Any CPU.Build.0 = Release|Any CPU
{295E8315-2CD2-4CD8-B7F4-21EF587B74A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{295E8315-2CD2-4CD8-B7F4-21EF587B74A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{295E8315-2CD2-4CD8-B7F4-21EF587B74A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{295E8315-2CD2-4CD8-B7F4-21EF587B74A9}.Release|Any CPU.Build.0 = Release|Any CPU
{5C770F92-B6E7-4270-A041-A32F385DA6C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5C770F92-B6E7-4270-A041-A32F385DA6C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5C770F92-B6E7-4270-A041-A32F385DA6C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5C770F92-B6E7-4270-A041-A32F385DA6C4}.Release|Any CPU.Build.0 = Release|Any CPU
{408EFE63-AA9C-46BD-ADD5-AB917BB4E9E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{408EFE63-AA9C-46BD-ADD5-AB917BB4E9E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{408EFE63-AA9C-46BD-ADD5-AB917BB4E9E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{408EFE63-AA9C-46BD-ADD5-AB917BB4E9E6}.Release|Any CPU.Build.0 = Release|Any CPU
{ED36763B-8971-4CC9-A4FE-16924F1961C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ED36763B-8971-4CC9-A4FE-16924F1961C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ED36763B-8971-4CC9-A4FE-16924F1961C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ED36763B-8971-4CC9-A4FE-16924F1961C0}.Release|Any CPU.Build.0 = Release|Any CPU
{7C28228C-4B3D-4AAE-95E6-4669413BD06C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7C28228C-4B3D-4AAE-95E6-4669413BD06C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C28228C-4B3D-4AAE-95E6-4669413BD06C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7C28228C-4B3D-4AAE-95E6-4669413BD06C}.Release|Any CPU.Build.0 = Release|Any CPU
{91536DB3-CBA5-44DE-943C-76F8577793FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{91536DB3-CBA5-44DE-943C-76F8577793FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{91536DB3-CBA5-44DE-943C-76F8577793FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{91536DB3-CBA5-44DE-943C-76F8577793FE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{4DDC795B-2EA4-4123-B631-F0D8CAA99BA6} = {FE220876-2B87-4095-8BD2-039049503C72}
{7BD95F13-FE66-43A0-A48A-8D5903E37F7D} = {FE220876-2B87-4095-8BD2-039049503C72}
{E481765C-9B3F-4F5E-B351-076415595A8B} = {3582F79E-2187-4CCD-836D-48EE30BC64A8}
{A93481EC-FDED-4740-902D-B5D911402CBA} = {FC9DDF76-8DAC-4498-8926-8883F984709C}
{924749FC-98D5-40A6-8F4B-BA9BFDEDDEC3} = {3582F79E-2187-4CCD-836D-48EE30BC64A8}
{488873C6-4BFA-4D6E-9364-D672C15EA2D9} = {924749FC-98D5-40A6-8F4B-BA9BFDEDDEC3}
{ABDA3664-3B8A-40A5-8038-5150E660B11E} = {924749FC-98D5-40A6-8F4B-BA9BFDEDDEC3}
{5C770F92-B6E7-4270-A041-A32F385DA6C4} = {924749FC-98D5-40A6-8F4B-BA9BFDEDDEC3}
{86CA6782-DAF7-4130-9B10-02DE0680DF78} = {3582F79E-2187-4CCD-836D-48EE30BC64A8}
{295E8315-2CD2-4CD8-B7F4-21EF587B74A9} = {86CA6782-DAF7-4130-9B10-02DE0680DF78}
{9A175F6D-120D-4AF2-B407-B1499B70BE9E} = {86CA6782-DAF7-4130-9B10-02DE0680DF78}
{1F6841EA-97F0-4079-967A-42F816E4FD1F} = {86CA6782-DAF7-4130-9B10-02DE0680DF78}
{408EFE63-AA9C-46BD-ADD5-AB917BB4E9E6} = {FC9DDF76-8DAC-4498-8926-8883F984709C}
{ED36763B-8971-4CC9-A4FE-16924F1961C0} = {924749FC-98D5-40A6-8F4B-BA9BFDEDDEC3}
{7C28228C-4B3D-4AAE-95E6-4669413BD06C} = {924749FC-98D5-40A6-8F4B-BA9BFDEDDEC3}
{91536DB3-CBA5-44DE-943C-76F8577793FE} = {924749FC-98D5-40A6-8F4B-BA9BFDEDDEC3}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Stickerlandia.UserManagement.Core;
using Stickerlandia.UserManagement.Core.Outbox;

namespace Stickerlandia.UserManagement.Agnostic;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@
// This product includes software developed at Datadog (https://www.datadoghq.com/).
// Copyright 2025 Datadog, Inc.

using System.Text;
// Catching generic exceptions is not recommended, but in this case we want to catch all exceptions so that a failure in outbox processing does not crash the application.
#pragma warning disable CA1031

using System.Text.Json;
using Confluent.Kafka;
using Datadog.Trace;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Saunter.Attributes;
using Stickerlandia.UserManagement.Core.Observability;
using Stickerlandia.UserManagement.Core;
using Stickerlandia.UserManagement.Core.StickerClaimedEvent;

Expand All @@ -22,18 +25,17 @@ public class KafakStickerClaimedWorker(
ProducerConfig producerConfig)
: IMessagingWorker
{
private readonly ProducerConfig _producerConfig = producerConfig;
private const string topic = "users.stickerClaimed.v1";
private const string dlqTopic = "users.stickerClaimed.v1.dlq";

[Channel("users.stickerClaimed.v1")]
[SubscribeOperation(typeof(StickerClaimedEventV1))]
private async Task<bool> ProcessMessageAsync(StickerClaimedEventHandler handler,
private async Task<bool> ProcessMessageAsync(StickerClaimedHandler handler,
ConsumeResult<string, string> consumeResult)
{
using var processSpan = Tracer.Instance.StartActive($"process users.stickerClaimed.v1");

logger.LogInformation("Received message: {body}", consumeResult.Message.Value);
Log.ReceivedMessage(logger, "kafka");

var evtData = JsonSerializer.Deserialize<StickerClaimedEventV1>(consumeResult.Message.Value);

Expand All @@ -45,7 +47,7 @@ private async Task<bool> ProcessMessageAsync(StickerClaimedEventHandler handler,
}
catch (InvalidUserException ex)
{
logger.LogWarning("Invalid user in sticker claimed event: {Message}", ex.Message);
Log.InvalidUser(logger, ex);

SendToDLQ(consumeResult, evtData);
}
Expand All @@ -62,17 +64,17 @@ private void SendToDLQ(ConsumeResult<string, string> consumeResult, StickerClaim
(deliveryReport) =>
{
if (deliveryReport.Error.Code != ErrorCode.NoError)
logger.LogError($"Failed to deliver message: {deliveryReport.Error.Reason}");
Log.MessageDeliveryFailure(logger, deliveryReport.Error.Reason, null);
else
logger.LogWarning($"Produced event to topic {dlqTopic}");
Log.MessageSentToDlq(logger, "", null);
});

producer.Flush(TimeSpan.FromSeconds(10));
}

public Task StartAsync()
{
logger.LogInformation("Starting Kafka processor");
Log.StartingMessageProcessor(logger, "kafka");

return Task.CompletedTask;
}
Expand All @@ -84,12 +86,12 @@ public async Task PollAsync(CancellationToken stoppingToken)
return;

using var scope = serviceScopeFactory.CreateScope();
var handler = scope.ServiceProvider.GetRequiredService<StickerClaimedEventHandler>();
var handler = scope.ServiceProvider.GetRequiredService<StickerClaimedHandler>();

try
{
using var consumer = new ConsumerBuilder<string, string>(consumerConfig)
.SetErrorHandler((_, e) => logger.LogError("Kafka error: {Error}", e.Reason))
.SetErrorHandler((_, e) => Log.MessageProcessingException(logger, e.Reason, null))
.Build();

consumer.Subscribe(topic);
Expand All @@ -107,16 +109,16 @@ public async Task PollAsync(CancellationToken stoppingToken)
}
catch (ConsumeException ex)
{
logger.LogError(ex, "Error consuming message");
Log.MessageProcessingException(logger, "Error consuming message", ex);
}
catch (OperationCanceledException)
{
// This is expected when the token is canceled
logger.LogInformation("Polling canceled");
Log.TokenCancelled(logger);
}
catch (Exception ex)
{
logger.LogError(ex, "Error processing message");
Log.MessageProcessingException(logger, "Error consuming message", ex);
}
finally
{
Expand All @@ -126,7 +128,8 @@ public async Task PollAsync(CancellationToken stoppingToken)
}
catch (Exception ex)
{
logger.LogError(ex, "Failed to create Kafka consumer");
Log.FailureStartingWorker(logger, "kafka", ex);
throw;
}
}

Expand Down
Loading
Loading