diff --git a/.github/workflows/codeql-analysis-cron.yml b/.github/workflows/codeql-analysis-cron.yml
index dbb80dfc69..4c55ad17a1 100644
--- a/.github/workflows/codeql-analysis-cron.yml
+++ b/.github/workflows/codeql-analysis-cron.yml
@@ -16,6 +16,8 @@ jobs:
uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
with:
dotnet-version: 10.0.x
+ cache: true
+ cache-dependency-path: "**/packages.lock.json"
- name: Checkout repository
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 65579bb11a..429d344967 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -16,6 +16,8 @@ jobs:
uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
with:
dotnet-version: 10.0.x
+ cache: true
+ cache-dependency-path: "**/packages.lock.json"
- name: Checkout repository
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c786fa30b8..0bc8a687cd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -46,6 +46,8 @@ jobs:
uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
with:
dotnet-version: 10.0.x
+ cache: true
+ cache-dependency-path: "**/packages.lock.json"
- name: Cache NuGet packages
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
@@ -76,6 +78,8 @@ jobs:
uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
with:
dotnet-version: 10.0.x
+ cache: true
+ cache-dependency-path: "**/packages.lock.json"
- name: Cache NuGet packages
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
@@ -129,22 +133,11 @@ jobs:
username: ${{ secrets.DHI_DOCKERHUB_USERNAME }}
password: ${{ secrets.DHI_DOCKERHUB_TOKEN }}
- - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
- with:
- node-version: 24.19.0
- cache: "npm"
- cache-dependency-path: "**/package-lock.json"
-
- name: Setup Docker
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
with:
driver: docker-container
- - name: Setup NuGet
- uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
- with:
- dotnet-version: 10.0.x
-
- name: Cache Image
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
@@ -208,6 +201,8 @@ jobs:
uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
with:
dotnet-version: 10.0.x
+ cache: true
+ cache-dependency-path: "**/packages.lock.json"
- name: Cache NuGet packages
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
@@ -360,6 +355,8 @@ jobs:
uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
with:
dotnet-version: 10.0.x
+ cache: true
+ cache-dependency-path: "**/packages.lock.json"
- name: Install nuget-licenses tool
run: dotnet tool install --global nuget-license
- name: Show Allowed Licenses
diff --git a/.run/docker-compose (with Postgres).run.xml b/.run/docker-compose (with Postgres).run.xml
index e04d4f9e87..2fe260c769 100644
--- a/.run/docker-compose (with Postgres).run.xml
+++ b/.run/docker-compose (with Postgres).run.xml
@@ -1,20 +1,29 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Applications/AdminApi/src/AdminApi.Infrastructure.Database.Postgres/packages.lock.json b/Applications/AdminApi/src/AdminApi.Infrastructure.Database.Postgres/packages.lock.json
index f3ec13f2cc..c0af973b92 100644
--- a/Applications/AdminApi/src/AdminApi.Infrastructure.Database.Postgres/packages.lock.json
+++ b/Applications/AdminApi/src/AdminApi.Infrastructure.Database.Postgres/packages.lock.json
@@ -584,6 +584,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -888,6 +889,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Applications/AdminApi/src/AdminApi.Infrastructure.Database.SqlServer/packages.lock.json b/Applications/AdminApi/src/AdminApi.Infrastructure.Database.SqlServer/packages.lock.json
index f3ec13f2cc..c0af973b92 100644
--- a/Applications/AdminApi/src/AdminApi.Infrastructure.Database.SqlServer/packages.lock.json
+++ b/Applications/AdminApi/src/AdminApi.Infrastructure.Database.SqlServer/packages.lock.json
@@ -584,6 +584,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -888,6 +889,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Applications/AdminApi/src/AdminApi.Infrastructure/Persistence/Database/Converters/PnsHandleEntityFrameworkValueConverter.cs b/Applications/AdminApi/src/AdminApi.Infrastructure/Persistence/Database/Converters/PnsHandleEntityFrameworkValueConverter.cs
index 613ffc375c..66309feadc 100644
--- a/Applications/AdminApi/src/AdminApi.Infrastructure/Persistence/Database/Converters/PnsHandleEntityFrameworkValueConverter.cs
+++ b/Applications/AdminApi/src/AdminApi.Infrastructure/Persistence/Database/Converters/PnsHandleEntityFrameworkValueConverter.cs
@@ -46,6 +46,5 @@ private static PnsHandle DeserializeHandle(string pnsHandle)
var value = tokens[1];
return new PnsHandle(platform, value);
- ;
}
}
diff --git a/Applications/AdminApi/src/AdminApi.Infrastructure/packages.lock.json b/Applications/AdminApi/src/AdminApi.Infrastructure/packages.lock.json
index 506dbc3cb0..ba81372c45 100644
--- a/Applications/AdminApi/src/AdminApi.Infrastructure/packages.lock.json
+++ b/Applications/AdminApi/src/AdminApi.Infrastructure/packages.lock.json
@@ -578,6 +578,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -882,6 +883,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Applications/AdminApi/src/AdminApi/Authentication/AnonymousUserContext.cs b/Applications/AdminApi/src/AdminApi/Authentication/AnonymousUserContext.cs
index 8be6495734..54527b96bd 100644
--- a/Applications/AdminApi/src/AdminApi/Authentication/AnonymousUserContext.cs
+++ b/Applications/AdminApi/src/AdminApi/Authentication/AnonymousUserContext.cs
@@ -1,4 +1,5 @@
-using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.AdminApi.Authentication;
@@ -7,7 +8,7 @@ public class AnonymousUserContext : IUserContext
{
public IdentityAddress GetAddress()
{
- throw new NotSupportedException();
+ throw new NotFoundException();
}
public IdentityAddress? GetAddressOrNull()
@@ -17,7 +18,7 @@ public IdentityAddress GetAddress()
public DeviceId GetDeviceId()
{
- throw new NotSupportedException();
+ throw new NotFoundException();
}
public DeviceId? GetDeviceIdOrNull()
@@ -27,27 +28,27 @@ public DeviceId GetDeviceId()
public string GetUserId()
{
- throw new NotSupportedException();
+ throw new NotFoundException();
}
public string? GetUserIdOrNull()
{
- throw new NotSupportedException();
+ return null;
}
public string GetUsername()
{
- throw new NotSupportedException();
+ throw new NotFoundException();
}
public string? GetUsernameOrNull()
{
- throw new NotSupportedException();
+ return null;
}
public string GetClientId()
{
- throw new NotSupportedException();
+ throw new NotFoundException();
}
public string? GetClientIdOrNull()
diff --git a/Applications/AdminApi/src/AdminApi/Configuration/AdminApiConfiguration.cs b/Applications/AdminApi/src/AdminApi/Configuration/AdminApiConfiguration.cs
index 408c2ecd05..faa63d79a8 100644
--- a/Applications/AdminApi/src/AdminApi/Configuration/AdminApiConfiguration.cs
+++ b/Applications/AdminApi/src/AdminApi/Configuration/AdminApiConfiguration.cs
@@ -7,6 +7,9 @@ namespace Backbone.AdminApi.Configuration;
public class AdminApiConfiguration
{
+ [Required]
+ public required TelemetryConfiguration Telemetry { get; init; }
+
[Required]
public required AuthenticationConfiguration Authentication { get; init; }
@@ -18,6 +21,11 @@ public class AdminApiConfiguration
[Required]
public required InfrastructureConfiguration Infrastructure { get; init; }
+ public class TelemetryConfiguration
+ {
+ public required OpenTelemetryCollectorConfiguration OpenTelemetryCollector { get; set; } = new();
+ }
+
public class AuthenticationConfiguration
{
[Required]
diff --git a/Applications/AdminApi/src/AdminApi/Program.cs b/Applications/AdminApi/src/AdminApi/Program.cs
index c7fb1d3752..eb2b76b642 100644
--- a/Applications/AdminApi/src/AdminApi/Program.cs
+++ b/Applications/AdminApi/src/AdminApi/Program.cs
@@ -1,3 +1,4 @@
+using System.Reflection;
using Autofac.Extensions.DependencyInjection;
using Backbone.AdminApi.Authentication;
using Backbone.AdminApi.Configuration;
@@ -73,14 +74,14 @@ static WebApplication CreateApp(string[] args)
builder.Host
.UseSerilog((context, configuration) => configuration
- .ReadFrom.Configuration(context.Configuration, new ConfigurationReaderOptions { SectionName = "Logging" })
- .Enrich.WithCorrelationId("X-Correlation-Id", addValueIfHeaderAbsence: true)
- .Enrich.FromLogContext()
- .Enrich.WithProperty("service", "adminui")
- .Enrich.WithExceptionDetails(new DestructuringOptionsBuilder()
- .WithDefaultDestructurers()
- .WithDestructurers([new DbUpdateExceptionDestructurer()]))
- .Enrich.WithSensitiveDataMasking(options => options.AddSensitiveDataMasks()), preserveStaticLogger: true)
+ .ReadFrom.Configuration(context.Configuration, new ConfigurationReaderOptions { SectionName = "Telemetry:Logging" })
+ .Enrich.WithCorrelationId("X-Correlation-Id", addValueIfHeaderAbsence: true)
+ .Enrich.FromLogContext()
+ .Enrich.WithExceptionDetails(new DestructuringOptionsBuilder()
+ .WithDefaultDestructurers()
+ .WithDestructurers([new DbUpdateExceptionDestructurer()]))
+ .Enrich.WithSensitiveDataMasking(options => options.AddSensitiveDataMasks()),
+ writeToProviders: true)
.UseServiceProviderFactory(new AutofacServiceProviderFactory());
ConfigureServices(builder.Services, builder.Configuration, builder.Environment);
@@ -133,7 +134,7 @@ static void ConfigureServices(IServiceCollection services, IConfiguration config
options.ReplaceApplicationStore();
});
- services.AddOpenTelemetryWithPrometheusExporter(METER_NAME);
+ services.AddOpenTelemetry(METER_NAME, Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "unknown", parsedConfiguration.Telemetry.OpenTelemetryCollector);
services.AddTransient();
@@ -158,8 +159,6 @@ static void Configure(WebApplication app, AdminApiConfiguration configuration)
if (configuration.SwaggerUi.Enabled)
app.UseCustomSwaggerUi();
- app.MapPrometheusScrapingEndpoint();
-
// the following headers are necessary to run the application in webassembly mode
app.Use(async (context, next) =>
{
diff --git a/Applications/AdminApi/src/AdminApi/appsettings.json b/Applications/AdminApi/src/AdminApi/appsettings.json
index 4ba48a4ddd..1d59d85bf3 100644
--- a/Applications/AdminApi/src/AdminApi/appsettings.json
+++ b/Applications/AdminApi/src/AdminApi/appsettings.json
@@ -29,19 +29,21 @@
}
}
},
- "Logging": {
- "MinimumLevel": {
- "Default": "Warning",
- "Override": {
- "Backbone": "Information",
- "Azure.Messaging.ServiceBus": "Error"
- }
- },
- "WriteTo": {
- "Console": {
- "Name": "Console",
- "Args": {
- "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ "Telemetry": {
+ "Logging": {
+ "MinimumLevel": {
+ "Default": "Warning",
+ "Override": {
+ "Backbone": "Information",
+ "Azure.Messaging.ServiceBus": "Error"
+ }
+ },
+ "WriteTo": {
+ "Console": {
+ "Name": "Console",
+ "Args": {
+ "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ }
}
}
}
diff --git a/Applications/AdminApi/src/AdminApi/packages.lock.json b/Applications/AdminApi/src/AdminApi/packages.lock.json
index 4ac52b7ba4..3c4031b016 100644
--- a/Applications/AdminApi/src/AdminApi/packages.lock.json
+++ b/Applications/AdminApi/src/AdminApi/packages.lock.json
@@ -782,11 +782,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -994,9 +989,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1057,6 +1053,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1725,13 +1722,19 @@
"OpenIddict.Abstractions": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -1752,6 +1755,15 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Applications/AdminApi/test/AdminApi.Tests.Integration/packages.lock.json b/Applications/AdminApi/test/AdminApi.Tests.Integration/packages.lock.json
index 6440293241..bd48ad7d60 100644
--- a/Applications/AdminApi/test/AdminApi.Tests.Integration/packages.lock.json
+++ b/Applications/AdminApi/test/AdminApi.Tests.Integration/packages.lock.json
@@ -1246,11 +1246,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1630,9 +1625,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1693,6 +1689,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -2559,13 +2556,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -2587,6 +2590,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Applications/AdminCli/src/AdminCli/Configuration/AdminCliConfiguration.cs b/Applications/AdminCli/src/AdminCli/Configuration/AdminCliConfiguration.cs
index fa21ed451c..28d240dd59 100644
--- a/Applications/AdminCli/src/AdminCli/Configuration/AdminCliConfiguration.cs
+++ b/Applications/AdminCli/src/AdminCli/Configuration/AdminCliConfiguration.cs
@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
+using Backbone.BuildingBlocks.API.Extensions;
using Backbone.BuildingBlocks.Infrastructure.EventBus;
using Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
@@ -6,9 +7,17 @@ namespace Backbone.AdminCli.Configuration;
public class AdminCliConfiguration
{
+ [Required]
+ public required TelemetryConfiguration Telemetry { get; init; }
+
[Required]
public required AdminInfrastructureConfiguration Infrastructure { get; init; }
+ public class TelemetryConfiguration
+ {
+ public required OpenTelemetryCollectorConfiguration OpenTelemetryCollector { get; set; } = new();
+ }
+
public class AdminInfrastructureConfiguration
{
[Required]
diff --git a/Applications/AdminCli/src/AdminCli/Program.cs b/Applications/AdminCli/src/AdminCli/Program.cs
index 5b9b953f79..831bf49061 100644
--- a/Applications/AdminCli/src/AdminCli/Program.cs
+++ b/Applications/AdminCli/src/AdminCli/Program.cs
@@ -1,3 +1,4 @@
+using System.Reflection;
using Autofac;
using Autofac.Extensions.DependencyInjection;
using Backbone.AdminApi.Infrastructure.Persistence;
@@ -77,6 +78,7 @@ private static IServiceProvider BuildServiceProvider(IConfiguration configuratio
#pragma warning restore ASP0000
services.AddDatabase(parsedConfiguration.Infrastructure.SqlDatabase);
+ services.AddOpenTelemetry(METER_NAME, Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "unknown", parsedConfiguration.Telemetry.OpenTelemetryCollector);
var containerBuilder = new ContainerBuilder();
containerBuilder.Populate(services);
diff --git a/Applications/AdminCli/src/AdminCli/appsettings.json b/Applications/AdminCli/src/AdminCli/appsettings.json
index 4ba48a4ddd..1d59d85bf3 100644
--- a/Applications/AdminCli/src/AdminCli/appsettings.json
+++ b/Applications/AdminCli/src/AdminCli/appsettings.json
@@ -29,19 +29,21 @@
}
}
},
- "Logging": {
- "MinimumLevel": {
- "Default": "Warning",
- "Override": {
- "Backbone": "Information",
- "Azure.Messaging.ServiceBus": "Error"
- }
- },
- "WriteTo": {
- "Console": {
- "Name": "Console",
- "Args": {
- "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ "Telemetry": {
+ "Logging": {
+ "MinimumLevel": {
+ "Default": "Warning",
+ "Override": {
+ "Backbone": "Information",
+ "Azure.Messaging.ServiceBus": "Error"
+ }
+ },
+ "WriteTo": {
+ "Console": {
+ "Name": "Console",
+ "Args": {
+ "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ }
}
}
}
diff --git a/Applications/AdminCli/src/AdminCli/packages.lock.json b/Applications/AdminCli/src/AdminCli/packages.lock.json
index 28fe1fa37a..08dfd1a72a 100644
--- a/Applications/AdminCli/src/AdminCli/packages.lock.json
+++ b/Applications/AdminCli/src/AdminCli/packages.lock.json
@@ -932,11 +932,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1138,9 +1133,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1201,6 +1197,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1920,13 +1917,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -1948,6 +1951,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Applications/ConsumerApi/src/Configuration/ConsumerApiConfiguration.cs b/Applications/ConsumerApi/src/Configuration/ConsumerApiConfiguration.cs
index fad4efc0cd..ed63b9305c 100644
--- a/Applications/ConsumerApi/src/Configuration/ConsumerApiConfiguration.cs
+++ b/Applications/ConsumerApi/src/Configuration/ConsumerApiConfiguration.cs
@@ -6,6 +6,9 @@ namespace Backbone.ConsumerApi.Configuration;
public class ConsumerApiConfiguration
{
+ [Required]
+ public required TelemetryConfiguration Telemetry { get; init; }
+
[Required]
public required AuthenticationConfiguration Authentication { get; init; }
@@ -21,6 +24,12 @@ public class ConsumerApiConfiguration
public WellKnownEndpointsConfiguration? WellKnownEndpoints { get; init; }
+ public class TelemetryConfiguration
+ {
+ [Required]
+ public required OpenTelemetryCollectorConfiguration OpenTelemetryCollector { get; set; } = new();
+ }
+
public class WellKnownEndpointsConfiguration
{
[Required]
diff --git a/Applications/ConsumerApi/src/Program.cs b/Applications/ConsumerApi/src/Program.cs
index 63b54eed27..c46c33d993 100644
--- a/Applications/ConsumerApi/src/Program.cs
+++ b/Applications/ConsumerApi/src/Program.cs
@@ -1,3 +1,4 @@
+using System.Reflection;
using Autofac.Extensions.DependencyInjection;
using Backbone.BuildingBlocks.API.Extensions;
using Backbone.BuildingBlocks.API.Mvc.Middleware;
@@ -86,14 +87,14 @@ static WebApplication CreateApp(string[] args)
builder.Host
.UseSerilog((context, configuration) => configuration
- .ReadFrom.Configuration(context.Configuration, new ConfigurationReaderOptions { SectionName = "Logging" })
- .Enrich.WithCorrelationId("X-Correlation-Id", addValueIfHeaderAbsence: true)
- .Enrich.FromLogContext()
- .Enrich.WithProperty("service", "consumerapi")
- .Enrich.WithExceptionDetails(new DestructuringOptionsBuilder()
- .WithDefaultDestructurers()
- .WithDestructurers([new DbUpdateExceptionDestructurer()]))
- .Enrich.WithSensitiveDataMasking(options => options.AddSensitiveDataMasks()), preserveStaticLogger: true)
+ .ReadFrom.Configuration(context.Configuration, new ConfigurationReaderOptions { SectionName = "Telemetry:Logging" })
+ .Enrich.WithCorrelationId("X-Correlation-Id", addValueIfHeaderAbsence: true)
+ .Enrich.FromLogContext()
+ .Enrich.WithExceptionDetails(new DestructuringOptionsBuilder()
+ .WithDefaultDestructurers()
+ .WithDestructurers([new DbUpdateExceptionDestructurer()]))
+ .Enrich.WithSensitiveDataMasking(options => options.AddSensitiveDataMasks()),
+ writeToProviders: true)
.UseServiceProviderFactory(new AutofacServiceProviderFactory());
ConfigureServices(builder.Services, builder.Configuration, builder.Environment);
@@ -173,7 +174,7 @@ static void ConfigureServices(IServiceCollection services, IConfiguration config
options.KnownProxies.Clear();
});
- services.AddOpenTelemetryWithPrometheusExporter(METER_NAME);
+ services.AddOpenTelemetry(METER_NAME, Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "unknown", parsedBackboneConfiguration.Telemetry.OpenTelemetryCollector);
services.AddEventBus(parsedBackboneConfiguration.Infrastructure.EventBus, METER_NAME);
services.AddHttpUserAgentParser();
@@ -184,8 +185,6 @@ static void Configure(WebApplication app, ConsumerApiConfiguration configuration
if (configuration.SwaggerUi.Enabled)
app.UseCustomSwaggerUi();
- app.MapPrometheusScrapingEndpoint();
-
app.UseSerilogRequestLogging(opts =>
{
opts.EnrichDiagnosticContext = LogHelper.EnrichFromRequest;
@@ -214,6 +213,8 @@ static void Configure(WebApplication app, ConsumerApiConfiguration configuration
app.UseCors();
app.UseAuthentication().UseAuthorization();
+ app.UseMiddleware();
+
app.MapControllers();
app.MapHealthChecks("/health", new HealthCheckOptions
{
diff --git a/Applications/ConsumerApi/src/appsettings.json b/Applications/ConsumerApi/src/appsettings.json
index 182a9aa1d4..1d59d85bf3 100644
--- a/Applications/ConsumerApi/src/appsettings.json
+++ b/Applications/ConsumerApi/src/appsettings.json
@@ -29,22 +29,23 @@
}
}
},
- "Logging": {
- "MinimumLevel": {
- "Default": "Warning",
- "Override": {
- "Backbone": "Information",
- "Azure.Messaging.ServiceBus": "Error"
- }
- },
- "WriteTo": {
- "Console": {
- "Name": "Console",
- "Args": {
- "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ "Telemetry": {
+ "Logging": {
+ "MinimumLevel": {
+ "Default": "Warning",
+ "Override": {
+ "Backbone": "Information",
+ "Azure.Messaging.ServiceBus": "Error"
+ }
+ },
+ "WriteTo": {
+ "Console": {
+ "Name": "Console",
+ "Args": {
+ "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ }
}
}
}
}
}
-
diff --git a/Applications/ConsumerApi/src/packages.lock.json b/Applications/ConsumerApi/src/packages.lock.json
index f79b0fb5be..5e10aa829e 100644
--- a/Applications/ConsumerApi/src/packages.lock.json
+++ b/Applications/ConsumerApi/src/packages.lock.json
@@ -753,11 +753,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -947,9 +942,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1010,6 +1006,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1949,13 +1946,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -1976,6 +1979,15 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Applications/ConsumerApi/test/ConsumerApi.Tests.Integration/packages.lock.json b/Applications/ConsumerApi/test/ConsumerApi.Tests.Integration/packages.lock.json
index 638a3e4aaa..6a350cd847 100644
--- a/Applications/ConsumerApi/test/ConsumerApi.Tests.Integration/packages.lock.json
+++ b/Applications/ConsumerApi/test/ConsumerApi.Tests.Integration/packages.lock.json
@@ -1215,11 +1215,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1528,9 +1523,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1591,6 +1587,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -2764,13 +2761,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -2792,6 +2795,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Applications/DatabaseMigrator/src/DatabaseMigrator/Configuration.cs b/Applications/DatabaseMigrator/src/DatabaseMigrator/Configuration.cs
index 6f1bafc49b..9703ab0d7d 100644
--- a/Applications/DatabaseMigrator/src/DatabaseMigrator/Configuration.cs
+++ b/Applications/DatabaseMigrator/src/DatabaseMigrator/Configuration.cs
@@ -1,14 +1,23 @@
using System.ComponentModel.DataAnnotations;
+using Backbone.BuildingBlocks.API.Extensions;
using Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
namespace Backbone.DatabaseMigrator;
public class Configuration
{
+ [Required]
+ public required TelemetryConfiguration Telemetry { get; init; }
+
[Required]
public required InfrastructureConfiguration Infrastructure { get; init; }
}
+public class TelemetryConfiguration
+{
+ public required OpenTelemetryCollectorConfiguration OpenTelemetryCollector { get; set; } = new();
+}
+
public class InfrastructureConfiguration
{
[Required]
diff --git a/Applications/DatabaseMigrator/src/DatabaseMigrator/DatabaseMigrator.csproj b/Applications/DatabaseMigrator/src/DatabaseMigrator/DatabaseMigrator.csproj
index 9e2ae7008a..b1839f82e9 100644
--- a/Applications/DatabaseMigrator/src/DatabaseMigrator/DatabaseMigrator.csproj
+++ b/Applications/DatabaseMigrator/src/DatabaseMigrator/DatabaseMigrator.csproj
@@ -29,6 +29,7 @@
+
diff --git a/Applications/DatabaseMigrator/src/DatabaseMigrator/Dockerfile b/Applications/DatabaseMigrator/src/DatabaseMigrator/Dockerfile
index a44c949d74..b0b2c198a8 100644
--- a/Applications/DatabaseMigrator/src/DatabaseMigrator/Dockerfile
+++ b/Applications/DatabaseMigrator/src/DatabaseMigrator/Dockerfile
@@ -17,6 +17,8 @@ COPY ["Applications/AdminApi/src/AdminApi.Infrastructure.Database.SqlServer/Admi
COPY ["Applications/AdminApi/src/AdminApi.Infrastructure.Database.SqlServer/AdminApi.Infrastructure.Database.SqlServer.csproj", "Applications/AdminApi/src/AdminApi.Infrastructure.Database.SqlServer/packages.lock.json*", "Applications/AdminApi/src/AdminApi.Infrastructure.Database.SqlServer/"]
COPY ["Applications/AdminApi/src/AdminApi.Infrastructure.Database.Postgres/AdminApi.Infrastructure.Database.Postgres.csproj", "Applications/AdminApi/src/AdminApi.Infrastructure.Database.Postgres/packages.lock.json*", "Applications/AdminApi/src/AdminApi.Infrastructure.Database.Postgres/"]
+COPY ["BuildingBlocks/src/BuildingBlocks.API/BuildingBlocks.API.csproj", "BuildingBlocks/src/BuildingBlocks.API/packages.lock.json*", "BuildingBlocks/src/BuildingBlocks.API/"]
+COPY ["BuildingBlocks/src/BuildingBlocks.Module/BuildingBlocks.Module.csproj", "BuildingBlocks/src/BuildingBlocks.Module/packages.lock.json*", "BuildingBlocks/src/BuildingBlocks.Module/"]
COPY ["BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj", "BuildingBlocks/src/BuildingBlocks.Infrastructure/packages.lock.json*", "BuildingBlocks/src/BuildingBlocks.Infrastructure/"]
COPY ["BuildingBlocks/src/BuildingBlocks.Application.Abstractions/BuildingBlocks.Application.Abstractions.csproj", "BuildingBlocks/src/BuildingBlocks.Application.Abstractions/packages.lock.json*", "BuildingBlocks/src/BuildingBlocks.Application.Abstractions/"]
COPY ["BuildingBlocks/src/DevelopmentKit.Identity/DevelopmentKit.Identity.csproj", "BuildingBlocks/src/DevelopmentKit.Identity/packages.lock.json*", "BuildingBlocks/src/DevelopmentKit.Identity/"]
@@ -82,7 +84,7 @@ COPY ["Modules/Tokens/src/Tokens.Application/Tokens.Application.csproj", "Module
COPY ["Modules/Tokens/src/Tokens.Domain/Tokens.Domain.csproj", "Modules/Tokens/src/Tokens.Domain/packages.lock.json*", "Modules/Tokens/src/Tokens.Domain/"]
COPY ["Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/Tokens.Infrastructure.Database.Postgres.csproj", "Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/packages.lock.json*", "Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/"]
-RUN dotnet restore /p:ContinuousIntegrationBuild=true "Applications/DatabaseMigrator/src/DatabaseMigrator/DatabaseMigrator.csproj"
+RUN dotnet restore /p:ContinuousIntegrationBuild=true /p:Configuration=Release "Applications/DatabaseMigrator/src/DatabaseMigrator/DatabaseMigrator.csproj"
COPY . .
diff --git a/Applications/DatabaseMigrator/src/DatabaseMigrator/Program.cs b/Applications/DatabaseMigrator/src/DatabaseMigrator/Program.cs
index be677d8218..9104cd375b 100644
--- a/Applications/DatabaseMigrator/src/DatabaseMigrator/Program.cs
+++ b/Applications/DatabaseMigrator/src/DatabaseMigrator/Program.cs
@@ -1,4 +1,6 @@
-using Autofac.Extensions.DependencyInjection;
+using System.Reflection;
+using Autofac.Extensions.DependencyInjection;
+using Backbone.BuildingBlocks.API.Extensions;
using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using Backbone.DatabaseMigrator;
using Microsoft.Extensions.Options;
@@ -62,15 +64,21 @@ static IHostBuilder CreateHostBuilder(string[] args)
services.AddSingleton();
services.AddAllDbContexts(parsedConfiguration.Infrastructure.SqlDatabase);
+
+ services.AddOpenTelemetry(METER_NAME, Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "unknown", parsedConfiguration.Telemetry.OpenTelemetryCollector);
})
.UseServiceProviderFactory(new AutofacServiceProviderFactory())
.UseSerilog((context, configuration) => configuration
- .ReadFrom.Configuration(context.Configuration, new ConfigurationReaderOptions { SectionName = "Logging" })
+ .ReadFrom.Configuration(context.Configuration, new ConfigurationReaderOptions { SectionName = "Telemetry:Logging" })
.Enrich.FromLogContext()
- .Enrich.WithProperty("service", "databasemigrator")
.Enrich.WithExceptionDetails(new DestructuringOptionsBuilder()
.WithDefaultDestructurers()
.WithDestructurers([new DbUpdateExceptionDestructurer()])
), preserveStaticLogger: true
);
}
+
+public partial class Program
+{
+ private const string METER_NAME = "enmeshed.backbone.databasemigrator";
+}
diff --git a/Applications/DatabaseMigrator/src/DatabaseMigrator/appsettings.json b/Applications/DatabaseMigrator/src/DatabaseMigrator/appsettings.json
index 4ba48a4ddd..1d59d85bf3 100644
--- a/Applications/DatabaseMigrator/src/DatabaseMigrator/appsettings.json
+++ b/Applications/DatabaseMigrator/src/DatabaseMigrator/appsettings.json
@@ -29,19 +29,21 @@
}
}
},
- "Logging": {
- "MinimumLevel": {
- "Default": "Warning",
- "Override": {
- "Backbone": "Information",
- "Azure.Messaging.ServiceBus": "Error"
- }
- },
- "WriteTo": {
- "Console": {
- "Name": "Console",
- "Args": {
- "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ "Telemetry": {
+ "Logging": {
+ "MinimumLevel": {
+ "Default": "Warning",
+ "Override": {
+ "Backbone": "Information",
+ "Azure.Messaging.ServiceBus": "Error"
+ }
+ },
+ "WriteTo": {
+ "Console": {
+ "Name": "Console",
+ "Args": {
+ "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ }
}
}
}
diff --git a/Applications/DatabaseMigrator/src/DatabaseMigrator/packages.lock.json b/Applications/DatabaseMigrator/src/DatabaseMigrator/packages.lock.json
index 1fbbc019fb..4a48f227e4 100644
--- a/Applications/DatabaseMigrator/src/DatabaseMigrator/packages.lock.json
+++ b/Applications/DatabaseMigrator/src/DatabaseMigrator/packages.lock.json
@@ -182,6 +182,22 @@
"runtime.native.System.Data.SqlClient.sni": "4.4.0"
}
},
+ "Asp.Versioning.Abstractions": {
+ "type": "Transitive",
+ "resolved": "10.1.0",
+ "contentHash": "RwdgC5O0baZ4pt30pAKKPQHq2CV4unBKA4HWoTeu7NY9ZwXM0dWYGf1Ipc5GK0eFBe9cMeqz4pGpPncMz4/ZNQ==",
+ "dependencies": {
+ "Microsoft.Extensions.Primitives": "10.0.0"
+ }
+ },
+ "Asp.Versioning.Http": {
+ "type": "Transitive",
+ "resolved": "10.0.1",
+ "contentHash": "g0ayV/9ho3tGgooC6eF5p1063I1WzlxFJDYQrigcGnW+mLvui6eXrcW5hzTHhQREroUR3ZwXQrIN2SAIoi+KDw==",
+ "dependencies": {
+ "Asp.Versioning.Abstractions": "10.1.0"
+ }
+ },
"AWSSDK.Core": {
"type": "Transitive",
"resolved": "4.0.100.9",
@@ -210,16 +226,6 @@
"System.Memory.Data": "1.0.2"
}
},
- "Azure.Identity": {
- "type": "Transitive",
- "resolved": "1.17.1",
- "contentHash": "MSZkBrctcpiGxs9Cvr2VKKoN6qFLZlP3I6xuCWJ9iTgitI5Rgxtk5gfOSpXPZE3+CJmZ/mnqpQyGyjawFn5Vvg==",
- "dependencies": {
- "Azure.Core": "1.50.0",
- "Microsoft.Identity.Client": "4.78.0",
- "Microsoft.Identity.Client.Extensions.Msal": "4.78.0"
- }
- },
"Azure.Storage.Common": {
"type": "Transitive",
"resolved": "12.28.0",
@@ -491,22 +497,34 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
- "resolved": "6.1.4",
- "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==",
+ "resolved": "7.0.2",
+ "contentHash": "zwv76lANFQQI6Gmp6ntkzMWIWVqm8Wf4Mz00AeGCk1n8HCi5afi6bNynSe18uI0xeL0n6J+Myjk9AiIsL5oSqw==",
+ "dependencies": {
+ "Microsoft.Bcl.Cryptography": "9.0.13",
+ "Microsoft.Data.SqlClient.Extensions.Abstractions": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.Internal.Logging": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.SNI.runtime": "[6.0.2, 7.0.0)",
+ "Microsoft.Extensions.Caching.Memory": "9.0.13",
+ "Microsoft.IdentityModel.JsonWebTokens": "8.16.0",
+ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "8.16.0",
+ "Microsoft.SqlServer.Server": "[1.0.0, 2.0.0)",
+ "System.Configuration.ConfigurationManager": "9.0.13",
+ "System.Security.Cryptography.Pkcs": "9.0.13"
+ }
+ },
+ "Microsoft.Data.SqlClient.Extensions.Abstractions": {
+ "type": "Transitive",
+ "resolved": "7.0.2",
+ "contentHash": "Zx7z61fG2Nc6LdDn4jA7b5Aj1ABrljkOPRE31RvVUdjF6IgbG60leDUhMCafsnWFgaheiK3iqpLe+kbf5Z5L8Q==",
"dependencies": {
- "Azure.Core": "1.50.0",
- "Azure.Identity": "1.17.1",
- "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
- "Microsoft.Extensions.Caching.Memory": "9.0.11",
- "Microsoft.Identity.Client": "4.80.0",
- "Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
- "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
- "Microsoft.SqlServer.Server": "1.0.0",
- "System.Configuration.ConfigurationManager": "9.0.11",
- "System.IdentityModel.Tokens.Jwt": "7.7.1",
- "System.Security.Cryptography.Pkcs": "9.0.11"
+ "Microsoft.Data.SqlClient.Internal.Logging": "[7.0.2, 8.0.0)"
}
},
+ "Microsoft.Data.SqlClient.Internal.Logging": {
+ "type": "Transitive",
+ "resolved": "7.0.2",
+ "contentHash": "iqgYBbGSVy/DIYWjzmQOa964Kn4rs4wW5vg2IamqVK0fQqfTiILVR5hMK27XWqoyONtAZs+VxH354cPJBtSnbg=="
+ },
"Microsoft.Data.SqlClient.SNI.runtime": {
"type": "Transitive",
"resolved": "6.0.2",
@@ -549,6 +567,11 @@
"Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.10"
}
},
+ "Microsoft.Extensions.ApiDescription.Server": {
+ "type": "Transitive",
+ "resolved": "10.0.0",
+ "contentHash": "NCWCGiwRwje8773yzPQhvucYnnfeR+ZoB1VRIrIMp4uaeUNw7jvEPHij3HIbwCDuNCrNcphA00KSAR9yD9qmbg=="
+ },
"Microsoft.Extensions.Caching.Abstractions": {
"type": "Transitive",
"resolved": "10.0.10",
@@ -907,11 +930,11 @@
},
"Microsoft.IdentityModel.Protocols.OpenIdConnect": {
"type": "Transitive",
- "resolved": "7.7.1",
- "contentHash": "yT2Hdj8LpPbcT9C9KlLVxXl09C8zjFaVSaApdOwuecMuoV4s6Sof/mnTDz/+F/lILPIBvrWugR9CC7iRVZgbfQ==",
+ "resolved": "8.16.0",
+ "contentHash": "h4yVXyJsEBBX5lg2G5ftMsi5JzcNEGAzrNphA6DQ6eOd8P0s+cDCOyPwVTYLePZvJL5unbPvYIvzrbTXzFjXnQ==",
"dependencies": {
- "Microsoft.IdentityModel.Protocols": "7.7.1",
- "System.IdentityModel.Tokens.Jwt": "7.7.1"
+ "Microsoft.IdentityModel.Protocols": "8.16.0",
+ "System.IdentityModel.Tokens.Jwt": "8.16.0"
}
},
"Microsoft.IdentityModel.Tokens": {
@@ -924,6 +947,11 @@
"Microsoft.IdentityModel.Logging": "8.19.2"
}
},
+ "Microsoft.OpenApi": {
+ "type": "Transitive",
+ "resolved": "2.7.5",
+ "contentHash": "0FA67RSnRM4tcBKqiqVu/HPdZ9+QOKbmeRjxRUGTCjPU4C0bmUhd97Dso7Yild5P7nOV6GxJ2xrK0Kv/O9xp0w=="
+ },
"Microsoft.SqlServer.Server": {
"type": "Transitive",
"resolved": "1.0.0",
@@ -1141,6 +1169,26 @@
"OpenIddict.Validation": "7.6.0"
}
},
+ "OpenTelemetry": {
+ "type": "Transitive",
+ "resolved": "1.17.0",
+ "contentHash": "rMLOTftlMlTm7+MSrvXDHnJRjVkROFNKXHZrYjOsX+LankaFG7QSflx7qRRGjoqZoirohnxmJQ7GEb9occO4Gg==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration.EnvironmentVariables": "10.0.0",
+ "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.0",
+ "Microsoft.Extensions.Logging.Configuration": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
+ }
+ },
+ "OpenTelemetry.Api.ProviderBuilderExtensions": {
+ "type": "Transitive",
+ "resolved": "1.17.0",
+ "contentHash": "Xgc3Qf9B9TFMFpx6exTdGqMWuYIT2miNzkdMPutVvT9YuMFaEovXWke1Gb6z8NxYaQbbGF38vYLuSg1JCeui5Q==",
+ "dependencies": {
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0",
+ "OpenTelemetry.Api": "1.17.0"
+ }
+ },
"Polly.Core": {
"type": "Transitive",
"resolved": "8.7.0",
@@ -1220,6 +1268,27 @@
"resolved": "2.1.11",
"contentHash": "PK0GLFkfhZzLQeR3PJf71FmhtHox+U3vcY6ZtswoMjrefkB9k6ErNJEnwXqc5KgXDSjige2XXrezqS39gkpQKA=="
},
+ "Swashbuckle.AspNetCore.Swagger": {
+ "type": "Transitive",
+ "resolved": "10.2.3",
+ "contentHash": "1jUUs3WQnrS0FUtaZPLSy1yYMEwS1zlvDmvQ2/eldPHUANX0LJSLVZecCMgSMdeGiRqeaRrIXLtSz++TCiTMww==",
+ "dependencies": {
+ "Microsoft.OpenApi": "2.7.5"
+ }
+ },
+ "Swashbuckle.AspNetCore.SwaggerGen": {
+ "type": "Transitive",
+ "resolved": "10.2.3",
+ "contentHash": "y7t4coDRAeFYChmvlMRiH2OjbiRrm9AVIDgt17fQfs3x9PVAI5PiwWYOhg+4F13R4Q36WDc9lqfoOnNa3tNbGg==",
+ "dependencies": {
+ "Swashbuckle.AspNetCore.Swagger": "10.2.3"
+ }
+ },
+ "Swashbuckle.AspNetCore.SwaggerUI": {
+ "type": "Transitive",
+ "resolved": "10.2.3",
+ "contentHash": "nthWONRs/FJ4yyG206g1cC52WEG8EqrjuMWjGdR+5XG7lbjFto6NqcI9EMICgVFom/UivIjUVwI76ZHbHwTPfQ=="
+ },
"System.ClientModel": {
"type": "Transitive",
"resolved": "1.14.0",
@@ -1286,11 +1355,11 @@
},
"System.Configuration.ConfigurationManager": {
"type": "Transitive",
- "resolved": "9.0.11",
- "contentHash": "vPinosRgEk1CGjohbv0pDuz6gPprkWo5xvBTjOJjks5JOgOEWvPndq5NngGxiTcBcy1+k9GwzZ1c3Bp2fU5ezw==",
+ "resolved": "9.0.13",
+ "contentHash": "GbBrJq9S/gYpHzm7Pxx6Y5tDyfSfyxW6tlP5oiKJV38uf19Wp+GIIAnWfyL1zmNiz1+EjwVapw2WkBFvvqKQzg==",
"dependencies": {
- "System.Diagnostics.EventLog": "9.0.11",
- "System.Security.Cryptography.ProtectedData": "9.0.11"
+ "System.Diagnostics.EventLog": "9.0.13",
+ "System.Security.Cryptography.ProtectedData": "9.0.13"
}
},
"System.Diagnostics.EventLog": {
@@ -1300,11 +1369,11 @@
},
"System.IdentityModel.Tokens.Jwt": {
"type": "Transitive",
- "resolved": "7.7.1",
- "contentHash": "rQkO1YbAjLwnDJSMpRhRtrc6XwIcEOcUvoEcge+evurpzSZM3UNK+MZfD3sKyTlYsvknZ6eJjSBfnmXqwOsT9Q==",
+ "resolved": "8.16.0",
+ "contentHash": "rrs2u7DRMXQG2yh0oVyF/vLwosfRv20Ld2iEpYcKwQWXHjfV+gFXNQsQ9p008kR9Ou4pxBs68Q6/9zC8Gi1wjg==",
"dependencies": {
- "Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
- "Microsoft.IdentityModel.Tokens": "7.7.1"
+ "Microsoft.IdentityModel.JsonWebTokens": "8.16.0",
+ "Microsoft.IdentityModel.Tokens": "8.16.0"
}
},
"System.IO.Hashing": {
@@ -1337,8 +1406,8 @@
},
"System.Security.Cryptography.ProtectedData": {
"type": "Transitive",
- "resolved": "9.0.11",
- "contentHash": "s8yUYuYYu+PAwvBdhLG1KyrGrk9gkYeuPxfAsXsTqqWyepwSyEw8hAaflW4nO98NG52YpYI1am2+9o+79h2RtQ=="
+ "resolved": "9.0.13",
+ "contentHash": "t8S9IDpjJKsLpLkeBdW8cWtcPyYqrGu93Dej1RO6WwuL/lkFSqWlan3rMJfortqz1mRIh+sys2AFsSA6jWJ3Jg=="
},
"System.Security.Cryptography.Xml": {
"type": "Transitive",
@@ -1371,6 +1440,33 @@
"Backbone.AdminApi.Infrastructure": "[1.0.0, )"
}
},
+ "Backbone.BuildingBlocks.API": {
+ "type": "Project",
+ "dependencies": {
+ "Asp.Versioning.Mvc": "[10.0.1, 10.0.1]",
+ "Asp.Versioning.Mvc.ApiExplorer": "[10.0.1, 10.0.1]",
+ "Backbone.BuildingBlocks.Application": "[1.0.0, )",
+ "Backbone.BuildingBlocks.Module": "[1.0.0, )",
+ "Backbone.Modules.Devices.Domain": "[1.0.0, )",
+ "Backbone.Modules.Devices.Infrastructure": "[1.0.0, )",
+ "Backbone.Tooling": "[1.0.0, )",
+ "DotNetDiag.HealthChecks.NpgSql": "[10.0.10, 10.0.10]",
+ "DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
+ "Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
+ "Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
+ "OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
+ "OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
+ "Polly": "[8.7.0, 8.7.0]",
+ "Serilog.Enrichers.Sensitive": "[2.1.0, 2.1.0]",
+ "Serilog.Extensions.Hosting": "[10.0.0, 10.0.0]",
+ "Swashbuckle.AspNetCore": "[10.2.3, 10.2.3]",
+ "System.Data.SqlClient": "[4.9.1, 4.9.1]"
+ }
+ },
"Backbone.BuildingBlocks.Application": {
"type": "Project",
"dependencies": {
@@ -1422,11 +1518,21 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
}
},
+ "Backbone.BuildingBlocks.Module": {
+ "type": "Project",
+ "dependencies": {
+ "Backbone.BuildingBlocks.Application.Abstractions": "[1.0.0, )",
+ "Microsoft.Extensions.Configuration.Abstractions": "[10.0.10, 10.0.10]",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "[10.0.10, 10.0.10]",
+ "ReHackt.Extensions.Options.Validation": "[10.0.1, 10.0.1]"
+ }
+ },
"Backbone.Common.Infrastructure": {
"type": "Project",
"dependencies": {
@@ -1852,6 +1958,24 @@
"Microsoft.Extensions.Options": "[10.0.10, 10.0.10]"
}
},
+ "Asp.Versioning.Mvc": {
+ "type": "CentralTransitive",
+ "requested": "[10.0.1, 10.0.1]",
+ "resolved": "10.0.1",
+ "contentHash": "OqoFPKKxXkNmw62H3CgXkPrf1L4PPwwyYr9QMP6itt/khKTIayqaHhK6F2e3jt6KHc4s23cWAUbu+Z5GPEeMaw==",
+ "dependencies": {
+ "Asp.Versioning.Http": "10.0.1"
+ }
+ },
+ "Asp.Versioning.Mvc.ApiExplorer": {
+ "type": "CentralTransitive",
+ "requested": "[10.0.1, 10.0.1]",
+ "resolved": "10.0.1",
+ "contentHash": "ylPZe+LheFp0pt2tSMq2pPeGAkMLqWVOn5+1/xOB/eUj889n9b35Sny08bSQ0ziAGIFjp3BBTXaYsWJjRoFV4A==",
+ "dependencies": {
+ "Asp.Versioning.Mvc": "10.0.1"
+ }
+ },
"Autofac": {
"type": "CentralTransitive",
"requested": "[9.3.2, 9.3.2]",
@@ -1906,6 +2030,26 @@
"resolved": "2.1.79",
"contentHash": "8YijbzgTfmqmQOnVNorYM6K++pxqnW3nJ4aC1sRHzxUA2CcuoJ9gsTem3kgBnPRMc38zZHl4Esb6hAezXIEEuw=="
},
+ "DotNetDiag.HealthChecks.NpgSql": {
+ "type": "CentralTransitive",
+ "requested": "[10.0.10, 10.0.10]",
+ "resolved": "10.0.10",
+ "contentHash": "lxb6wQ1YC/TpvZMVgbyeLP5dYOg/RJWLg1xlR+I0FeyfyMmukppKdwzBOrKRtZ8FHG3nV9xrVTaPdwRw0yL4Vw==",
+ "dependencies": {
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "10.0.9",
+ "Npgsql": "10.0.3"
+ }
+ },
+ "DotNetDiag.HealthChecks.SqlServer": {
+ "type": "CentralTransitive",
+ "requested": "[10.0.10, 10.0.10]",
+ "resolved": "10.0.10",
+ "contentHash": "6t2HP5VQR0GZDJiw8iZvzOTRC+84irUeaUuWvcqcnc4K5Mzrn/A9V0ucoyjySXOF1vGkdTHjlJMknJVYC9c2Hg==",
+ "dependencies": {
+ "Microsoft.Data.SqlClient": "7.0.2",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "10.0.9"
+ }
+ },
"EFCore.BulkExtensions.Core": {
"type": "CentralTransitive",
"requested": "[10.0.1, 10.0.1]",
@@ -2276,6 +2420,71 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
+ "dependencies": {
+ "OpenTelemetry": "1.17.0"
+ }
+ },
+ "OpenTelemetry.Extensions.Hosting": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, 1.17.0]",
+ "resolved": "1.17.0",
+ "contentHash": "t1OwL/4qgboGMobYVT+UV5zgWnFqCp4Pw8lcsmzh8m2K8PQsTKkyxrC32tqYTMYny3GOW4q5cltE3dTVzLmRew==",
+ "dependencies": {
+ "Microsoft.Extensions.Hosting.Abstractions": "10.0.0",
+ "OpenTelemetry": "1.17.0"
+ }
+ },
+ "OpenTelemetry.Instrumentation.AspNetCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, 1.17.0]",
+ "resolved": "1.17.0",
+ "contentHash": "rGbmk1vuy1kvgZmE0ps7Vb99YZvDap6AalrrF60FwnNit1uW/PbeFZj1cpb0T8MPkYmjhBrRJ1/JB6QqXkRjHA==",
+ "dependencies": {
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
+ "OpenTelemetry.Instrumentation.Http": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, 1.17.0]",
+ "resolved": "1.17.0",
+ "contentHash": "uTwVtxIJ/xB96wGYTaDsbkJVeCFdUxTwvrlDUn2YJixy0UuKc8DvQMzwKNJMTzNFiiyYO9c40id6tUHTmWs33A==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
+ "OpenTelemetry.Instrumentation.Runtime": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, 1.17.0]",
+ "resolved": "1.17.0",
+ "contentHash": "HyYenisDn/xdtyVXdjImsCl+RNC2gq01N0rvSR7tsYAylXR2sxX/YgMsyTajMXA27+r1vB7lNU8cWRhV0fwL+Q==",
+ "dependencies": {
+ "OpenTelemetry.Api": "[1.17.0, 2.0.0)"
+ }
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
@@ -2294,11 +2503,29 @@
"System.Threading.RateLimiting": "8.0.0"
}
},
+ "Serilog.Enrichers.Sensitive": {
+ "type": "CentralTransitive",
+ "requested": "[2.1.0, 2.1.0]",
+ "resolved": "2.1.0",
+ "contentHash": "nlaEYMoHjJqncjQgc0Nv4LOIkAwUt4Nvmx3EMNjY4MKC7QqZs9zB0v/NwFnaWzLF7qztc7mna1bjn20Auohu0g=="
+ },
"SimpleBase": {
"type": "CentralTransitive",
"requested": "[5.6.3, 5.6.3]",
"resolved": "5.6.3",
"contentHash": "ayL730f1gdQVYmFFLKSX83QcoltyKSMBsV94qfCBpZHMaJz/e3ALuXKZDD8SkseWbNHxBe0HxLRBe5OOpQ9HpA=="
+ },
+ "Swashbuckle.AspNetCore": {
+ "type": "CentralTransitive",
+ "requested": "[10.2.3, 10.2.3]",
+ "resolved": "10.2.3",
+ "contentHash": "8KNh1RWvofdU6DVLyBs4Z/OpUMnmf8oNvJQc0QxpwySRbi42bwLfdVMMrXZWANg5U5KQGQq1xW6r/hlcqw99tQ==",
+ "dependencies": {
+ "Microsoft.Extensions.ApiDescription.Server": "10.0.0",
+ "Swashbuckle.AspNetCore.Swagger": "10.2.3",
+ "Swashbuckle.AspNetCore.SwaggerGen": "10.2.3",
+ "Swashbuckle.AspNetCore.SwaggerUI": "10.2.3"
+ }
}
},
"net10.0/linux-arm64": {
@@ -2318,20 +2545,19 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
- "resolved": "6.1.4",
- "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==",
+ "resolved": "7.0.2",
+ "contentHash": "zwv76lANFQQI6Gmp6ntkzMWIWVqm8Wf4Mz00AeGCk1n8HCi5afi6bNynSe18uI0xeL0n6J+Myjk9AiIsL5oSqw==",
"dependencies": {
- "Azure.Core": "1.50.0",
- "Azure.Identity": "1.17.1",
- "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
- "Microsoft.Extensions.Caching.Memory": "9.0.11",
- "Microsoft.Identity.Client": "4.80.0",
- "Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
- "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
- "Microsoft.SqlServer.Server": "1.0.0",
- "System.Configuration.ConfigurationManager": "9.0.11",
- "System.IdentityModel.Tokens.Jwt": "7.7.1",
- "System.Security.Cryptography.Pkcs": "9.0.11"
+ "Microsoft.Bcl.Cryptography": "9.0.13",
+ "Microsoft.Data.SqlClient.Extensions.Abstractions": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.Internal.Logging": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.SNI.runtime": "[6.0.2, 7.0.0)",
+ "Microsoft.Extensions.Caching.Memory": "9.0.13",
+ "Microsoft.IdentityModel.JsonWebTokens": "8.16.0",
+ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "8.16.0",
+ "Microsoft.SqlServer.Server": "[1.0.0, 2.0.0)",
+ "System.Configuration.ConfigurationManager": "9.0.13",
+ "System.Security.Cryptography.Pkcs": "9.0.13"
}
},
"Microsoft.Data.SqlClient.SNI.runtime": {
@@ -2398,20 +2624,19 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
- "resolved": "6.1.4",
- "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==",
+ "resolved": "7.0.2",
+ "contentHash": "zwv76lANFQQI6Gmp6ntkzMWIWVqm8Wf4Mz00AeGCk1n8HCi5afi6bNynSe18uI0xeL0n6J+Myjk9AiIsL5oSqw==",
"dependencies": {
- "Azure.Core": "1.50.0",
- "Azure.Identity": "1.17.1",
- "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
- "Microsoft.Extensions.Caching.Memory": "9.0.11",
- "Microsoft.Identity.Client": "4.80.0",
- "Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
- "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
- "Microsoft.SqlServer.Server": "1.0.0",
- "System.Configuration.ConfigurationManager": "9.0.11",
- "System.IdentityModel.Tokens.Jwt": "7.7.1",
- "System.Security.Cryptography.Pkcs": "9.0.11"
+ "Microsoft.Bcl.Cryptography": "9.0.13",
+ "Microsoft.Data.SqlClient.Extensions.Abstractions": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.Internal.Logging": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.SNI.runtime": "[6.0.2, 7.0.0)",
+ "Microsoft.Extensions.Caching.Memory": "9.0.13",
+ "Microsoft.IdentityModel.JsonWebTokens": "8.16.0",
+ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "8.16.0",
+ "Microsoft.SqlServer.Server": "[1.0.0, 2.0.0)",
+ "System.Configuration.ConfigurationManager": "9.0.13",
+ "System.Security.Cryptography.Pkcs": "9.0.13"
}
},
"Microsoft.Data.SqlClient.SNI.runtime": {
@@ -2478,20 +2703,19 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
- "resolved": "6.1.4",
- "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==",
+ "resolved": "7.0.2",
+ "contentHash": "zwv76lANFQQI6Gmp6ntkzMWIWVqm8Wf4Mz00AeGCk1n8HCi5afi6bNynSe18uI0xeL0n6J+Myjk9AiIsL5oSqw==",
"dependencies": {
- "Azure.Core": "1.50.0",
- "Azure.Identity": "1.17.1",
- "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
- "Microsoft.Extensions.Caching.Memory": "9.0.11",
- "Microsoft.Identity.Client": "4.80.0",
- "Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
- "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
- "Microsoft.SqlServer.Server": "1.0.0",
- "System.Configuration.ConfigurationManager": "9.0.11",
- "System.IdentityModel.Tokens.Jwt": "7.7.1",
- "System.Security.Cryptography.Pkcs": "9.0.11"
+ "Microsoft.Bcl.Cryptography": "9.0.13",
+ "Microsoft.Data.SqlClient.Extensions.Abstractions": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.Internal.Logging": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.SNI.runtime": "[6.0.2, 7.0.0)",
+ "Microsoft.Extensions.Caching.Memory": "9.0.13",
+ "Microsoft.IdentityModel.JsonWebTokens": "8.16.0",
+ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "8.16.0",
+ "Microsoft.SqlServer.Server": "[1.0.0, 2.0.0)",
+ "System.Configuration.ConfigurationManager": "9.0.13",
+ "System.Security.Cryptography.Pkcs": "9.0.13"
}
},
"Microsoft.Data.SqlClient.SNI.runtime": {
@@ -2558,20 +2782,19 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
- "resolved": "6.1.4",
- "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==",
- "dependencies": {
- "Azure.Core": "1.50.0",
- "Azure.Identity": "1.17.1",
- "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
- "Microsoft.Extensions.Caching.Memory": "9.0.11",
- "Microsoft.Identity.Client": "4.80.0",
- "Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
- "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
- "Microsoft.SqlServer.Server": "1.0.0",
- "System.Configuration.ConfigurationManager": "9.0.11",
- "System.IdentityModel.Tokens.Jwt": "7.7.1",
- "System.Security.Cryptography.Pkcs": "9.0.11"
+ "resolved": "7.0.2",
+ "contentHash": "zwv76lANFQQI6Gmp6ntkzMWIWVqm8Wf4Mz00AeGCk1n8HCi5afi6bNynSe18uI0xeL0n6J+Myjk9AiIsL5oSqw==",
+ "dependencies": {
+ "Microsoft.Bcl.Cryptography": "9.0.13",
+ "Microsoft.Data.SqlClient.Extensions.Abstractions": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.Internal.Logging": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.SNI.runtime": "[6.0.2, 7.0.0)",
+ "Microsoft.Extensions.Caching.Memory": "9.0.13",
+ "Microsoft.IdentityModel.JsonWebTokens": "8.16.0",
+ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "8.16.0",
+ "Microsoft.SqlServer.Server": "[1.0.0, 2.0.0)",
+ "System.Configuration.ConfigurationManager": "9.0.13",
+ "System.Security.Cryptography.Pkcs": "9.0.13"
}
},
"Microsoft.Data.SqlClient.SNI.runtime": {
diff --git a/Applications/DatabaseMigrator/test/DatabaseMigrator.Tests/packages.lock.json b/Applications/DatabaseMigrator/test/DatabaseMigrator.Tests/packages.lock.json
index e79e7d6cd6..efc571fe2c 100644
--- a/Applications/DatabaseMigrator/test/DatabaseMigrator.Tests/packages.lock.json
+++ b/Applications/DatabaseMigrator/test/DatabaseMigrator.Tests/packages.lock.json
@@ -38,6 +38,22 @@
"xunit.v3.core.mtp-v2": "[3.2.2]"
}
},
+ "Asp.Versioning.Abstractions": {
+ "type": "Transitive",
+ "resolved": "10.1.0",
+ "contentHash": "RwdgC5O0baZ4pt30pAKKPQHq2CV4unBKA4HWoTeu7NY9ZwXM0dWYGf1Ipc5GK0eFBe9cMeqz4pGpPncMz4/ZNQ==",
+ "dependencies": {
+ "Microsoft.Extensions.Primitives": "10.0.0"
+ }
+ },
+ "Asp.Versioning.Http": {
+ "type": "Transitive",
+ "resolved": "10.0.1",
+ "contentHash": "g0ayV/9ho3tGgooC6eF5p1063I1WzlxFJDYQrigcGnW+mLvui6eXrcW5hzTHhQREroUR3ZwXQrIN2SAIoi+KDw==",
+ "dependencies": {
+ "Asp.Versioning.Abstractions": "10.1.0"
+ }
+ },
"AWSSDK.Core": {
"type": "Transitive",
"resolved": "4.0.100.9",
@@ -66,16 +82,6 @@
"System.Memory.Data": "1.0.2"
}
},
- "Azure.Identity": {
- "type": "Transitive",
- "resolved": "1.17.1",
- "contentHash": "MSZkBrctcpiGxs9Cvr2VKKoN6qFLZlP3I6xuCWJ9iTgitI5Rgxtk5gfOSpXPZE3+CJmZ/mnqpQyGyjawFn5Vvg==",
- "dependencies": {
- "Azure.Core": "1.50.0",
- "Microsoft.Identity.Client": "4.78.0",
- "Microsoft.Identity.Client.Extensions.Msal": "4.78.0"
- }
- },
"Azure.Storage.Common": {
"type": "Transitive",
"resolved": "12.28.0",
@@ -357,22 +363,34 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
- "resolved": "6.1.4",
- "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==",
+ "resolved": "7.0.2",
+ "contentHash": "zwv76lANFQQI6Gmp6ntkzMWIWVqm8Wf4Mz00AeGCk1n8HCi5afi6bNynSe18uI0xeL0n6J+Myjk9AiIsL5oSqw==",
"dependencies": {
- "Azure.Core": "1.50.0",
- "Azure.Identity": "1.17.1",
- "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
- "Microsoft.Extensions.Caching.Memory": "9.0.11",
- "Microsoft.Identity.Client": "4.80.0",
- "Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
- "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
- "Microsoft.SqlServer.Server": "1.0.0",
- "System.Configuration.ConfigurationManager": "9.0.11",
- "System.IdentityModel.Tokens.Jwt": "7.7.1",
- "System.Security.Cryptography.Pkcs": "9.0.11"
+ "Microsoft.Bcl.Cryptography": "9.0.13",
+ "Microsoft.Data.SqlClient.Extensions.Abstractions": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.Internal.Logging": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.SNI.runtime": "[6.0.2, 7.0.0)",
+ "Microsoft.Extensions.Caching.Memory": "9.0.13",
+ "Microsoft.IdentityModel.JsonWebTokens": "8.16.0",
+ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "8.16.0",
+ "Microsoft.SqlServer.Server": "[1.0.0, 2.0.0)",
+ "System.Configuration.ConfigurationManager": "9.0.13",
+ "System.Security.Cryptography.Pkcs": "9.0.13"
}
},
+ "Microsoft.Data.SqlClient.Extensions.Abstractions": {
+ "type": "Transitive",
+ "resolved": "7.0.2",
+ "contentHash": "Zx7z61fG2Nc6LdDn4jA7b5Aj1ABrljkOPRE31RvVUdjF6IgbG60leDUhMCafsnWFgaheiK3iqpLe+kbf5Z5L8Q==",
+ "dependencies": {
+ "Microsoft.Data.SqlClient.Internal.Logging": "[7.0.2, 8.0.0)"
+ }
+ },
+ "Microsoft.Data.SqlClient.Internal.Logging": {
+ "type": "Transitive",
+ "resolved": "7.0.2",
+ "contentHash": "iqgYBbGSVy/DIYWjzmQOa964Kn4rs4wW5vg2IamqVK0fQqfTiILVR5hMK27XWqoyONtAZs+VxH354cPJBtSnbg=="
+ },
"Microsoft.Data.SqlClient.SNI.runtime": {
"type": "Transitive",
"resolved": "6.0.2",
@@ -429,6 +447,11 @@
"Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.10"
}
},
+ "Microsoft.Extensions.ApiDescription.Server": {
+ "type": "Transitive",
+ "resolved": "10.0.0",
+ "contentHash": "NCWCGiwRwje8773yzPQhvucYnnfeR+ZoB1VRIrIMp4uaeUNw7jvEPHij3HIbwCDuNCrNcphA00KSAR9yD9qmbg=="
+ },
"Microsoft.Extensions.Caching.Abstractions": {
"type": "Transitive",
"resolved": "10.0.10",
@@ -787,11 +810,11 @@
},
"Microsoft.IdentityModel.Protocols.OpenIdConnect": {
"type": "Transitive",
- "resolved": "7.7.1",
- "contentHash": "yT2Hdj8LpPbcT9C9KlLVxXl09C8zjFaVSaApdOwuecMuoV4s6Sof/mnTDz/+F/lILPIBvrWugR9CC7iRVZgbfQ==",
+ "resolved": "8.16.0",
+ "contentHash": "h4yVXyJsEBBX5lg2G5ftMsi5JzcNEGAzrNphA6DQ6eOd8P0s+cDCOyPwVTYLePZvJL5unbPvYIvzrbTXzFjXnQ==",
"dependencies": {
- "Microsoft.IdentityModel.Protocols": "7.7.1",
- "System.IdentityModel.Tokens.Jwt": "7.7.1"
+ "Microsoft.IdentityModel.Protocols": "8.16.0",
+ "System.IdentityModel.Tokens.Jwt": "8.16.0"
}
},
"Microsoft.IdentityModel.Tokens": {
@@ -804,6 +827,11 @@
"Microsoft.IdentityModel.Logging": "8.19.2"
}
},
+ "Microsoft.OpenApi": {
+ "type": "Transitive",
+ "resolved": "2.7.5",
+ "contentHash": "0FA67RSnRM4tcBKqiqVu/HPdZ9+QOKbmeRjxRUGTCjPU4C0bmUhd97Dso7Yild5P7nOV6GxJ2xrK0Kv/O9xp0w=="
+ },
"Microsoft.SqlServer.Server": {
"type": "Transitive",
"resolved": "1.0.0",
@@ -1056,6 +1084,26 @@
"OpenIddict.Validation": "7.6.0"
}
},
+ "OpenTelemetry": {
+ "type": "Transitive",
+ "resolved": "1.17.0",
+ "contentHash": "rMLOTftlMlTm7+MSrvXDHnJRjVkROFNKXHZrYjOsX+LankaFG7QSflx7qRRGjoqZoirohnxmJQ7GEb9occO4Gg==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration.EnvironmentVariables": "10.0.0",
+ "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.0",
+ "Microsoft.Extensions.Logging.Configuration": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
+ }
+ },
+ "OpenTelemetry.Api.ProviderBuilderExtensions": {
+ "type": "Transitive",
+ "resolved": "1.17.0",
+ "contentHash": "Xgc3Qf9B9TFMFpx6exTdGqMWuYIT2miNzkdMPutVvT9YuMFaEovXWke1Gb6z8NxYaQbbGF38vYLuSg1JCeui5Q==",
+ "dependencies": {
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0",
+ "OpenTelemetry.Api": "1.17.0"
+ }
+ },
"Polly.Core": {
"type": "Transitive",
"resolved": "8.7.0",
@@ -1157,6 +1205,27 @@
"SQLitePCLRaw.core": "2.1.11"
}
},
+ "Swashbuckle.AspNetCore.Swagger": {
+ "type": "Transitive",
+ "resolved": "10.2.3",
+ "contentHash": "1jUUs3WQnrS0FUtaZPLSy1yYMEwS1zlvDmvQ2/eldPHUANX0LJSLVZecCMgSMdeGiRqeaRrIXLtSz++TCiTMww==",
+ "dependencies": {
+ "Microsoft.OpenApi": "2.7.5"
+ }
+ },
+ "Swashbuckle.AspNetCore.SwaggerGen": {
+ "type": "Transitive",
+ "resolved": "10.2.3",
+ "contentHash": "y7t4coDRAeFYChmvlMRiH2OjbiRrm9AVIDgt17fQfs3x9PVAI5PiwWYOhg+4F13R4Q36WDc9lqfoOnNa3tNbGg==",
+ "dependencies": {
+ "Swashbuckle.AspNetCore.Swagger": "10.2.3"
+ }
+ },
+ "Swashbuckle.AspNetCore.SwaggerUI": {
+ "type": "Transitive",
+ "resolved": "10.2.3",
+ "contentHash": "nthWONRs/FJ4yyG206g1cC52WEG8EqrjuMWjGdR+5XG7lbjFto6NqcI9EMICgVFom/UivIjUVwI76ZHbHwTPfQ=="
+ },
"System.ClientModel": {
"type": "Transitive",
"resolved": "1.14.0",
@@ -1175,11 +1244,11 @@
},
"System.Configuration.ConfigurationManager": {
"type": "Transitive",
- "resolved": "9.0.11",
- "contentHash": "vPinosRgEk1CGjohbv0pDuz6gPprkWo5xvBTjOJjks5JOgOEWvPndq5NngGxiTcBcy1+k9GwzZ1c3Bp2fU5ezw==",
+ "resolved": "9.0.13",
+ "contentHash": "GbBrJq9S/gYpHzm7Pxx6Y5tDyfSfyxW6tlP5oiKJV38uf19Wp+GIIAnWfyL1zmNiz1+EjwVapw2WkBFvvqKQzg==",
"dependencies": {
- "System.Diagnostics.EventLog": "9.0.11",
- "System.Security.Cryptography.ProtectedData": "9.0.11"
+ "System.Diagnostics.EventLog": "9.0.13",
+ "System.Security.Cryptography.ProtectedData": "9.0.13"
}
},
"System.Diagnostics.EventLog": {
@@ -1189,11 +1258,11 @@
},
"System.IdentityModel.Tokens.Jwt": {
"type": "Transitive",
- "resolved": "7.7.1",
- "contentHash": "rQkO1YbAjLwnDJSMpRhRtrc6XwIcEOcUvoEcge+evurpzSZM3UNK+MZfD3sKyTlYsvknZ6eJjSBfnmXqwOsT9Q==",
+ "resolved": "8.16.0",
+ "contentHash": "rrs2u7DRMXQG2yh0oVyF/vLwosfRv20Ld2iEpYcKwQWXHjfV+gFXNQsQ9p008kR9Ou4pxBs68Q6/9zC8Gi1wjg==",
"dependencies": {
- "Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
- "Microsoft.IdentityModel.Tokens": "7.7.1"
+ "Microsoft.IdentityModel.JsonWebTokens": "8.16.0",
+ "Microsoft.IdentityModel.Tokens": "8.16.0"
}
},
"System.IO.Hashing": {
@@ -1226,8 +1295,8 @@
},
"System.Security.Cryptography.ProtectedData": {
"type": "Transitive",
- "resolved": "9.0.11",
- "contentHash": "s8yUYuYYu+PAwvBdhLG1KyrGrk9gkYeuPxfAsXsTqqWyepwSyEw8hAaflW4nO98NG52YpYI1am2+9o+79h2RtQ=="
+ "resolved": "9.0.13",
+ "contentHash": "t8S9IDpjJKsLpLkeBdW8cWtcPyYqrGu93Dej1RO6WwuL/lkFSqWlan3rMJfortqz1mRIh+sys2AFsSA6jWJ3Jg=="
},
"System.Security.Cryptography.Xml": {
"type": "Transitive",
@@ -1329,6 +1398,33 @@
"Backbone.AdminApi.Infrastructure": "[1.0.0, )"
}
},
+ "Backbone.BuildingBlocks.API": {
+ "type": "Project",
+ "dependencies": {
+ "Asp.Versioning.Mvc": "[10.0.1, 10.0.1]",
+ "Asp.Versioning.Mvc.ApiExplorer": "[10.0.1, 10.0.1]",
+ "Backbone.BuildingBlocks.Application": "[1.0.0, )",
+ "Backbone.BuildingBlocks.Module": "[1.0.0, )",
+ "Backbone.Modules.Devices.Domain": "[1.0.0, )",
+ "Backbone.Modules.Devices.Infrastructure": "[1.0.0, )",
+ "Backbone.Tooling": "[1.0.0, )",
+ "DotNetDiag.HealthChecks.NpgSql": "[10.0.10, 10.0.10]",
+ "DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
+ "Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
+ "Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
+ "OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
+ "OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
+ "Polly": "[8.7.0, 8.7.0]",
+ "Serilog.Enrichers.Sensitive": "[2.1.0, 2.1.0]",
+ "Serilog.Extensions.Hosting": "[10.0.0, 10.0.0]",
+ "Swashbuckle.AspNetCore": "[10.2.3, 10.2.3]",
+ "System.Data.SqlClient": "[4.9.1, 4.9.1]"
+ }
+ },
"Backbone.BuildingBlocks.Application": {
"type": "Project",
"dependencies": {
@@ -1380,11 +1476,21 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
}
},
+ "Backbone.BuildingBlocks.Module": {
+ "type": "Project",
+ "dependencies": {
+ "Backbone.BuildingBlocks.Application.Abstractions": "[1.0.0, )",
+ "Microsoft.Extensions.Configuration.Abstractions": "[10.0.10, 10.0.10]",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "[10.0.10, 10.0.10]",
+ "ReHackt.Extensions.Options.Validation": "[10.0.1, 10.0.1]"
+ }
+ },
"Backbone.Common.Infrastructure": {
"type": "Project",
"dependencies": {
@@ -1408,6 +1514,7 @@
"Autofac.Extensions.DependencyInjection": "[11.0.2, 11.0.2]",
"Backbone.AdminApi.Infrastructure.Database.Postgres": "[1.0.0, )",
"Backbone.AdminApi.Infrastructure.Database.SqlServer": "[1.0.0, )",
+ "Backbone.BuildingBlocks.API": "[1.0.0, )",
"Backbone.Modules.Announcements.Infrastructure": "[1.0.0, )",
"Backbone.Modules.Announcements.Infrastructure.Database.Postgres": "[1.0.0, )",
"Backbone.Modules.Announcements.Infrastructure.Database.SqlServer": "[1.0.0, )",
@@ -1872,6 +1979,24 @@
"Shouldly": "[4.3.0, 4.3.0]"
}
},
+ "Asp.Versioning.Mvc": {
+ "type": "CentralTransitive",
+ "requested": "[10.0.1, 10.0.1]",
+ "resolved": "10.0.1",
+ "contentHash": "OqoFPKKxXkNmw62H3CgXkPrf1L4PPwwyYr9QMP6itt/khKTIayqaHhK6F2e3jt6KHc4s23cWAUbu+Z5GPEeMaw==",
+ "dependencies": {
+ "Asp.Versioning.Http": "10.0.1"
+ }
+ },
+ "Asp.Versioning.Mvc.ApiExplorer": {
+ "type": "CentralTransitive",
+ "requested": "[10.0.1, 10.0.1]",
+ "resolved": "10.0.1",
+ "contentHash": "ylPZe+LheFp0pt2tSMq2pPeGAkMLqWVOn5+1/xOB/eUj889n9b35Sny08bSQ0ziAGIFjp3BBTXaYsWJjRoFV4A==",
+ "dependencies": {
+ "Asp.Versioning.Mvc": "10.0.1"
+ }
+ },
"Autofac": {
"type": "CentralTransitive",
"requested": "[9.3.2, 9.3.2]",
@@ -1936,6 +2061,26 @@
"resolved": "2.1.79",
"contentHash": "8YijbzgTfmqmQOnVNorYM6K++pxqnW3nJ4aC1sRHzxUA2CcuoJ9gsTem3kgBnPRMc38zZHl4Esb6hAezXIEEuw=="
},
+ "DotNetDiag.HealthChecks.NpgSql": {
+ "type": "CentralTransitive",
+ "requested": "[10.0.10, 10.0.10]",
+ "resolved": "10.0.10",
+ "contentHash": "lxb6wQ1YC/TpvZMVgbyeLP5dYOg/RJWLg1xlR+I0FeyfyMmukppKdwzBOrKRtZ8FHG3nV9xrVTaPdwRw0yL4Vw==",
+ "dependencies": {
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "10.0.9",
+ "Npgsql": "10.0.3"
+ }
+ },
+ "DotNetDiag.HealthChecks.SqlServer": {
+ "type": "CentralTransitive",
+ "requested": "[10.0.10, 10.0.10]",
+ "resolved": "10.0.10",
+ "contentHash": "6t2HP5VQR0GZDJiw8iZvzOTRC+84irUeaUuWvcqcnc4K5Mzrn/A9V0ucoyjySXOF1vGkdTHjlJMknJVYC9c2Hg==",
+ "dependencies": {
+ "Microsoft.Data.SqlClient": "7.0.2",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "10.0.9"
+ }
+ },
"EFCore.BulkExtensions.Core": {
"type": "CentralTransitive",
"requested": "[10.0.1, 10.0.1]",
@@ -2373,6 +2518,71 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
+ "dependencies": {
+ "OpenTelemetry": "1.17.0"
+ }
+ },
+ "OpenTelemetry.Extensions.Hosting": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, 1.17.0]",
+ "resolved": "1.17.0",
+ "contentHash": "t1OwL/4qgboGMobYVT+UV5zgWnFqCp4Pw8lcsmzh8m2K8PQsTKkyxrC32tqYTMYny3GOW4q5cltE3dTVzLmRew==",
+ "dependencies": {
+ "Microsoft.Extensions.Hosting.Abstractions": "10.0.0",
+ "OpenTelemetry": "1.17.0"
+ }
+ },
+ "OpenTelemetry.Instrumentation.AspNetCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, 1.17.0]",
+ "resolved": "1.17.0",
+ "contentHash": "rGbmk1vuy1kvgZmE0ps7Vb99YZvDap6AalrrF60FwnNit1uW/PbeFZj1cpb0T8MPkYmjhBrRJ1/JB6QqXkRjHA==",
+ "dependencies": {
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
+ "OpenTelemetry.Instrumentation.Http": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, 1.17.0]",
+ "resolved": "1.17.0",
+ "contentHash": "uTwVtxIJ/xB96wGYTaDsbkJVeCFdUxTwvrlDUn2YJixy0UuKc8DvQMzwKNJMTzNFiiyYO9c40id6tUHTmWs33A==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
+ "OpenTelemetry.Instrumentation.Runtime": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, 1.17.0]",
+ "resolved": "1.17.0",
+ "contentHash": "HyYenisDn/xdtyVXdjImsCl+RNC2gq01N0rvSR7tsYAylXR2sxX/YgMsyTajMXA27+r1vB7lNU8cWRhV0fwL+Q==",
+ "dependencies": {
+ "OpenTelemetry.Api": "[1.17.0, 2.0.0)"
+ }
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
@@ -2407,6 +2617,12 @@
"resolved": "4.4.0",
"contentHash": "ZC6Le3rr4TVJJjS4KsQAesxeF1EhW9qcZmmG7eP5Y2G3+gTGkJEUXkq4+tZNPtyp05I0wWOxnIjwtxFweJsObw=="
},
+ "Serilog.Enrichers.Sensitive": {
+ "type": "CentralTransitive",
+ "requested": "[2.1.0, 2.1.0]",
+ "resolved": "2.1.0",
+ "contentHash": "nlaEYMoHjJqncjQgc0Nv4LOIkAwUt4Nvmx3EMNjY4MKC7QqZs9zB0v/NwFnaWzLF7qztc7mna1bjn20Auohu0g=="
+ },
"Serilog.Exceptions": {
"type": "CentralTransitive",
"requested": "[8.4.0, 8.4.0]",
@@ -2521,6 +2737,18 @@
"Microsoft.Extensions.Logging.Abstractions": "8.0.3"
}
},
+ "Swashbuckle.AspNetCore": {
+ "type": "CentralTransitive",
+ "requested": "[10.2.3, 10.2.3]",
+ "resolved": "10.2.3",
+ "contentHash": "8KNh1RWvofdU6DVLyBs4Z/OpUMnmf8oNvJQc0QxpwySRbi42bwLfdVMMrXZWANg5U5KQGQq1xW6r/hlcqw99tQ==",
+ "dependencies": {
+ "Microsoft.Extensions.ApiDescription.Server": "10.0.0",
+ "Swashbuckle.AspNetCore.Swagger": "10.2.3",
+ "Swashbuckle.AspNetCore.SwaggerGen": "10.2.3",
+ "Swashbuckle.AspNetCore.SwaggerUI": "10.2.3"
+ }
+ },
"System.Data.SqlClient": {
"type": "CentralTransitive",
"requested": "[4.9.1, 4.9.1]",
@@ -2539,20 +2767,19 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
- "resolved": "6.1.4",
- "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==",
+ "resolved": "7.0.2",
+ "contentHash": "zwv76lANFQQI6Gmp6ntkzMWIWVqm8Wf4Mz00AeGCk1n8HCi5afi6bNynSe18uI0xeL0n6J+Myjk9AiIsL5oSqw==",
"dependencies": {
- "Azure.Core": "1.50.0",
- "Azure.Identity": "1.17.1",
- "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
- "Microsoft.Extensions.Caching.Memory": "9.0.11",
- "Microsoft.Identity.Client": "4.80.0",
- "Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
- "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
- "Microsoft.SqlServer.Server": "1.0.0",
- "System.Configuration.ConfigurationManager": "9.0.11",
- "System.IdentityModel.Tokens.Jwt": "7.7.1",
- "System.Security.Cryptography.Pkcs": "9.0.11"
+ "Microsoft.Bcl.Cryptography": "9.0.13",
+ "Microsoft.Data.SqlClient.Extensions.Abstractions": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.Internal.Logging": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.SNI.runtime": "[6.0.2, 7.0.0)",
+ "Microsoft.Extensions.Caching.Memory": "9.0.13",
+ "Microsoft.IdentityModel.JsonWebTokens": "8.16.0",
+ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "8.16.0",
+ "Microsoft.SqlServer.Server": "[1.0.0, 2.0.0)",
+ "System.Configuration.ConfigurationManager": "9.0.13",
+ "System.Security.Cryptography.Pkcs": "9.0.13"
}
},
"Microsoft.Data.SqlClient.SNI.runtime": {
@@ -2630,20 +2857,19 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
- "resolved": "6.1.4",
- "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==",
+ "resolved": "7.0.2",
+ "contentHash": "zwv76lANFQQI6Gmp6ntkzMWIWVqm8Wf4Mz00AeGCk1n8HCi5afi6bNynSe18uI0xeL0n6J+Myjk9AiIsL5oSqw==",
"dependencies": {
- "Azure.Core": "1.50.0",
- "Azure.Identity": "1.17.1",
- "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
- "Microsoft.Extensions.Caching.Memory": "9.0.11",
- "Microsoft.Identity.Client": "4.80.0",
- "Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
- "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
- "Microsoft.SqlServer.Server": "1.0.0",
- "System.Configuration.ConfigurationManager": "9.0.11",
- "System.IdentityModel.Tokens.Jwt": "7.7.1",
- "System.Security.Cryptography.Pkcs": "9.0.11"
+ "Microsoft.Bcl.Cryptography": "9.0.13",
+ "Microsoft.Data.SqlClient.Extensions.Abstractions": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.Internal.Logging": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.SNI.runtime": "[6.0.2, 7.0.0)",
+ "Microsoft.Extensions.Caching.Memory": "9.0.13",
+ "Microsoft.IdentityModel.JsonWebTokens": "8.16.0",
+ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "8.16.0",
+ "Microsoft.SqlServer.Server": "[1.0.0, 2.0.0)",
+ "System.Configuration.ConfigurationManager": "9.0.13",
+ "System.Security.Cryptography.Pkcs": "9.0.13"
}
},
"Microsoft.Data.SqlClient.SNI.runtime": {
@@ -2721,20 +2947,19 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
- "resolved": "6.1.4",
- "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==",
+ "resolved": "7.0.2",
+ "contentHash": "zwv76lANFQQI6Gmp6ntkzMWIWVqm8Wf4Mz00AeGCk1n8HCi5afi6bNynSe18uI0xeL0n6J+Myjk9AiIsL5oSqw==",
"dependencies": {
- "Azure.Core": "1.50.0",
- "Azure.Identity": "1.17.1",
- "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
- "Microsoft.Extensions.Caching.Memory": "9.0.11",
- "Microsoft.Identity.Client": "4.80.0",
- "Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
- "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
- "Microsoft.SqlServer.Server": "1.0.0",
- "System.Configuration.ConfigurationManager": "9.0.11",
- "System.IdentityModel.Tokens.Jwt": "7.7.1",
- "System.Security.Cryptography.Pkcs": "9.0.11"
+ "Microsoft.Bcl.Cryptography": "9.0.13",
+ "Microsoft.Data.SqlClient.Extensions.Abstractions": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.Internal.Logging": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.SNI.runtime": "[6.0.2, 7.0.0)",
+ "Microsoft.Extensions.Caching.Memory": "9.0.13",
+ "Microsoft.IdentityModel.JsonWebTokens": "8.16.0",
+ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "8.16.0",
+ "Microsoft.SqlServer.Server": "[1.0.0, 2.0.0)",
+ "System.Configuration.ConfigurationManager": "9.0.13",
+ "System.Security.Cryptography.Pkcs": "9.0.13"
}
},
"Microsoft.Data.SqlClient.SNI.runtime": {
@@ -2812,20 +3037,19 @@
},
"Microsoft.Data.SqlClient": {
"type": "Transitive",
- "resolved": "6.1.4",
- "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==",
- "dependencies": {
- "Azure.Core": "1.50.0",
- "Azure.Identity": "1.17.1",
- "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
- "Microsoft.Extensions.Caching.Memory": "9.0.11",
- "Microsoft.Identity.Client": "4.80.0",
- "Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
- "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
- "Microsoft.SqlServer.Server": "1.0.0",
- "System.Configuration.ConfigurationManager": "9.0.11",
- "System.IdentityModel.Tokens.Jwt": "7.7.1",
- "System.Security.Cryptography.Pkcs": "9.0.11"
+ "resolved": "7.0.2",
+ "contentHash": "zwv76lANFQQI6Gmp6ntkzMWIWVqm8Wf4Mz00AeGCk1n8HCi5afi6bNynSe18uI0xeL0n6J+Myjk9AiIsL5oSqw==",
+ "dependencies": {
+ "Microsoft.Bcl.Cryptography": "9.0.13",
+ "Microsoft.Data.SqlClient.Extensions.Abstractions": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.Internal.Logging": "[7.0.2, 8.0.0)",
+ "Microsoft.Data.SqlClient.SNI.runtime": "[6.0.2, 7.0.0)",
+ "Microsoft.Extensions.Caching.Memory": "9.0.13",
+ "Microsoft.IdentityModel.JsonWebTokens": "8.16.0",
+ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "8.16.0",
+ "Microsoft.SqlServer.Server": "[1.0.0, 2.0.0)",
+ "System.Configuration.ConfigurationManager": "9.0.13",
+ "System.Security.Cryptography.Pkcs": "9.0.13"
}
},
"Microsoft.Data.SqlClient.SNI.runtime": {
diff --git a/Applications/EventHandlerService/src/EventHandlerService/EventHandlerService.csproj b/Applications/EventHandlerService/src/EventHandlerService/EventHandlerService.csproj
index acffc08337..a145b29401 100644
--- a/Applications/EventHandlerService/src/EventHandlerService/EventHandlerService.csproj
+++ b/Applications/EventHandlerService/src/EventHandlerService/EventHandlerService.csproj
@@ -8,7 +8,6 @@
-
diff --git a/Applications/EventHandlerService/src/EventHandlerService/EventHandlerServiceConfiguration.cs b/Applications/EventHandlerService/src/EventHandlerService/EventHandlerServiceConfiguration.cs
index 7b90a16287..359e861192 100644
--- a/Applications/EventHandlerService/src/EventHandlerService/EventHandlerServiceConfiguration.cs
+++ b/Applications/EventHandlerService/src/EventHandlerService/EventHandlerServiceConfiguration.cs
@@ -1,14 +1,23 @@
using System.ComponentModel.DataAnnotations;
+using Backbone.BuildingBlocks.API.Extensions;
using Backbone.BuildingBlocks.Infrastructure.EventBus;
namespace Backbone.EventHandlerService;
public class EventHandlerServiceConfiguration
{
+ [Required]
+ public required TelemetryConfiguration Telemetry { get; init; }
+
[Required]
public required InfrastructureConfiguration Infrastructure { get; init; }
}
+public class TelemetryConfiguration
+{
+ public required OpenTelemetryCollectorConfiguration OpenTelemetryCollector { get; set; } = new();
+}
+
public class InfrastructureConfiguration
{
[Required]
diff --git a/Applications/EventHandlerService/src/EventHandlerService/Program.cs b/Applications/EventHandlerService/src/EventHandlerService/Program.cs
index 41ec4b93e7..e7a46128bf 100644
--- a/Applications/EventHandlerService/src/EventHandlerService/Program.cs
+++ b/Applications/EventHandlerService/src/EventHandlerService/Program.cs
@@ -1,4 +1,5 @@
-using Autofac.Extensions.DependencyInjection;
+using System.Reflection;
+using Autofac.Extensions.DependencyInjection;
using Backbone.BuildingBlocks.API.Extensions;
using Backbone.BuildingBlocks.API.Serilog;
using Backbone.BuildingBlocks.Infrastructure.EventBus;
@@ -13,7 +14,6 @@
using Backbone.Modules.Tokens.Application;
using Backbone.Modules.Tokens.Module;
using Microsoft.Extensions.Options;
-using OpenTelemetry.Metrics;
using Serilog;
using Serilog.Enrichers.Sensitive;
using Serilog.Exceptions;
@@ -21,7 +21,6 @@
using Serilog.Exceptions.EntityFrameworkCore.Destructurers;
using Serilog.Settings.Configuration;
using InfrastructureConfiguration = Backbone.Modules.Quotas.Infrastructure.InfrastructureConfiguration;
-using OpenTelemetrySdk = OpenTelemetry.Sdk;
Log.Logger = new LoggerConfiguration()
.WriteTo.Console()
@@ -36,20 +35,8 @@
Log.Information("App created.");
Log.Information("Starting app...");
- var meterProvider = OpenTelemetrySdk.CreateMeterProviderBuilder()
- .AddMeter(METER_NAME)
- .AddMeter("Microsoft.EntityFrameworkCore")
- .AddPrometheusHttpListener(options =>
- {
- var host = Environment.GetEnvironmentVariable("METRICS_HOST") ?? "localhost";
- options.UriPrefixes = [$"http://{host}:9444/"];
- })
- .Build();
-
await app.Build().RunAsync();
- meterProvider.Dispose();
-
return 0;
}
catch (Exception ex)
@@ -69,7 +56,6 @@ static IHostBuilder CreateHostBuilder(string[] args)
.ConfigureAppConfiguration((hostContext, configuration) =>
{
configuration.Sources.Clear();
- var env = hostContext.HostingEnvironment;
configuration
.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
@@ -88,6 +74,8 @@ static IHostBuilder CreateHostBuilder(string[] args)
services.BuildServiceProvider().GetRequiredService>().Value;
#pragma warning restore ASP0000
+ services.AddOpenTelemetry(METER_NAME, Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "unknown", parsedConfiguration.Telemetry.OpenTelemetryCollector);
+
services.AddTransient();
services
@@ -108,13 +96,13 @@ static IHostBuilder CreateHostBuilder(string[] args)
})
.UseServiceProviderFactory(new AutofacServiceProviderFactory())
.UseSerilog((context, configuration) => configuration
- .ReadFrom.Configuration(context.Configuration, new ConfigurationReaderOptions { SectionName = "Logging" })
+ .ReadFrom.Configuration(context.Configuration, new ConfigurationReaderOptions { SectionName = "Telemetry:Logging" })
.Enrich.FromLogContext()
- .Enrich.WithProperty("service", "eventHandlerService")
.Enrich.WithExceptionDetails(new DestructuringOptionsBuilder()
.WithDefaultDestructurers()
.WithDestructurers([new DbUpdateExceptionDestructurer()]))
- .Enrich.WithSensitiveDataMasking(options => options.AddSensitiveDataMasks()), preserveStaticLogger: true
+ .Enrich.WithSensitiveDataMasking(options => options.AddSensitiveDataMasks()),
+ writeToProviders: true
);
}
diff --git a/Applications/EventHandlerService/src/EventHandlerService/appsettings.json b/Applications/EventHandlerService/src/EventHandlerService/appsettings.json
index 4ba48a4ddd..1d59d85bf3 100644
--- a/Applications/EventHandlerService/src/EventHandlerService/appsettings.json
+++ b/Applications/EventHandlerService/src/EventHandlerService/appsettings.json
@@ -29,19 +29,21 @@
}
}
},
- "Logging": {
- "MinimumLevel": {
- "Default": "Warning",
- "Override": {
- "Backbone": "Information",
- "Azure.Messaging.ServiceBus": "Error"
- }
- },
- "WriteTo": {
- "Console": {
- "Name": "Console",
- "Args": {
- "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ "Telemetry": {
+ "Logging": {
+ "MinimumLevel": {
+ "Default": "Warning",
+ "Override": {
+ "Backbone": "Information",
+ "Azure.Messaging.ServiceBus": "Error"
+ }
+ },
+ "WriteTo": {
+ "Console": {
+ "Name": "Console",
+ "Args": {
+ "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ }
}
}
}
diff --git a/Applications/EventHandlerService/src/EventHandlerService/packages.lock.json b/Applications/EventHandlerService/src/EventHandlerService/packages.lock.json
index 2e7fa7fc59..be6f317816 100644
--- a/Applications/EventHandlerService/src/EventHandlerService/packages.lock.json
+++ b/Applications/EventHandlerService/src/EventHandlerService/packages.lock.json
@@ -12,15 +12,6 @@
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9"
}
},
- "OpenTelemetry.Exporter.Prometheus.HttpListener": {
- "type": "Direct",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "Ppwr0l7X4AbZ2+b1XaZzl+I1196MtA+kelsdHF7QutoOtgdY7Mx0RAFMV7dKYCIRsOumfYaOb8U/Hkkft5HLrQ==",
- "dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
- }
- },
"Serilog.Enrichers.Sensitive": {
"type": "Direct",
"requested": "[2.1.0, 2.1.0]",
@@ -996,11 +987,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1209,9 +1195,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1272,6 +1259,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -2280,13 +2268,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -2308,6 +2302,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Applications/EventHandlerService/test/EventHandlerService.Tests/packages.lock.json b/Applications/EventHandlerService/test/EventHandlerService.Tests/packages.lock.json
index 053004b83e..ca0649b169 100644
--- a/Applications/EventHandlerService/test/EventHandlerService.Tests/packages.lock.json
+++ b/Applications/EventHandlerService/test/EventHandlerService.Tests/packages.lock.json
@@ -1034,11 +1034,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1321,9 +1316,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1384,6 +1380,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1435,7 +1432,6 @@
"Backbone.Modules.Relationships.Module": "[1.0.0, )",
"Backbone.Modules.Synchronization.Module": "[1.0.0, )",
"Backbone.Modules.Tokens.Module": "[1.0.0, )",
- "OpenTelemetry.Exporter.Prometheus.HttpListener": "[1.11.2-beta.1, 1.11.2-beta.1]",
"Serilog.Enrichers.Sensitive": "[2.1.0, 2.1.0]",
"Serilog.Exceptions": "[8.4.0, 8.4.0]",
"Serilog.Exceptions.EntityFrameworkCore": "[8.4.0, 8.4.0]",
@@ -2454,22 +2450,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
- "dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
- }
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
},
- "OpenTelemetry.Exporter.Prometheus.HttpListener": {
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "Ppwr0l7X4AbZ2+b1XaZzl+I1196MtA+kelsdHF7QutoOtgdY7Mx0RAFMV7dKYCIRsOumfYaOb8U/Hkkft5HLrQ==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -2491,6 +2484,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Applications/Housekeeper/src/Housekeeper/Configuration.cs b/Applications/Housekeeper/src/Housekeeper/Configuration.cs
index de8e2704f6..4d6ddc9167 100644
--- a/Applications/Housekeeper/src/Housekeeper/Configuration.cs
+++ b/Applications/Housekeeper/src/Housekeeper/Configuration.cs
@@ -1,13 +1,22 @@
using System.ComponentModel.DataAnnotations;
+using Backbone.BuildingBlocks.API.Extensions;
using Backbone.BuildingBlocks.Infrastructure.EventBus;
namespace Backbone.Housekeeper;
public class Configuration
{
+ [Required]
+ public required TelemetryConfiguration Telemetry { get; init; }
+
[Required]
public required InfrastructureConfiguration Infrastructure { get; init; }
+ public class TelemetryConfiguration
+ {
+ public required OpenTelemetryCollectorConfiguration OpenTelemetryCollector { get; set; } = new();
+ }
+
public class InfrastructureConfiguration
{
[Required]
diff --git a/Applications/Housekeeper/src/Housekeeper/Executor.cs b/Applications/Housekeeper/src/Housekeeper/Executor.cs
index a1e2b3d4d1..0fdfd7d6b2 100644
--- a/Applications/Housekeeper/src/Housekeeper/Executor.cs
+++ b/Applications/Housekeeper/src/Housekeeper/Executor.cs
@@ -1,4 +1,5 @@
using System.Diagnostics;
+using Backbone.BuildingBlocks.Application.Housekeeping;
using MediatR;
using ExecuteAnnouncementsModuleHousekeepingCommand = Backbone.Modules.Announcements.Application.Announcements.Commands.ExecuteHousekeeping.ExecuteHousekeepingCommand;
using ExecuteChallengesModuleHousekeepingCommand = Backbone.Modules.Challenges.Application.Challenges.Commands.ExecuteHousekeeping.ExecuteHousekeepingCommand;
@@ -13,46 +14,45 @@ namespace Backbone.Housekeeper;
public class Executor
{
private readonly IMediator _mediator;
- private readonly ILogger _logger;
- public Executor(IMediator mediator, ILogger logger)
+ public Executor(IMediator mediator)
{
_mediator = mediator;
- _logger = logger;
}
public async Task Execute(CancellationToken cancellationToken)
{
- _logger.StartingDeletion();
- var stopwatch = Stopwatch.StartNew();
+ using var activity = StartHousekeeperActivity();
+
+ try
+ {
+ await HousekeepingTelemetry.TrackModuleDeletion("Announcements", ct => _mediator.Send(new ExecuteAnnouncementsModuleHousekeepingCommand(), ct), cancellationToken);
+ await HousekeepingTelemetry.TrackModuleDeletion("Challenges", ct => _mediator.Send(new ExecuteChallengesModuleHousekeepingCommand(), ct), cancellationToken);
+ await HousekeepingTelemetry.TrackModuleDeletion("Devices", ct => _mediator.Send(new ExecuteDevicesModuleHousekeepingCommand(), ct), cancellationToken);
+ await HousekeepingTelemetry.TrackModuleDeletion("Files", ct => _mediator.Send(new ExecuteFilesModuleHousekeepingCommand(), ct), cancellationToken);
+ await HousekeepingTelemetry.TrackModuleDeletion("Relationships", ct => _mediator.Send(new ExecuteRelationshipsModuleHousekeepingCommand(), ct), cancellationToken);
+ await HousekeepingTelemetry.TrackModuleDeletion("Synchronization", ct => _mediator.Send(new ExecuteSynchronizationModuleHousekeepingCommand(), ct), cancellationToken);
+ await HousekeepingTelemetry.TrackModuleDeletion("Tokens", ct => _mediator.Send(new ExecuteTokensModuleHousekeepingCommand(), ct), cancellationToken);
+ }
+ catch (Exception ex)
+ {
+ activity?.AddException(ex);
+ activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
+ throw;
+ }
+ }
- await _mediator.Send(new ExecuteAnnouncementsModuleHousekeepingCommand(), cancellationToken);
- await _mediator.Send(new ExecuteChallengesModuleHousekeepingCommand(), cancellationToken);
- await _mediator.Send(new ExecuteDevicesModuleHousekeepingCommand(), cancellationToken);
- await _mediator.Send(new ExecuteFilesModuleHousekeepingCommand(), cancellationToken);
- await _mediator.Send(new ExecuteRelationshipsModuleHousekeepingCommand(), cancellationToken);
- await _mediator.Send(new ExecuteSynchronizationModuleHousekeepingCommand(), cancellationToken);
- await _mediator.Send(new ExecuteTokensModuleHousekeepingCommand(), cancellationToken);
+ private static Activity? StartHousekeeperActivity()
+ {
+ // ReSharper disable once ExplicitCallerInfoArgument
+ var activity = HousekeepingTelemetry.ACTIVITY_SOURCE.StartActivity("housekeeper_run");
- stopwatch.Stop();
+ if (activity == null)
+ return null;
- _logger.DeletionCompleted(stopwatch.ElapsedMilliseconds);
- }
-}
+ activity.SetTag("housekeeping.trace_id", activity.TraceId.ToString());
+ activity.SetTag("housekeeper.operation", "job_run");
-internal static partial class ExecutorLogs
-{
- [LoggerMessage(
- EventId = 468524,
- EventName = "Housekeeper.Executor.StartingDeletion",
- Level = LogLevel.Information,
- Message = "Starting deletion...")]
- public static partial void StartingDeletion(this ILogger logger);
-
- [LoggerMessage(
- EventId = 945132,
- EventName = "Housekeeper.Executor.DeletionCompleted",
- Level = LogLevel.Information,
- Message = "Deletion completed after {elapsedMilliseconds}ms.")]
- public static partial void DeletionCompleted(this ILogger logger, long elapsedMilliseconds);
+ return activity;
+ }
}
diff --git a/Applications/Housekeeper/src/Housekeeper/Program.cs b/Applications/Housekeeper/src/Housekeeper/Program.cs
index d2e0bd7777..ee994afbdd 100644
--- a/Applications/Housekeeper/src/Housekeeper/Program.cs
+++ b/Applications/Housekeeper/src/Housekeeper/Program.cs
@@ -1,5 +1,7 @@
-using Autofac.Extensions.DependencyInjection;
+using System.Reflection;
+using Autofac.Extensions.DependencyInjection;
using Backbone.BuildingBlocks.API.Extensions;
+using Backbone.BuildingBlocks.Application.Housekeeping;
using Backbone.BuildingBlocks.Application.QuotaCheck;
using Backbone.BuildingBlocks.Infrastructure.EventBus;
using Backbone.Housekeeper;
@@ -23,68 +25,86 @@
.WriteTo.Console()
.CreateBootstrapLogger();
-var app = CreateHostBuilder(args).Build();
+using var host = CreateHostBuilder(args).Build();
-await app.Services.GetRequiredService().Execute(CancellationToken.None);
-return;
+try
+{
+ await host.StartAsync();
+
+ await host.Services.GetRequiredService().Execute(CancellationToken.None);
+
+ return 0;
+}
+catch (Exception ex)
+{
+ Log.Fatal(ex, "There was an error while executing the housekeeper.");
+ return 1;
+}
+finally
+{
+ await host.StopAsync();
+}
-static IHostBuilder CreateHostBuilder(string[] args)
+static HostApplicationBuilder CreateHostBuilder(string[] args)
{
- return Host.CreateDefaultBuilder(args)
- .ConfigureAppConfiguration((hostContext, configuration) =>
- {
- configuration.Sources.Clear();
- var env = hostContext.HostingEnvironment;
-
- configuration
- .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
- .AddJsonFile("appsettings.override.json", optional: true, reloadOnChange: false);
-
- configuration.AddEnvironmentVariables();
- configuration.AddCommandLine(args);
- })
- .ConfigureServices((hostContext, services) =>
- {
- var configuration = hostContext.Configuration;
-
- services.ConfigureAndValidate(configuration.Bind);
-
- services.AddLogging();
-
- services
- .AddModule(configuration)
- .AddModule(configuration)
- .AddModule(configuration)
- .AddModule(configuration)
- .AddModule(configuration)
- .AddModule(configuration)
- .AddModule(configuration);
-
- var parsedConfiguration = services.BuildServiceProvider().GetRequiredService>().Value;
-
- services.AddCustomOpenIddict();
-
- services.AddCustomIdentity(hostContext.HostingEnvironment);
-
- services.AddSingleton();
-
- services.AddTransient();
-
- services.AddEventBus(parsedConfiguration.Infrastructure.EventBus, METER_NAME);
- })
- .UseServiceProviderFactory(new AutofacServiceProviderFactory())
- .UseSerilog((context, configuration) => configuration
- .ReadFrom.Configuration(context.Configuration, new ConfigurationReaderOptions { SectionName = "Logging" })
- .Enrich.FromLogContext()
- .Enrich.WithProperty("service", "housekeeper")
- .Enrich.WithExceptionDetails(new DestructuringOptionsBuilder()
- .WithDefaultDestructurers()
- .WithDestructurers([new DbUpdateExceptionDestructurer()])
- ), preserveStaticLogger: true
- );
+ var builder = Host.CreateApplicationBuilder(args);
+ builder.ConfigureContainer(new AutofacServiceProviderFactory());
+
+ var configuration = builder.Configuration;
+ var services = builder.Services;
+
+ // Configure Configuration
+ builder.Configuration.Sources.Clear();
+ builder.Configuration
+ .AddJsonFile("appsettings.json", optional: true)
+ .AddJsonFile("appsettings.override.json", optional: true);
+ builder.Configuration.AddEnvironmentVariables();
+ builder.Configuration.AddCommandLine(args);
+
+ // Configure Services
+ services.Configure(options => { options.SuppressStatusMessages = true; });
+
+ services.ConfigureAndValidate(configuration.Bind);
+
+ services.AddLogging();
+
+ services
+ .AddModule(configuration)
+ .AddModule(configuration)
+ .AddModule(configuration)
+ .AddModule(configuration)
+ .AddModule(configuration)
+ .AddModule(configuration)
+ .AddModule(configuration);
+
+ var parsedConfiguration = services.BuildServiceProvider().GetRequiredService>().Value;
+
+ services.AddCustomOpenIddict();
+
+ services.AddCustomIdentity(builder.Environment);
+
+ services.AddSingleton();
+
+ services.AddTransient();
+
+ services.AddOpenTelemetry(METER_NAME, Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "unknown", parsedConfiguration.Telemetry.OpenTelemetryCollector,
+ HousekeepingTelemetry.ACTIVITY_SOURCE_NAME);
+
+ services.AddEventBus(parsedConfiguration.Infrastructure.EventBus, METER_NAME);
+
+ services.AddSerilog(configuration => configuration
+ .ReadFrom.Configuration(builder.Configuration, new ConfigurationReaderOptions { SectionName = "Telemetry:Logging" })
+ .Enrich.FromLogContext()
+ .Enrich.WithExceptionDetails(new DestructuringOptionsBuilder()
+ .WithDefaultDestructurers()
+ .WithDestructurers([new DbUpdateExceptionDestructurer()])
+ ), preserveStaticLogger: true
+ );
+
+ return builder;
}
public partial class Program
diff --git a/Applications/Housekeeper/src/Housekeeper/appsettings.json b/Applications/Housekeeper/src/Housekeeper/appsettings.json
index ea3baf0d94..063d1d17d5 100644
--- a/Applications/Housekeeper/src/Housekeeper/appsettings.json
+++ b/Applications/Housekeeper/src/Housekeeper/appsettings.json
@@ -25,22 +25,23 @@
}
}
},
- "Logging": {
- "MinimumLevel": {
- "Default": "Warning",
- "Override": {
- "Backbone": "Information",
- "Azure.Messaging.ServiceBus": "Error"
- }
- },
- "WriteTo": {
- "Console": {
- "Name": "Console",
- "Args": {
- "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ "Telemetry": {
+ "Logging": {
+ "MinimumLevel": {
+ "Default": "Warning",
+ "Override": {
+ "Backbone": "Information",
+ "Azure.Messaging.ServiceBus": "Error"
+ }
+ },
+ "WriteTo": {
+ "Console": {
+ "Name": "Console",
+ "Args": {
+ "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ }
}
}
}
}
}
-
diff --git a/Applications/Housekeeper/src/Housekeeper/packages.lock.json b/Applications/Housekeeper/src/Housekeeper/packages.lock.json
index f9d89de4b5..64b4ce3e3a 100644
--- a/Applications/Housekeeper/src/Housekeeper/packages.lock.json
+++ b/Applications/Housekeeper/src/Housekeeper/packages.lock.json
@@ -1180,11 +1180,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1459,9 +1454,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1522,6 +1518,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -2513,13 +2510,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -2541,6 +2544,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/IdentityDeletionJobConfiguration.cs b/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/IdentityDeletionJobConfiguration.cs
index 382bb26b4b..ed6f358a11 100644
--- a/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/IdentityDeletionJobConfiguration.cs
+++ b/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/IdentityDeletionJobConfiguration.cs
@@ -1,10 +1,14 @@
using System.ComponentModel.DataAnnotations;
+using Backbone.BuildingBlocks.API.Extensions;
using Backbone.BuildingBlocks.Infrastructure.EventBus;
namespace Backbone.Job.IdentityDeletion;
public class IdentityDeletionJobConfiguration
{
+ [Required]
+ public required TelemetryConfiguration Telemetry { get; init; }
+
[Required]
public required InfrastructureConfiguration Infrastructure { get; init; }
@@ -17,3 +21,8 @@ public class InfrastructureConfiguration
[Required]
public required EventBusConfiguration EventBus { get; init; }
}
+
+public class TelemetryConfiguration
+{
+ public required OpenTelemetryCollectorConfiguration OpenTelemetryCollector { get; set; } = new();
+}
diff --git a/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Program.cs b/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Program.cs
index 42de790e16..3a6b9714f4 100644
--- a/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Program.cs
+++ b/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Program.cs
@@ -107,11 +107,13 @@ public static IHostBuilder CreateHostBuilder(string[] args)
services.RegisterIdentityDeleters();
+ services.AddOpenTelemetry(METER_NAME, Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "unknown", parsedConfiguration.Telemetry.OpenTelemetryCollector);
+
services.AddEventBus(parsedConfiguration.Infrastructure.EventBus, METER_NAME);
})
.UseServiceProviderFactory(new AutofacServiceProviderFactory())
.UseSerilog((context, configuration) => configuration
- .ReadFrom.Configuration(context.Configuration, new ConfigurationReaderOptions { SectionName = "Logging" })
+ .ReadFrom.Configuration(context.Configuration, new ConfigurationReaderOptions { SectionName = "Telemetry:Logging" })
.Enrich.FromLogContext()
.Enrich.WithProperty("service", "jobs.identitydeletion")
.Enrich.WithExceptionDetails(new DestructuringOptionsBuilder()
diff --git a/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/appsettings.json b/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/appsettings.json
index 4ba48a4ddd..1d59d85bf3 100644
--- a/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/appsettings.json
+++ b/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/appsettings.json
@@ -29,19 +29,21 @@
}
}
},
- "Logging": {
- "MinimumLevel": {
- "Default": "Warning",
- "Override": {
- "Backbone": "Information",
- "Azure.Messaging.ServiceBus": "Error"
- }
- },
- "WriteTo": {
- "Console": {
- "Name": "Console",
- "Args": {
- "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ "Telemetry": {
+ "Logging": {
+ "MinimumLevel": {
+ "Default": "Warning",
+ "Override": {
+ "Backbone": "Information",
+ "Azure.Messaging.ServiceBus": "Error"
+ }
+ },
+ "WriteTo": {
+ "Console": {
+ "Name": "Console",
+ "Args": {
+ "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ }
}
}
}
diff --git a/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/packages.lock.json b/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/packages.lock.json
index 08664ee13e..a3252482ac 100644
--- a/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/packages.lock.json
+++ b/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/packages.lock.json
@@ -981,11 +981,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1186,9 +1181,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1249,6 +1245,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -2308,13 +2305,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -2336,6 +2339,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests.Integration/packages.lock.json b/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests.Integration/packages.lock.json
index f02870c612..161d8b8dae 100644
--- a/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests.Integration/packages.lock.json
+++ b/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests.Integration/packages.lock.json
@@ -1034,11 +1034,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1313,9 +1308,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1376,6 +1372,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -2509,13 +2506,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -2537,6 +2540,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests/packages.lock.json b/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests/packages.lock.json
index f02870c612..161d8b8dae 100644
--- a/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests/packages.lock.json
+++ b/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests/packages.lock.json
@@ -1034,11 +1034,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1313,9 +1308,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1376,6 +1372,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -2509,13 +2506,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -2537,6 +2540,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Applications/SseServer/src/SseServer/Configuration.cs b/Applications/SseServer/src/SseServer/Configuration.cs
index c5e22fadba..143473d93a 100644
--- a/Applications/SseServer/src/SseServer/Configuration.cs
+++ b/Applications/SseServer/src/SseServer/Configuration.cs
@@ -6,6 +6,9 @@ namespace Backbone.SseServer;
public class Configuration
{
+ [Required]
+ public required TelemetryConfiguration Telemetry { get; init; }
+
[Required]
public required AuthenticationConfiguration Authentication { get; init; }
@@ -20,6 +23,11 @@ public class Configuration
[Required]
public required SseServerConfiguration SseServer { get; init; }
+ public class TelemetryConfiguration
+ {
+ public required OpenTelemetryCollectorConfiguration OpenTelemetryCollector { get; set; } = new();
+ }
+
public class AuthenticationConfiguration
{
[Required]
diff --git a/Applications/SseServer/src/SseServer/Program.cs b/Applications/SseServer/src/SseServer/Program.cs
index 0fb79bc1a9..a892138d50 100644
--- a/Applications/SseServer/src/SseServer/Program.cs
+++ b/Applications/SseServer/src/SseServer/Program.cs
@@ -1,3 +1,4 @@
+using System.Reflection;
using Autofac.Extensions.DependencyInjection;
using Backbone.BuildingBlocks.API.Extensions;
using Backbone.BuildingBlocks.API.Mvc.Middleware;
@@ -63,13 +64,13 @@ static WebApplication CreateApp(string[] args)
builder.Host
.UseSerilog((context, configuration) => configuration
- .ReadFrom.Configuration(context.Configuration, new ConfigurationReaderOptions { SectionName = "Logging" })
+ .ReadFrom.Configuration(context.Configuration, new ConfigurationReaderOptions { SectionName = "Telemetry:Logging" })
.Enrich.WithCorrelationId("X-Correlation-Id", addValueIfHeaderAbsence: true)
.Enrich.FromLogContext()
- .Enrich.WithProperty("service", "sseserver")
.Enrich.WithExceptionDetails(new DestructuringOptionsBuilder()
.WithDefaultDestructurers()
- .WithDestructurers([new DbUpdateExceptionDestructurer()])), preserveStaticLogger: true
+ .WithDestructurers([new DbUpdateExceptionDestructurer()])),
+ writeToProviders: true
)
.UseServiceProviderFactory(new AutofacServiceProviderFactory());
@@ -111,7 +112,7 @@ static void ConfigureServices(IServiceCollection services, IConfiguration config
options.KnownProxies.Clear();
});
- services.AddOpenTelemetryWithPrometheusExporter(METER_NAME);
+ services.AddOpenTelemetry(METER_NAME, Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "unknown", parsedConfiguration.Telemetry.OpenTelemetryCollector);
services.AddCustomIdentity(environment);
@@ -123,8 +124,6 @@ static void Configure(WebApplication app, Configuration configuration)
if (configuration.SwaggerUi.Enabled)
app.UseCustomSwaggerUi();
- app.MapPrometheusScrapingEndpoint();
-
app.UseSerilogRequestLogging(opts =>
{
opts.EnrichDiagnosticContext = LogHelper.EnrichFromRequest;
diff --git a/Applications/SseServer/src/SseServer/appsettings.json b/Applications/SseServer/src/SseServer/appsettings.json
index 691c9b3cbc..30be7fb2c5 100644
--- a/Applications/SseServer/src/SseServer/appsettings.json
+++ b/Applications/SseServer/src/SseServer/appsettings.json
@@ -32,19 +32,21 @@
}
}
},
- "Logging": {
- "MinimumLevel": {
- "Default": "Warning",
- "Override": {
- "Backbone": "Information",
- "Azure.Messaging.ServiceBus": "Error"
- }
- },
- "WriteTo": {
- "Console": {
- "Name": "Console",
- "Args": {
- "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ "Telemetry": {
+ "Logging": {
+ "MinimumLevel": {
+ "Default": "Warning",
+ "Override": {
+ "Backbone": "Information",
+ "Azure.Messaging.ServiceBus": "Error"
+ }
+ },
+ "WriteTo": {
+ "Console": {
+ "Name": "Console",
+ "Args": {
+ "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+ }
}
}
}
diff --git a/Applications/SseServer/src/SseServer/packages.lock.json b/Applications/SseServer/src/SseServer/packages.lock.json
index 08e019ec59..02a5e1e85f 100644
--- a/Applications/SseServer/src/SseServer/packages.lock.json
+++ b/Applications/SseServer/src/SseServer/packages.lock.json
@@ -723,11 +723,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -912,9 +907,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -975,6 +971,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1448,13 +1445,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -1475,6 +1478,15 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Applications/SseServer/test/SseServerTests/packages.lock.json b/Applications/SseServer/test/SseServerTests/packages.lock.json
index a7d038ebe1..10399c7091 100644
--- a/Applications/SseServer/test/SseServerTests/packages.lock.json
+++ b/Applications/SseServer/test/SseServerTests/packages.lock.json
@@ -1069,11 +1069,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1364,9 +1359,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1427,6 +1423,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -2130,13 +2127,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -2158,6 +2161,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Backbone.Tests.ArchUnit/packages.lock.json b/Backbone.Tests.ArchUnit/packages.lock.json
index bc01a81735..ccd440d94c 100644
--- a/Backbone.Tests.ArchUnit/packages.lock.json
+++ b/Backbone.Tests.ArchUnit/packages.lock.json
@@ -1129,11 +1129,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1450,9 +1445,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1522,6 +1518,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1610,7 +1607,6 @@
"Backbone.Modules.Relationships.Module": "[1.0.0, )",
"Backbone.Modules.Synchronization.Module": "[1.0.0, )",
"Backbone.Modules.Tokens.Module": "[1.0.0, )",
- "OpenTelemetry.Exporter.Prometheus.HttpListener": "[1.11.2-beta.1, 1.11.2-beta.1]",
"Serilog.Enrichers.Sensitive": "[2.1.0, 2.1.0]",
"Serilog.Exceptions": "[8.4.0, 8.4.0]",
"Serilog.Exceptions.EntityFrameworkCore": "[8.4.0, 8.4.0]",
@@ -2976,22 +2972,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
- "dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
- }
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
},
- "OpenTelemetry.Exporter.Prometheus.HttpListener": {
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "Ppwr0l7X4AbZ2+b1XaZzl+I1196MtA+kelsdHF7QutoOtgdY7Mx0RAFMV7dKYCIRsOumfYaOb8U/Hkkft5HLrQ==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -3013,6 +3006,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/BuildingBlocks/src/BuildingBlocks.API/BuildingBlocks.API.csproj b/BuildingBlocks/src/BuildingBlocks.API/BuildingBlocks.API.csproj
index d4900f0fc9..5cdf49cc5e 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/BuildingBlocks.API.csproj
+++ b/BuildingBlocks/src/BuildingBlocks.API/BuildingBlocks.API.csproj
@@ -7,9 +7,10 @@
-
+
+
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Diagnostics/DatabaseNameProcessor.cs b/BuildingBlocks/src/BuildingBlocks.API/Diagnostics/DatabaseNameProcessor.cs
new file mode 100644
index 0000000000..bad16c330b
--- /dev/null
+++ b/BuildingBlocks/src/BuildingBlocks.API/Diagnostics/DatabaseNameProcessor.cs
@@ -0,0 +1,13 @@
+using System.Diagnostics;
+using OpenTelemetry;
+
+namespace Backbone.BuildingBlocks.API.Diagnostics;
+
+public sealed class DatabaseNameProcessor : BaseProcessor
+{
+ public override void OnStart(Activity activity)
+ {
+ if (activity.Source.Name.Contains("EntityFrameworkCore"))
+ activity.SetTag("peer.service", "database");
+ }
+}
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Diagnostics/UserContextProcessor.cs b/BuildingBlocks/src/BuildingBlocks.API/Diagnostics/UserContextProcessor.cs
new file mode 100644
index 0000000000..fe2b356da7
--- /dev/null
+++ b/BuildingBlocks/src/BuildingBlocks.API/Diagnostics/UserContextProcessor.cs
@@ -0,0 +1,26 @@
+using System.Diagnostics;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Microsoft.Extensions.DependencyInjection;
+using OpenTelemetry;
+
+namespace Backbone.BuildingBlocks.API.Diagnostics;
+
+public sealed class UserContextProcessor : BaseProcessor
+{
+ private readonly IServiceProvider _serviceProvider;
+
+ public UserContextProcessor(IServiceProvider serviceProvider)
+ {
+ _serviceProvider = serviceProvider;
+ }
+
+ public override void OnEnd(Activity data)
+ {
+ var userContext = _serviceProvider.GetService();
+
+ data.SetTag("enmeshed.backbone.client_id", userContext?.GetClientIdOrNull() ?? Baggage.Current.GetBaggage("enmeshed.backbone.client_id"));
+ data.SetTag("enmeshed.backbone.device_id", userContext?.GetDeviceIdOrNull() ?? Baggage.Current.GetBaggage("enmeshed.backbone.device_id"));
+ data.SetTag("enmeshed.backbone.identity_address", userContext?.GetAddressOrNull()?.Value ?? Baggage.Current.GetBaggage("enmeshed.backbone.identity_address"));
+ data.SetTag("enmeshed.backbone.username", userContext?.GetUsernameOrNull() ?? Baggage.Current.GetBaggage("enmeshed.backbone.username"));
+ }
+}
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Extensions/ServiceCollectionExtensions.cs b/BuildingBlocks/src/BuildingBlocks.API/Extensions/ServiceCollectionExtensions.cs
index ddea668262..418969281b 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Extensions/ServiceCollectionExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Extensions/ServiceCollectionExtensions.cs
@@ -1,5 +1,7 @@
using Asp.Versioning.ApiExplorer;
using Backbone.BuildingBlocks.API.AspNetCoreIdentityCustomizations;
+using Backbone.BuildingBlocks.API.Diagnostics;
+using Backbone.BuildingBlocks.Infrastructure.EventBus;
using Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
using Backbone.BuildingBlocks.Module;
using Backbone.Modules.Devices.Domain.Entities.Identities;
@@ -10,7 +12,10 @@
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Options;
using Microsoft.OpenApi;
+using OpenTelemetry.Logs;
using OpenTelemetry.Metrics;
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
using Swashbuckle.AspNetCore.SwaggerGen;
namespace Backbone.BuildingBlocks.API.Extensions;
@@ -103,19 +108,58 @@ public IServiceCollection AddCustomIdentity(IHostEnvironment environment)
return services;
}
- public IServiceCollection AddOpenTelemetryWithPrometheusExporter(string name)
+ public IServiceCollection AddOpenTelemetry(string resourceName, string resourceVersion, OpenTelemetryCollectorConfiguration openTelemetryCollectorConfiguration,
+ params string[] additionalActivitySourceNames)
{
services.AddOpenTelemetry()
+ .ConfigureResource(resource => resource.AddService(resourceName, serviceVersion: resourceVersion))
.WithMetrics(metrics =>
{
metrics
- .AddPrometheusExporter()
- .AddMeter(name)
+ .AddAspNetCoreInstrumentation()
+ .AddMeter(resourceName)
.AddMeter("Microsoft.EntityFrameworkCore")
.AddMeter("Microsoft.AspNetCore.Hosting")
.AddMeter("Microsoft.AspNetCore.Diagnostics")
- .AddMeter("Microsoft.AspNetCore.Server.Kestrel");
- });
+ .AddMeter("Microsoft.AspNetCore.Server.Kestrel")
+ .AddMeter("Microsoft.AspNetCore.Authorization")
+ .AddMeter("Microsoft.AspNetCore.Authentication")
+ .AddMeter("Microsoft.AspNetCore.Identity");
+
+ if (openTelemetryCollectorConfiguration.Endpoint != null)
+ metrics.AddOtlpExporter(options => { options.Endpoint = new Uri(openTelemetryCollectorConfiguration.Endpoint); });
+ })
+ .WithTracing(tracing =>
+ {
+ tracing
+ .AddAspNetCoreInstrumentation()
+ .AddEntityFrameworkCoreInstrumentation()
+ .AddHttpClientInstrumentation()
+ .AddSource(EventBusDiagnostics.ACTIVITY_SOURCE_NAME)
+ .AddProcessor()
+ .AddProcessor();
+
+ foreach (var activitySourceName in additionalActivitySourceNames)
+ {
+ tracing.AddSource(activitySourceName);
+ }
+
+ if (openTelemetryCollectorConfiguration.Endpoint != null)
+ tracing.AddOtlpExporter(options => { options.Endpoint = new Uri(openTelemetryCollectorConfiguration.Endpoint); });
+ })
+ .WithLogging(
+ logging =>
+ {
+ if (openTelemetryCollectorConfiguration.Endpoint != null)
+ logging.AddOtlpExporter(options => { options.Endpoint = new Uri(openTelemetryCollectorConfiguration.Endpoint); });
+ },
+ logging =>
+ {
+ logging.IncludeFormattedMessage = true;
+ logging.IncludeScopes = true;
+ logging.ParseStateValues = true;
+ }
+ );
return services;
}
@@ -194,6 +238,11 @@ [new OpenApiSecuritySchemeReference(securityDefinitionName, document)] = []
}
}
+public class OpenTelemetryCollectorConfiguration
+{
+ public string? Endpoint { get; set; }
+}
+
public class SwaggerUiConfiguration
{
public bool Enabled { get; init; }
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Mvc/Middleware/TraceIdMiddleware.cs b/BuildingBlocks/src/BuildingBlocks.API/Mvc/Middleware/TraceIdMiddleware.cs
index b057ff9e1c..107e9f270f 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Mvc/Middleware/TraceIdMiddleware.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Mvc/Middleware/TraceIdMiddleware.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
using Microsoft.AspNetCore.Http;
namespace Backbone.BuildingBlocks.API.Mvc.Middleware;
@@ -17,7 +18,7 @@ public Task InvokeAsync(HttpContext context)
{
context.Response.OnStarting(() =>
{
- var traceId = context.TraceIdentifier;
+ var traceId = Activity.Current?.TraceId.ToString() ?? context.TraceIdentifier;
context.Response.Headers[RESPONSE_HEADER_TRACE_ID] = traceId;
return Task.CompletedTask;
});
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Mvc/Middleware/UserContextBaggageMiddleware.cs b/BuildingBlocks/src/BuildingBlocks.API/Mvc/Middleware/UserContextBaggageMiddleware.cs
new file mode 100644
index 0000000000..e914025b36
--- /dev/null
+++ b/BuildingBlocks/src/BuildingBlocks.API/Mvc/Middleware/UserContextBaggageMiddleware.cs
@@ -0,0 +1,43 @@
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Microsoft.AspNetCore.Http;
+using OpenTelemetry;
+
+namespace Backbone.BuildingBlocks.API.Mvc.Middleware;
+
+public class UserContextBaggageMiddleware
+{
+ private const string DEVICE_ID = "enmeshed.backbone.device_id";
+ private const string IDENTITY_ADDRESS = "enmeshed.backbone.identity_address";
+ private const string CLIENT_ID = "enmeshed.backbone.client_id";
+ private const string USERNAME = "enmeshed.backbone.username";
+
+ private readonly RequestDelegate _next;
+
+ public UserContextBaggageMiddleware(RequestDelegate next)
+ {
+ _next = next;
+ }
+
+ public async Task InvokeAsync(HttpContext context, IUserContext userContext)
+ {
+ var baggageItems = new List>();
+
+ AddIfNotNull(baggageItems, DEVICE_ID, userContext.GetDeviceIdOrNull()?.Value);
+ AddIfNotNull(baggageItems, IDENTITY_ADDRESS, userContext.GetAddressOrNull()?.Value);
+ AddIfNotNull(baggageItems, CLIENT_ID, userContext.GetClientIdOrNull());
+ AddIfNotNull(baggageItems, USERNAME, userContext.GetUsernameOrNull());
+
+ if (baggageItems.Count > 0)
+ Baggage.SetBaggage(baggageItems);
+
+ await _next(context);
+ }
+
+ private static void AddIfNotNull(List> baggageItems, string key, string? value)
+ {
+ if (value == null)
+ return;
+
+ baggageItems.Add(new KeyValuePair(key, value));
+ }
+}
diff --git a/BuildingBlocks/src/BuildingBlocks.API/packages.lock.json b/BuildingBlocks/src/BuildingBlocks.API/packages.lock.json
index 40232d4cf1..0a6d7e7565 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/packages.lock.json
+++ b/BuildingBlocks/src/BuildingBlocks.API/packages.lock.json
@@ -64,13 +64,13 @@
"Microsoft.Extensions.Logging": "10.0.10"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "Direct",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -92,6 +92,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "Direct",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "Direct",
"requested": "[1.17.0, 1.17.0]",
@@ -1066,11 +1077,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1298,6 +1304,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1823,6 +1830,12 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"RabbitMQ.Client": {
"type": "CentralTransitive",
"requested": "[7.2.1, 7.2.1]",
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/Housekeeping/HousekeepingTelemetry.cs b/BuildingBlocks/src/BuildingBlocks.Application/Housekeeping/HousekeepingTelemetry.cs
new file mode 100644
index 0000000000..7c2646d5d3
--- /dev/null
+++ b/BuildingBlocks/src/BuildingBlocks.Application/Housekeeping/HousekeepingTelemetry.cs
@@ -0,0 +1,73 @@
+using System.Diagnostics;
+
+namespace Backbone.BuildingBlocks.Application.Housekeeping;
+
+public static class HousekeepingTelemetry
+{
+ public const string ACTIVITY_SOURCE_NAME = "Backbone.Housekeeping";
+
+ public static readonly ActivitySource ACTIVITY_SOURCE = new(ACTIVITY_SOURCE_NAME);
+
+ public static async Task TrackModuleDeletion(string moduleName, Func execute, CancellationToken cancellationToken)
+ {
+ using var activity = StartModuleDeletionActivity(moduleName);
+
+ try
+ {
+ await execute(cancellationToken);
+ }
+ catch (Exception ex)
+ {
+ TrackException(activity, ex);
+ throw;
+ }
+ }
+
+ private static Activity? StartModuleDeletionActivity(string moduleName)
+ {
+ var activity = ACTIVITY_SOURCE.StartActivity($"delete {moduleName} module");
+
+ if (activity == null)
+ return null;
+
+ activity.SetTag("housekeeping.operation", "module_deletion");
+ activity.SetTag("housekeeping.module", moduleName);
+
+ return activity;
+ }
+
+ public static async Task TrackItemDeletion(string itemType, Func> delete, CancellationToken cancellationToken)
+ {
+ using var activity = StartItemDeletionActivity(itemType);
+
+ try
+ {
+ var numberOfDeletedItems = await delete(cancellationToken);
+ activity?.SetTag("housekeeping.deleted_item_count", numberOfDeletedItems);
+ }
+ catch (Exception ex)
+ {
+ TrackException(activity, ex);
+ throw;
+ }
+ }
+
+ private static Activity? StartItemDeletionActivity(string itemType)
+ {
+ var activity = ACTIVITY_SOURCE.StartActivity($"delete {itemType}");
+
+ if (activity == null)
+ return null;
+
+ activity.SetTag("housekeeping.operation", "delete");
+ activity.SetTag("housekeeping.item_type", itemType);
+
+ return activity;
+ }
+
+ private static void TrackException(Activity? activity, Exception exception)
+ {
+ activity?.AddException(exception);
+ activity?.SetStatus(ActivityStatusCode.Error, exception.Message);
+ }
+}
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/Housekeeping/LoggerExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Application/Housekeeping/LoggerExtensions.cs
deleted file mode 100644
index 3f1ec46564..0000000000
--- a/BuildingBlocks/src/BuildingBlocks.Application/Housekeeping/LoggerExtensions.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace Backbone.BuildingBlocks.Application.Housekeeping;
-
-public static partial class LoggerExtensions
-{
- [LoggerMessage(
- EventId = 769524,
- EventName = "ExecuteHousekeeping.DataDeleted",
- Level = LogLevel.Information,
- Message = "Deleted {numberOfDeletedItems} {descriptionOfDeletedObjects} in {elapsedMilliseconds}ms.")]
- public static partial void DataDeleted(this ILogger logger, int numberOfDeletedItems, string descriptionOfDeletedObjects, long elapsedMilliseconds);
-}
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/packages.lock.json b/BuildingBlocks/src/BuildingBlocks.Application/packages.lock.json
index f99f6e2ee8..8b0e819af8 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/packages.lock.json
+++ b/BuildingBlocks/src/BuildingBlocks.Application/packages.lock.json
@@ -742,6 +742,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1092,6 +1093,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"RabbitMQ.Client": {
"type": "CentralTransitive",
"requested": "[7.2.1, 7.2.1]",
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj b/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj
index 06bde4e9e3..05a38d5e2c 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj
@@ -21,6 +21,7 @@
+
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.Consumer.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.Consumer.cs
index a6fe12fcd3..380f5d64f5 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.Consumer.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.Consumer.cs
@@ -1,4 +1,5 @@
using System.Diagnostics;
+using System.Text;
using System.Text.Json;
using Azure.Messaging.ServiceBus;
using Azure.Messaging.ServiceBus.Administration;
@@ -8,11 +9,16 @@
using Backbone.Tooling.Extensions;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
+using OpenTelemetry;
namespace Backbone.BuildingBlocks.Infrastructure.EventBus.AzureServiceBus;
public partial class EventBusAzureServiceBus
{
+ private const string CALL_OPERATION_NAME = "call";
+ private const string PROCESS_OPERATION_NAME = "consume";
+ private const string PROCESS_OPERATION_TYPE = "process";
+
public async Task Subscribe()
where T : DomainEvent
where TH : IDomainEventHandler
@@ -29,7 +35,12 @@ public async Task Subscribe()
processor.ProcessMessageAsync +=
async args =>
{
+ using var activity = StartProcessActivity(args.Message, subscriptionName, args.Message.Body.ToMemory().Length);
+
var messageData = args.Message.Body.ToString();
+
+ activity?.AddEvent(new ActivityEvent("enmeshed.backbone.event_bus.consumer.message_decoded"));
+
var correlationId = args.Message.CorrelationId;
correlationId = correlationId.IsNullOrEmpty() ? CustomLogContext.GenerateCorrelationId() : correlationId;
@@ -107,16 +118,15 @@ private async Task RegisterSubscriptionClientMessageHandler(CancellationToken ca
private Task ErrorHandler(ProcessErrorEventArgs args)
{
- var ex = args.Exception;
- var context = args.ErrorSource;
-
- _logger.ErrorHandlingMessage(context, ex);
+ Activity.Current?.AddException(args.Exception);
return Task.CompletedTask;
}
private async Task ProcessEvent(string message) where TEvent : DomainEvent where THandler : IDomainEventHandler
{
+ Activity.Current?.AddEvent(new ActivityEvent("enmeshed.backbone.event_bus.consumer.start_processing"));
+
var eventType = typeof(TEvent);
var domainEvent = JsonSerializer.Deserialize(message)!;
@@ -129,21 +139,93 @@ private async Task ProcessEvent(string message) where TE
if (scope.ServiceProvider.GetService(typeof(THandler)) is not IDomainEventHandler handler)
throw new Exception($"Domain event handler '{typeof(THandler).FullName}' could not be resolved from dependency container or it does not implement {nameof(IDomainEventHandler)}.");
+ Activity.Current?.AddEvent(new ActivityEvent("enmeshed.backbone.event_bus.consumer.handler_resolved"));
+
var startedAt = Stopwatch.GetTimestamp();
- await (Task)concreteType.GetMethod("Handle")!.Invoke(handler, [domainEvent])!;
+ using (var handlerActivity = StartHandlerActivity())
+ {
+ try
+ {
+ await (Task)concreteType.GetMethod("Handle")!.Invoke(handler, [domainEvent])!;
+ }
+ catch (Exception ex)
+ {
+ handlerActivity?.AddException(ex);
+ throw;
+ }
+ }
+
_metrics.TrackEventProcessingDuration(startedAt, GetSubscriptionName());
_metrics.IncrementNumberOfHandledEvents(GetSubscriptionName());
}
catch (Exception ex)
{
- _logger.ErrorWhileProcessingDomainEvent(domainEvent.DomainEventId, ex);
+ Activity.Current?.AddException(ex);
return false;
}
return true;
}
+ private Activity? StartHandlerActivity() where TEvent : DomainEvent where THandler : IDomainEventHandler
+ {
+ var handlerType = typeof(THandler);
+ var eventType = typeof(TEvent);
+ var activity = EventBusDiagnostics.ACTIVITY_SOURCE.StartActivity($"{CALL_OPERATION_NAME} {handlerType.FullName}", ActivityKind.Internal);
+
+ if (activity == null)
+ return null;
+
+ activity.SetTag("event_bus.event.name", eventType.GetEventName());
+ activity.SetTag("event_bus.event.type", eventType.FullName);
+ activity.SetTag("event_bus.handler.type", handlerType.FullName);
+
+ return activity;
+ }
+
+ private Activity? StartProcessActivity(ServiceBusReceivedMessage message, string subscriptionName, int bodySize)
+ {
+ var parentContext = EventBusDiagnostics.PROPAGATOR.Extract(default,
+ message.ApplicationProperties,
+ ExtractTraceContextFromApplicationProperties);
+ Baggage.Current = parentContext.Baggage;
+
+ var destinationName = $"{TOPIC_NAME}.{subscriptionName}";
+ var activity = EventBusDiagnostics.ACTIVITY_SOURCE.StartActivity($"{PROCESS_OPERATION_NAME} {destinationName}", ActivityKind.Consumer, parentContext.ActivityContext);
+
+ if (activity == null)
+ return null;
+
+ activity.SetTag("messaging.system", MESSAGING_SYSTEM);
+ activity.SetTag("messaging.operation.name", PROCESS_OPERATION_NAME);
+ activity.SetTag("messaging.operation.type", PROCESS_OPERATION_TYPE);
+ activity.SetTag("messaging.destination.name", destinationName);
+ activity.SetTag("messaging.destination.subscription.name", subscriptionName);
+ activity.SetTag("messaging.destination.template", $"{TOPIC_NAME}:{{subscriptionName}}");
+ activity.SetTag("messaging.message.body.size", bodySize);
+ activity.SetTag("messaging.servicebus.message.delivery_count", message.DeliveryCount);
+ activity.SetTag("messaging.servicebus.message.enqueued_time", message.EnqueuedTime.ToUnixTimeSeconds());
+
+ if (!message.MessageId.IsNullOrEmpty())
+ activity.SetTag("messaging.message.id", message.MessageId);
+
+ if (!message.CorrelationId.IsNullOrEmpty())
+ activity.SetTag("messaging.message.conversation_id", message.CorrelationId);
+
+ return activity;
+ }
+
+ private IEnumerable ExtractTraceContextFromApplicationProperties(IReadOnlyDictionary applicationProperties, string key)
+ {
+ if (!applicationProperties.TryGetValue(key, out var value)) return [];
+
+ if (value is string stringValue) return [stringValue];
+ if (value is byte[] bytes) return [Encoding.UTF8.GetString(bytes)];
+
+ return [];
+ }
+
public async Task StopConsuming(CancellationToken cancellationToken)
{
foreach (var processor in _processors)
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.Publisher.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.Publisher.cs
index 7ae0330314..f60f2691fa 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.Publisher.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.Publisher.cs
@@ -4,12 +4,18 @@
using Azure.Messaging.ServiceBus;
using Backbone.BuildingBlocks.Domain.Events;
using Backbone.BuildingBlocks.Infrastructure.CorrelationIds;
+using Backbone.Tooling.Extensions;
using Microsoft.Extensions.Logging;
+using OpenTelemetry;
+using OpenTelemetry.Context.Propagation;
namespace Backbone.BuildingBlocks.Infrastructure.EventBus.AzureServiceBus;
public partial class EventBusAzureServiceBus
{
+ private const string PUBLISH_OPERATION_NAME = "publish";
+ private const string SEND_OPERATION_TYPE = "send";
+
public async Task Publish(DomainEvent @event)
{
var eventName = @event.GetEventName();
@@ -26,6 +32,8 @@ public async Task Publish(DomainEvent @event)
CorrelationId = CustomLogContext.GetCorrelationId()
};
+ using var activity = StartPublishActivity(message, @event.DomainEventId, eventName, body.Length);
+
_logger.SendingDomainEvent(message.MessageId);
try
@@ -38,10 +46,48 @@ public async Task Publish(DomainEvent @event)
_logger.LogDebug("Successfully sent domain event with id '{MessageId}'.", message.MessageId);
}
- catch (Exception)
+ catch (Exception ex)
{
_metrics.IncrementNumberOfPublishingErrors(eventName);
+ activity?.AddException(ex);
throw;
}
}
+
+ private Activity? StartPublishActivity(ServiceBusMessage message, string messageId, string eventName, int bodySize)
+ {
+ var destinationName = $"{TOPIC_NAME}:{eventName}";
+
+ var activity = EventBusDiagnostics.ACTIVITY_SOURCE.StartActivity($"{PUBLISH_OPERATION_NAME} {destinationName}", ActivityKind.Producer, Activity.Current?.Context ?? default);
+
+ ActivityContext contextToInject = default;
+
+ if (activity != null)
+ contextToInject = activity.Context;
+ else if (Activity.Current != null)
+ contextToInject = Activity.Current.Context;
+
+ EventBusDiagnostics.PROPAGATOR.Inject(new PropagationContext(contextToInject, Baggage.Current), message.ApplicationProperties, InjectTraceContextIntoApplicationProperties);
+
+ if (activity == null)
+ return null;
+
+ activity.SetTag("messaging.system", MESSAGING_SYSTEM);
+ activity.SetTag("messaging.operation.name", PUBLISH_OPERATION_NAME);
+ activity.SetTag("messaging.operation.type", SEND_OPERATION_TYPE);
+ activity.SetTag("messaging.destination.name", destinationName);
+ activity.SetTag("messaging.message.id", messageId);
+ activity.SetTag("messaging.message.body.size", bodySize);
+ activity.SetTag("messaging.destination.template", $"{TOPIC_NAME}:{{eventName}}");
+
+ if (!message.CorrelationId.IsNullOrEmpty())
+ activity.SetTag("messaging.message.conversation_id", message.CorrelationId);
+
+ return activity;
+ }
+
+ private void InjectTraceContextIntoApplicationProperties(IDictionary applicationProperties, string key, string value)
+ {
+ applicationProperties[key] = value;
+ }
}
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.cs
index 17806d957a..296c2484ba 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.cs
@@ -10,6 +10,7 @@ namespace Backbone.BuildingBlocks.Infrastructure.EventBus.AzureServiceBus;
public partial class EventBusAzureServiceBus : IEventBus, IDisposable, IAsyncDisposable
{
private const string TOPIC_NAME = "default";
+ private const string MESSAGING_SYSTEM = "servicebus";
private const int MAX_DELIVERY_COUNT = 5;
private readonly ServiceBusProcessorOptions _options = new()
@@ -86,11 +87,4 @@ internal static partial class EventBusAzureServiceBusLogs
Level = LogLevel.Error,
Message = "Error handling message with context {exceptionContext}.")]
public static partial void ErrorHandlingMessage(this ILogger logger, ServiceBusErrorSource exceptionContext, Exception exception);
-
- [LoggerMessage(
- EventId = 146670,
- EventName = "EventBusAzureServiceBus.ErrorWhileProcessingDomainEvent",
- Level = LogLevel.Error,
- Message = "An error occurred while processing the event with id '{domainEventId}'.")]
- public static partial void ErrorWhileProcessingDomainEvent(this ILogger logger, string domainEventId, Exception ex);
}
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/EventBusDiagnostics.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/EventBusDiagnostics.cs
new file mode 100644
index 0000000000..edd0b9508f
--- /dev/null
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/EventBusDiagnostics.cs
@@ -0,0 +1,12 @@
+using System.Diagnostics;
+using OpenTelemetry.Context.Propagation;
+
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus;
+
+public class EventBusDiagnostics
+{
+ public const string ACTIVITY_SOURCE_NAME = "Backbone.EventBus";
+
+ public static readonly ActivitySource ACTIVITY_SOURCE = new(ACTIVITY_SOURCE_NAME);
+ public static readonly TextMapPropagator PROPAGATOR = Propagators.DefaultTextMapPropagator;
+}
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.Consumer.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.Consumer.cs
index 078136fdfb..08c5f31aa2 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.Consumer.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.Consumer.cs
@@ -10,12 +10,17 @@
using Grpc.Core;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
+using OpenTelemetry;
using Type = System.Type;
namespace Backbone.BuildingBlocks.Infrastructure.EventBus.GoogleCloudPubSub;
public partial class EventBusGoogleCloudPubSub
{
+ private const string CALL_OPERATION_NAME = "call";
+ private const string PROCESS_OPERATION_NAME = "consume";
+ private const string PROCESS_OPERATION_TYPE = "process";
+
public async Task Subscribe()
where T : DomainEvent
where TH : IDomainEventHandler
@@ -79,8 +84,14 @@ public async Task StartConsuming(CancellationToken cancellationToken)
private async Task OnIncomingEvent(PubsubMessage @event, Type eventType, Type handlerType)
{
+ var subscriptionName = GetSubscriptionName(_projectId, handlerType, eventType).SubscriptionId;
+
+ using var activity = StartProcessActivity(@event, subscriptionName, @event.Data.Length);
+
var eventData = @event.Data.ToStringUtf8();
+ activity?.AddEvent(new ActivityEvent("enmeshed.backbone.event_bus.consumer.message_decoded"));
+
try
{
@event.Attributes.TryGetValue(PubSubMessageAttributes.CORRELATION_ID, out var correlationId);
@@ -94,8 +105,10 @@ public async Task StartConsuming(CancellationToken cancellationToken)
}
catch (Exception ex)
{
- _metrics.IncrementNumberOfProcessingErrors(GetSubscriptionName(_projectId, handlerType, eventType).SubscriptionId);
- _logger.ErrorHandlingMessage(ex.StackTrace!, ex);
+ activity?.AddException(ex);
+
+ _metrics.IncrementNumberOfProcessingErrors(subscriptionName);
+ activity?.AddException(ex);
return SubscriberClient.Reply.Nack;
}
@@ -104,6 +117,8 @@ public async Task StartConsuming(CancellationToken cancellationToken)
private async Task ProcessEvent(string message, Type eventType, Type handlerType)
{
+ Activity.Current?.AddEvent(new ActivityEvent("enmeshed.backbone.event_bus.consumer.start_processing"));
+
var subscriptionName = GetSubscriptionName(_projectId, handlerType, eventType).SubscriptionId;
var domainEvent = JsonSerializer.Deserialize(message, eventType)!;
@@ -112,15 +127,83 @@ private async Task ProcessEvent(string message, Type eventType, Type handlerType
if (scope.ServiceProvider.GetService(handlerType) is not IDomainEventHandler handler)
throw new Exception("Domain event handler could not be resolved from dependency container or it does not implement IDomainEventHandler.");
+ Activity.Current?.AddEvent(new ActivityEvent("enmeshed.backbone.event_bus.consumer.handler_resolved"));
+
var handleMethod = handler.GetType().GetMethod("Handle");
var startedAt = Stopwatch.GetTimestamp();
- await (Task)handleMethod!.Invoke(handler, [domainEvent])!;
+ using (var handlerActivity = StartHandlerActivity(eventType, handlerType))
+ {
+ try
+ {
+ await (Task)handleMethod!.Invoke(handler, [domainEvent])!;
+ }
+ catch (Exception ex)
+ {
+ handlerActivity?.AddException(ex);
+ throw;
+ }
+ }
+
_metrics.TrackEventProcessingDuration(startedAt, subscriptionName);
_metrics.IncrementNumberOfHandledEvents(subscriptionName);
}
+ private Activity? StartHandlerActivity(Type eventType, Type handlerType)
+ {
+ var activity = EventBusDiagnostics.ACTIVITY_SOURCE.StartActivity($"{CALL_OPERATION_NAME} {handlerType.FullName}", ActivityKind.Internal);
+
+ if (activity == null)
+ return null;
+
+ activity.SetTag("event_bus.event.name", eventType.GetEventName());
+ activity.SetTag("event_bus.event.type", eventType.FullName);
+ activity.SetTag("event_bus.handler.type", handlerType.FullName);
+
+ return activity;
+ }
+
+ private Activity? StartProcessActivity(PubsubMessage message, string subscriptionName, int bodySize)
+ {
+ var parentContext = EventBusDiagnostics.PROPAGATOR.Extract(default,
+ message.Attributes,
+ ExtractTraceContextFromAttributes);
+ Baggage.Current = parentContext.Baggage;
+
+ var destinationName = $"{_topicName.TopicId}.{subscriptionName}";
+ var activity = EventBusDiagnostics.ACTIVITY_SOURCE.StartActivity($"{PROCESS_OPERATION_NAME} {destinationName}", ActivityKind.Consumer, parentContext.ActivityContext);
+
+ if (activity == null)
+ return null;
+
+ activity.SetTag("messaging.system", MESSAGING_SYSTEM);
+ activity.SetTag("messaging.operation.name", PROCESS_OPERATION_NAME);
+ activity.SetTag("messaging.operation.type", PROCESS_OPERATION_TYPE);
+ activity.SetTag("messaging.destination.name", destinationName);
+ activity.SetTag("messaging.destination.subscription.name", subscriptionName);
+ activity.SetTag("messaging.destination.template", $"{_topicName.TopicId}:{{subscriptionName}}");
+ activity.SetTag("messaging.message.body.size", bodySize);
+
+ if (!message.MessageId.IsNullOrEmpty())
+ activity.SetTag("messaging.message.id", message.MessageId);
+
+ if (!message.OrderingKey.IsNullOrEmpty())
+ activity.SetTag("messaging.gcp_pubsub.message.ordering_key", message.OrderingKey);
+
+ if (message.Attributes.TryGetValue(PubSubMessageAttributes.CORRELATION_ID, out var correlationId) && !correlationId.IsNullOrEmpty())
+ activity.SetTag("messaging.message.conversation_id", correlationId);
+
+ return activity;
+ }
+
+ private IEnumerable ExtractTraceContextFromAttributes(IDictionary attributes, string key)
+ {
+ if (!attributes.TryGetValue(key, out var value)) return [];
+
+ return [value];
+ }
+
public async Task StopConsuming(CancellationToken cancellationToken)
{
var stopTasks = _subscriptions.Select(subscription => subscription.SubscriberClient.StopAsync(new SubscriberClient.ShutdownOptions(), CancellationToken.None));
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.Publisher.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.Publisher.cs
index 647efdccb5..11cd223e75 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.Publisher.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.Publisher.cs
@@ -2,13 +2,19 @@
using System.Text.Json;
using Backbone.BuildingBlocks.Domain.Events;
using Backbone.BuildingBlocks.Infrastructure.CorrelationIds;
+using Backbone.Tooling.Extensions;
using Google.Cloud.PubSub.V1;
using Google.Protobuf;
+using OpenTelemetry;
+using OpenTelemetry.Context.Propagation;
namespace Backbone.BuildingBlocks.Infrastructure.EventBus.GoogleCloudPubSub;
public partial class EventBusGoogleCloudPubSub
{
+ private const string PUBLISH_OPERATION_NAME = "publish";
+ private const string SEND_OPERATION_TYPE = "send";
+
public async Task Publish(DomainEvent @event)
{
var eventName = @event.GetEventName();
@@ -27,19 +33,58 @@ public async Task Publish(DomainEvent @event)
}
};
+ using var activity = StartPublishActivity(message, eventName, messageBytes.Length);
+
try
{
var startedAt = Stopwatch.GetTimestamp();
var messageId = await _publisherClient.PublishAsync(message);
- _logger.SuccessfullySentDomainEvent(messageId);
+ activity?.SetTag("messaging.message.id", messageId);
_metrics.TrackEventPublishingDuration(startedAt);
_metrics.IncrementNumberOfPublishedEvents(eventName);
}
- catch (Exception)
+ catch (Exception ex)
{
_metrics.IncrementNumberOfPublishingErrors(eventName);
+ activity?.AddException(ex);
throw;
}
}
+
+ private Activity? StartPublishActivity(PubsubMessage message, string eventName, int bodySize)
+ {
+ var destinationName = $"{_topicName.TopicId}:{eventName}";
+
+ var activity = EventBusDiagnostics.ACTIVITY_SOURCE.StartActivity($"{PUBLISH_OPERATION_NAME} {destinationName}", ActivityKind.Producer, Activity.Current?.Context ?? default);
+
+ ActivityContext contextToInject = default;
+
+ if (activity != null)
+ contextToInject = activity.Context;
+ else if (Activity.Current != null)
+ contextToInject = Activity.Current.Context;
+
+ EventBusDiagnostics.PROPAGATOR.Inject(new PropagationContext(contextToInject, Baggage.Current), message.Attributes, InjectTraceContextIntoAttributes);
+
+ if (activity == null)
+ return null;
+
+ activity.SetTag("messaging.system", MESSAGING_SYSTEM);
+ activity.SetTag("messaging.operation.name", PUBLISH_OPERATION_NAME);
+ activity.SetTag("messaging.operation.type", SEND_OPERATION_TYPE);
+ activity.SetTag("messaging.destination.name", destinationName);
+ activity.SetTag("messaging.message.body.size", bodySize);
+ activity.SetTag("messaging.destination.template", $"{_topicName.TopicId}:{{eventName}}");
+
+ if (message.Attributes.TryGetValue(PubSubMessageAttributes.CORRELATION_ID, out var correlationId) && !correlationId.IsNullOrEmpty())
+ activity.SetTag("messaging.message.conversation_id", correlationId);
+
+ return activity;
+ }
+
+ private void InjectTraceContextIntoAttributes(IDictionary attributes, string key, string value)
+ {
+ attributes[key] = value;
+ }
}
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.cs
index 79e657b108..d9cb4e5bc7 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.cs
@@ -13,6 +13,7 @@ public partial class EventBusGoogleCloudPubSub : IEventBus, IDisposable, IAsyncD
{
private const int SUBSCRIPTION_MINIMUM_BACKOFF = 2;
private const int SUBSCRIPTION_MAXIMUM_BACKOFF = 120;
+ private const string MESSAGING_SYSTEM = "gcp_pubsub";
private static readonly TimeSpan MESSAGE_ACK_DEADLINE = 60.Seconds();
@@ -130,20 +131,3 @@ public Subscription(SubscriberClient subscriberClient, Type eventType, Type hand
public Type HandlerType { get; }
}
}
-
-internal static partial class EventBusGoogleCloudPubSubLogs
-{
- [LoggerMessage(
- EventId = 830408,
- EventName = "EventBusGoogleCloudPubSub.SuccessfullySentDomainEvent",
- Level = LogLevel.Debug,
- Message = "Successfully sent domain event with id '{messageId}'.")]
- public static partial void SuccessfullySentDomainEvent(this ILogger logger, string messageId);
-
- [LoggerMessage(
- EventId = 712382,
- EventName = "EventBusGoogleCloudPubSub.ErrorHandlingMessage",
- Level = LogLevel.Error,
- Message = "Error handling message with context {exceptionSource}.")]
- public static partial void ErrorHandlingMessage(this ILogger logger, string exceptionSource, Exception exception);
-}
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMq.Consumer.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMq.Consumer.cs
index caef784981..c0ef9cb38e 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMq.Consumer.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMq.Consumer.cs
@@ -7,6 +7,7 @@
using Backbone.Tooling.Extensions;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
+using OpenTelemetry;
using RabbitMQ.Client;
using RabbitMQ.Client.Events;
@@ -14,6 +15,15 @@ namespace Backbone.BuildingBlocks.Infrastructure.EventBus.RabbitMQ;
public partial class EventBusRabbitMq
{
+ private const int HANDLER_RETRY_COUNT = 5;
+ private const string CALL_OPERATION_NAME = "call";
+ private const string PROCESS_OPERATION_NAME = "consume";
+ private const string PROCESS_OPERATION_TYPE = "process";
+
+ private readonly string _deadLetterExchangeName;
+ private readonly string _deadLetterQueueName;
+ private readonly SubscriptionManager _subscriptionManager = new();
+
public async Task Subscribe() where TEvent : DomainEvent where THandler : IDomainEventHandler
{
var queueName = GetQueueName();
@@ -25,30 +35,67 @@ public async Task Subscribe() where TEvent : DomainEvent where
_subscriptionManager.AddSubscription(consumer, queueName);
}
+ private async Task EnsureDeadLetterQueueExists()
+ {
+ IChannel? channel = null;
+
+ try
+ {
+ channel = await _channelPool.Get();
+
+ await channel.QueueDeclareAsync(_deadLetterQueueName,
+ durable: true,
+ exclusive: false,
+ autoDelete: false,
+ arguments: new Dictionary
+ {
+ { "x-queue-type", "quorum" },
+ }
+ );
+
+ await channel.QueueBindAsync(_deadLetterQueueName, _deadLetterExchangeName, "#");
+
+ _logger.LogTrace("Successfully bound dead letter queue.");
+ }
+ finally
+ {
+ if (channel != null)
+ _channelPool.Return(channel);
+ }
+ }
+
private async Task CreateQueue(string queueName) where TEvent : DomainEvent
{
var eventName = typeof(TEvent).GetEventName();
- var channel = await _channelPool.Get();
+ IChannel? channel = null;
- await channel.QueueDeclareAsync(queueName,
- durable: true,
- exclusive: false,
- autoDelete: false,
- arguments: new Dictionary
- {
- { "x-queue-type", "quorum" },
- { "x-delivery-limit", HANDLER_RETRY_COUNT },
- { "x-dead-letter-exchange", _deadLetterExchangeName },
- { "x-dead-letter-routing-key", $"dead.routing.{eventName}" }
- }
- );
+ try
+ {
+ channel = await _channelPool.Get();
- await channel.QueueBindAsync(queueName, _exchangeName, eventName);
+ await channel.QueueDeclareAsync(queueName,
+ durable: true,
+ exclusive: false,
+ autoDelete: false,
+ arguments: new Dictionary
+ {
+ { "x-queue-type", "quorum" },
+ { "x-delivery-limit", HANDLER_RETRY_COUNT },
+ { "x-dead-letter-exchange", _deadLetterExchangeName },
+ { "x-dead-letter-routing-key", $"dead.routing.{eventName}" }
+ }
+ );
- _logger.LogTrace("Successfully bound queue '{QueueName}' to event '{EventName}'.", queueName, eventName);
+ await channel.QueueBindAsync(queueName, _exchangeName, eventName);
- _channelPool.Return(channel);
+ _logger.LogTrace("Successfully bound queue '{QueueName}' to event '{EventName}'.", queueName, eventName);
+ }
+ finally
+ {
+ if (channel != null)
+ _channelPool.Return(channel);
+ }
}
private async Task CreateConsumer() where TEvent : DomainEvent where THandler : IDomainEventHandler
@@ -58,10 +105,14 @@ private async Task CreateConsumer(
consumer.ReceivedAsync += async (_, eventArgs) =>
{
- var eventName = eventArgs.RoutingKey;
+ var queueName = GetQueueName();
+
+ using var activity = StartProcessActivity(eventArgs, queueName, eventArgs.BasicProperties, eventArgs.Body.Length);
var message = Encoding.UTF8.GetString(eventArgs.Body.ToArray());
+ activity?.AddEvent(new ActivityEvent("enmeshed.backbone.event_bus.consumer.message_decoded"));
+
try
{
var correlationId = eventArgs.BasicProperties.CorrelationId;
@@ -76,10 +127,10 @@ private async Task CreateConsumer(
}
catch (Exception ex)
{
+ activity?.AddException(ex);
+
await channel.BasicRejectAsync(eventArgs.DeliveryTag, true);
_metrics.IncrementNumberOfProcessingErrors(GetQueueName());
-
- _logger.ErrorWhileProcessingDomainEvent(eventName, ex);
}
};
@@ -88,10 +139,7 @@ private async Task CreateConsumer(
private async Task ProcessEvent(string message) where TEvent : DomainEvent where THandler : IDomainEventHandler
{
- var eventType = typeof(TEvent);
- var eventName = eventType.GetEventName();
-
- _logger.LogDebug("Processing RabbitMQ event: '{EventName}'", eventName);
+ Activity.Current?.AddEvent(new ActivityEvent("enmeshed.backbone.event_bus.consumer.start_processing"));
var domainEvent = JsonSerializer.Deserialize(message);
@@ -102,15 +150,43 @@ private async Task ProcessEvent(string message) where TEvent :
if (scope.ServiceProvider.GetService(handlerType) is not IDomainEventHandler handler)
throw new Exception("Domain event handler could not be resolved from dependency container or it does not implement IDomainEventHandler.");
- var concreteType = typeof(IDomainEventHandler<>).MakeGenericType(eventType);
+ Activity.Current?.AddEvent(new ActivityEvent("enmeshed.backbone.event_bus.consumer.handler_resolved"));
var startedAt = Stopwatch.GetTimestamp();
- await (Task)concreteType.GetMethod("Handle")!.Invoke(handler, [domainEvent])!;
+ using (var handlerActivity = StartHandlerActivity())
+ {
+ try
+ {
+ await (Task)handlerType.GetMethod("Handle")!.Invoke(handler, [domainEvent])!;
+ }
+ catch (Exception ex)
+ {
+ handlerActivity?.AddException(ex);
+ throw;
+ }
+ }
+
_metrics.TrackEventProcessingDuration(startedAt, GetQueueName());
_metrics.IncrementNumberOfHandledEvents(GetQueueName());
}
+ private Activity? StartHandlerActivity() where TEvent : DomainEvent where THandler : IDomainEventHandler
+ {
+ var handlerType = typeof(THandler);
+ var eventType = typeof(TEvent);
+ var activity = EventBusDiagnostics.ACTIVITY_SOURCE.StartActivity($"{CALL_OPERATION_NAME} {handlerType.FullName}", ActivityKind.Internal);
+
+ if (activity == null)
+ return null;
+
+ activity.SetTag("event_bus.event.name", eventType.GetEventName());
+ activity.SetTag("event_bus.event.type", eventType.FullName);
+ activity.SetTag("event_bus.handler.type", handlerType.FullName);
+
+ return activity;
+ }
+
public async Task StartConsuming(CancellationToken cancellationToken)
{
foreach (var subscription in _subscriptionManager)
@@ -130,4 +206,53 @@ public async Task StopConsuming(CancellationToken cancellationToken)
}
}
}
+
+ private Activity? StartProcessActivity(BasicDeliverEventArgs eventArgs, string queueName, IReadOnlyBasicProperties properties, int bodySize)
+ {
+ var parentContext = EventBusDiagnostics.PROPAGATOR.Extract(default,
+ eventArgs.BasicProperties,
+ ExtractTraceContextFromBasicProperties);
+ Baggage.Current = parentContext.Baggage;
+
+ var destinationName = $"{_exchangeName}.{queueName}";
+ var activity = EventBusDiagnostics.ACTIVITY_SOURCE.StartActivity($"{PROCESS_OPERATION_NAME} {destinationName}", ActivityKind.Consumer, parentContext.ActivityContext);
+
+ if (activity == null)
+ return null;
+
+ activity.SetTag("messaging.system", MESSAGING_SYSTEM);
+ activity.SetTag("messaging.operation.name", PROCESS_OPERATION_NAME);
+ activity.SetTag("messaging.operation.type", PROCESS_OPERATION_TYPE);
+ activity.SetTag("messaging.destination.name", destinationName);
+ activity.SetTag("messaging.destination.template", $"{_exchangeName}:{{queueName}}");
+ activity.SetTag("messaging.rabbitmq.destination.routing_key", eventArgs.RoutingKey);
+ activity.SetTag("messaging.rabbitmq.message.delivery_tag", eventArgs.DeliveryTag);
+ activity.SetTag("messaging.message.body.size", bodySize);
+
+ if (!properties.MessageId.IsNullOrEmpty())
+ activity.SetTag("messaging.message.id", properties.MessageId);
+
+ if (!properties.CorrelationId.IsNullOrEmpty())
+ activity.SetTag("messaging.message.conversation_id", properties.CorrelationId);
+
+ return activity;
+ }
+
+ private IEnumerable ExtractTraceContextFromBasicProperties(IReadOnlyBasicProperties props, string key)
+ {
+ if (props.Headers == null || !props.Headers.TryGetValue(key, out var value)) return [];
+
+ if (value is byte[] bytes) return [Encoding.UTF8.GetString(bytes)];
+
+ return [];
+ }
+
+ public static string GetQueueName() where TEvent : DomainEvent where THandler : IDomainEventHandler
+ {
+ var eventHandlerFullName = typeof(THandler).FullName!;
+
+ var moduleName = eventHandlerFullName.Split('.').ElementAt(2);
+
+ return $"{moduleName}.{typeof(TEvent).GetEventName()}";
+ }
}
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMq.Publisher.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMq.Publisher.cs
index 4a89b25b16..e3f4bbb153 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMq.Publisher.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMq.Publisher.cs
@@ -3,53 +3,102 @@
using System.Text.Json;
using Backbone.BuildingBlocks.Domain.Events;
using Backbone.BuildingBlocks.Infrastructure.CorrelationIds;
-using Microsoft.Extensions.Logging;
+using OpenTelemetry;
+using OpenTelemetry.Context.Propagation;
+using Polly.Retry;
using RabbitMQ.Client;
namespace Backbone.BuildingBlocks.Infrastructure.EventBus.RabbitMQ;
public partial class EventBusRabbitMq
{
+ private const int PUBLISH_RETRY_COUNT = 6;
+ private const string PUBLISH_OPERATION_NAME = "publish";
+ private const string SEND_OPERATION_TYPE = "send";
+
+ private readonly AsyncRetryPolicy _publishRetryPolicy;
+
public async Task Publish(DomainEvent @event)
{
var eventName = @event.GetEventName();
-
- _logger.LogInformation("Creating RabbitMQ channel to publish a '{EventName}'.", eventName);
-
var message = JsonSerializer.Serialize(@event, @event.GetType());
-
var body = Encoding.UTF8.GetBytes(message);
_metrics.TrackHandledMessageSize(body.Length);
- await _publishRetryPolicy.ExecuteAsync(async () =>
+ var properties = new BasicProperties
{
- _logger.LogDebug("Publishing a '{EventName}' event to RabbitMQ.", eventName);
+ DeliveryMode = DeliveryModes.Persistent,
+ MessageId = @event.DomainEventId,
+ CorrelationId = CustomLogContext.GetCorrelationId()
+ };
+ using var activity = StartPublishActivity(properties, @event.DomainEventId, eventName, body.Length);
- var channel = await _channelPool.Get();
- var properties = new BasicProperties
- {
- DeliveryMode = DeliveryModes.Persistent,
- MessageId = @event.DomainEventId,
- CorrelationId = CustomLogContext.GetCorrelationId()
- };
+ IChannel? channel = null;
+ await _publishRetryPolicy.ExecuteAsync(async () =>
+ {
try
{
+ channel = await _channelPool.Get();
+
+ activity?.AddEvent(new ActivityEvent("enmeshed.backbone.event_bus.publisher.acquired_channel_for_publish"));
+
var startedAt = Stopwatch.GetTimestamp();
await channel.BasicPublishAsync(_exchangeName, eventName, mandatory: false, properties, body);
- _logger.PublishedDomainEvent();
_metrics.TrackEventPublishingDuration(startedAt);
_metrics.IncrementNumberOfPublishedEvents(eventName);
}
- catch (Exception)
+ catch (Exception ex)
{
_metrics.IncrementNumberOfPublishingErrors(eventName);
+ Activity.Current?.AddException(ex);
throw;
}
+ finally
+ {
+ if (channel != null)
+ _channelPool.Return(channel);
- _channelPool.Return(channel);
+ activity?.AddEvent(new ActivityEvent("enmeshed.backbone.event_bus.publisher.returned_channel"));
+ }
});
}
+
+ private Activity? StartPublishActivity(BasicProperties properties, string messageId, string eventName, int bodySize)
+ {
+ var destinationName = $"{_exchangeName}:{eventName}";
+
+ var activity = EventBusDiagnostics.ACTIVITY_SOURCE.StartActivity($"{PUBLISH_OPERATION_NAME} {destinationName}", ActivityKind.Producer, Activity.Current?.Context ?? default);
+
+ ActivityContext contextToInject = default;
+
+ if (activity != null)
+ contextToInject = activity.Context;
+ else if (Activity.Current != null)
+ contextToInject = Activity.Current.Context;
+
+ EventBusDiagnostics.PROPAGATOR.Inject(new PropagationContext(contextToInject, Baggage.Current), properties, InjectTraceContextIntoProperties);
+
+ if (activity == null)
+ return null;
+
+ activity.SetTag("messaging.system", MESSAGING_SYSTEM);
+ activity.SetTag("messaging.operation.name", PUBLISH_OPERATION_NAME);
+ activity.SetTag("messaging.operation.type", SEND_OPERATION_TYPE);
+ activity.SetTag("messaging.destination.name", destinationName);
+ activity.SetTag("messaging.message.id", messageId);
+ activity.SetTag("messaging.message.body.size", bodySize);
+ activity.SetTag("messaging.destination.template", $"{_exchangeName}:{{eventName}}");
+ activity.SetTag("messaging.rabbitmq.destination.routing_key", eventName);
+
+ return activity;
+ }
+
+ private void InjectTraceContextIntoProperties(IBasicProperties properties, string key, string value)
+ {
+ properties.Headers ??= new Dictionary();
+ properties.Headers[key] = value;
+ }
}
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMq.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMq.cs
index aca59ab97d..4eaed01469 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMq.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMq.cs
@@ -1,10 +1,8 @@
using System.Net.Sockets;
using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Backbone.BuildingBlocks.Domain.Events;
using Backbone.Tooling.Extensions;
using Microsoft.Extensions.Logging;
using Polly;
-using Polly.Retry;
using RabbitMQ.Client;
using RabbitMQ.Client.Exceptions;
@@ -12,9 +10,9 @@ namespace Backbone.BuildingBlocks.Infrastructure.EventBus.RabbitMQ;
public partial class EventBusRabbitMq : IEventBus, IDisposable
{
- private const int PUBLISH_RETRY_COUNT = 6;
private const int CONNECTION_RETRY_COUNT = 6;
- private const int HANDLER_RETRY_COUNT = 5;
+
+ private const string MESSAGING_SYSTEM = "rabbitmq";
private readonly ILogger _logger;
private readonly IServiceProvider _serviceProvider;
@@ -24,10 +22,6 @@ public partial class EventBusRabbitMq : IEventBus, IDisposable
private readonly string _exchangeName;
private readonly EventBusMetrics _metrics;
- private readonly string _deadLetterExchangeName;
- private readonly string _deadLetterQueueName;
- private readonly SubscriptionManager _subscriptionManager = new();
- private readonly AsyncRetryPolicy _publishRetryPolicy;
private EventBusRabbitMq(IConnection connection, ILogger logger, IServiceProvider serviceProvider, string exchangeName, EventBusMetrics metrics)
{
@@ -44,8 +38,7 @@ private EventBusRabbitMq(IConnection connection, ILogger logge
.Or()
.Or()
.WaitAndRetryAsync(PUBLISH_RETRY_COUNT,
- _ => 2.Seconds(),
- (ex, _) => _logger.ErrorOnPublish(ex));
+ _ => 2.Seconds());
_connection.ConnectionShutdownAsync += (_, args) =>
{
@@ -94,50 +87,24 @@ private async Task Init()
private async Task EnsureExchangeExists(string exchangeName, string exchangeType = "direct")
{
+ IChannel? channel = null;
+
try
{
- var channel = await _channelPool.Get();
- await channel.ExchangeDeclarePassiveAsync(exchangeName);
- _channelPool.Return(channel);
+ channel = await _channelPool.Get();
+
+ await channel.ExchangeDeclareAsync(exchangeName, exchangeType, durable: true);
}
- catch (OperationInterruptedException ex)
+ catch (Exception ex)
{
- if (ex.ShutdownReason?.ReplyCode == 404)
- {
- try
- {
- var channel = await _channelPool.Get();
- await channel.ExchangeDeclareAsync(exchangeName, exchangeType, durable: true);
- _channelPool.Return(channel);
- }
- catch (Exception)
- {
- _logger.LogCritical("The exchange '{ExchangeName}' does not exist and could not be created.", exchangeName);
- throw new Exception($"The exchange '{exchangeName}' does not exist and could not be created.");
- }
- }
+ _logger.LogCritical(ex, "The exchange '{ExchangeName}' does not exist and could not be created.", exchangeName);
+ throw new Exception($"The exchange '{exchangeName}' does not exist and could not be created.", ex);
+ }
+ finally
+ {
+ if (channel != null)
+ _channelPool.Return(channel);
}
- }
-
- private async Task EnsureDeadLetterQueueExists()
- {
- var channel = await _channelPool.Get();
-
- await channel.QueueDeclareAsync(_deadLetterQueueName,
- durable: true,
- exclusive: false,
- autoDelete: false,
- arguments: new Dictionary
- {
- { "x-queue-type", "quorum" },
- }
- );
-
- await channel.QueueBindAsync(_deadLetterQueueName, _deadLetterExchangeName, "#");
-
- _logger.LogTrace("Successfully bound dead letter queue.");
-
- _channelPool.Return(channel);
}
public void Dispose()
@@ -145,15 +112,6 @@ public void Dispose()
_channelPool.Dispose();
}
- public static string GetQueueName() where TEvent : DomainEvent where THandler : IDomainEventHandler
- {
- var eventHandlerFullName = typeof(THandler).FullName!;
-
- var moduleName = eventHandlerFullName.Split('.').ElementAt(2);
-
- return $"{moduleName}.{typeof(TEvent).GetEventName()}";
- }
-
public bool IsConnected => _connection.IsOpen;
}
@@ -169,7 +127,7 @@ internal static partial class EventBusRabbitMqLogs
[LoggerMessage(
EventId = 900001,
EventName = "EventBusRabbitMQ.ConnectionShutdown",
- Level = LogLevel.Error,
+ Level = LogLevel.Warning,
Message = "A shutdown of the connection was initiated. Initiator: {shutdownInitiator}, ReplyCode: {replyCode}, ReplyText: {replyText}")]
public static partial void ConnectionShutdown(this ILogger logger, ShutdownInitiator shutdownInitiator, ushort replyCode, string replyText);
@@ -186,25 +144,4 @@ internal static partial class EventBusRabbitMqLogs
Level = LogLevel.Information,
Message = "The connection was successfully recovered.")]
public static partial void RecoverySucceeded(this ILogger logger);
-
- [LoggerMessage(
- EventId = 411326,
- EventName = "EventBusRabbitMQ.ErrorOnPublish",
- Level = LogLevel.Warning,
- Message = "There was an error while trying to publish an event.")]
- public static partial void ErrorOnPublish(this ILogger logger, Exception exception);
-
- [LoggerMessage(
- EventId = 585231,
- EventName = "EventBusRabbitMQ.PublishedDomainEvent",
- Level = LogLevel.Debug,
- Message = "Successfully published the event.")]
- public static partial void PublishedDomainEvent(this ILogger logger);
-
- [LoggerMessage(
- EventId = 702822,
- EventName = "EventBusRabbitMQ.ErrorWhileProcessingDomainEvent",
- Level = LogLevel.Error,
- Message = "An error occurred while processing the domain event of type '{eventName}'.")]
- public static partial void ErrorWhileProcessingDomainEvent(this ILogger logger, string eventName, Exception exception);
}
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccountContainerClientFactory.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccountContainerClientFactory.cs
index a650447f63..b832333223 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccountContainerClientFactory.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccountContainerClientFactory.cs
@@ -1,4 +1,3 @@
-using Azure;
using Azure.Storage.Blobs;
using Azure.Storage.Blobs.Models;
using Microsoft.Extensions.Logging;
@@ -39,17 +38,9 @@ public BlobContainerClient GetContainerClient(string containerName)
private BlobContainerClient CreateContainerClient(string containerName)
{
var newContainer = new BlobContainerClient(_configuration.ConnectionString, containerName);
- newContainer.CreateIfNotExists();
- try
- {
- newContainer.SetAccessPolicy(PublicAccessType.Blob);
- }
- catch (RequestFailedException ex)
- {
- _logger.LogInformation(ex,
- "An error was thrown while trying to set the access policy on the BlobContainerClient. This error is ignored.");
- }
+ if (!newContainer.Exists())
+ newContainer.Create(PublicAccessType.Blob);
return newContainer;
}
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/S3/S3BlobStorage.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/S3/S3BlobStorage.cs
index 8262b9e68e..4a78e65b73 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/S3/S3BlobStorage.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/S3/S3BlobStorage.cs
@@ -122,8 +122,6 @@ private async Task UploadChangedBlobs()
foreach (var blob in changedBlobs)
{
- await EnsureKeyDoesNotExist(blob.Folder, blob.Name);
-
using var memoryStream = new MemoryStream(blob.Content);
try
@@ -134,7 +132,8 @@ private async Task UploadChangedBlobs()
{
InputStream = memoryStream,
Key = blob.Name,
- BucketName = blob.Folder
+ BucketName = blob.Folder,
+ IfNoneMatch = "*"
};
var transferUtility = new TransferUtility(_s3Client);
@@ -154,26 +153,6 @@ private async Task UploadChangedBlobs()
}
}
- private async Task EnsureKeyDoesNotExist(string folder, string key)
- {
- try
- {
- var request = new GetObjectRequest
- {
- BucketName = folder,
- Key = key
- };
-
- await _s3Client.GetObjectAsync(request);
-
- _logger.LogError("A blob with key '{blobName}' already exists.", key);
- throw new BlobAlreadyExistsException(key);
- }
- catch (AmazonS3Exception ex) when (ex.StatusCode == HttpStatusCode.NotFound)
- {
- }
- }
-
private async Task DeleteRemovedBlobs()
{
_logger.LogTrace("Deleting '{removedBlobsCount}' blobs...", _removedBlobs.Count);
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/packages.lock.json b/BuildingBlocks/src/BuildingBlocks.Infrastructure/packages.lock.json
index 2a24f5193a..d303f57b00 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/packages.lock.json
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/packages.lock.json
@@ -214,6 +214,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "Direct",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "Direct",
"requested": "[8.7.0, 8.7.0]",
diff --git a/BuildingBlocks/src/UnitTestTools/packages.lock.json b/BuildingBlocks/src/UnitTestTools/packages.lock.json
index a22c236624..54a1a66468 100644
--- a/BuildingBlocks/src/UnitTestTools/packages.lock.json
+++ b/BuildingBlocks/src/UnitTestTools/packages.lock.json
@@ -692,6 +692,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1005,6 +1006,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"RabbitMQ.Client": {
"type": "CentralTransitive",
"requested": "[7.2.1, 7.2.1]",
diff --git a/BuildingBlocks/test/BuildingBlocks.API.Tests/BuildingBlocks.API.Tests.csproj b/BuildingBlocks/test/BuildingBlocks.API.Tests/BuildingBlocks.API.Tests.csproj
index 55436455cd..e1c5dcf8ee 100644
--- a/BuildingBlocks/test/BuildingBlocks.API.Tests/BuildingBlocks.API.Tests.csproj
+++ b/BuildingBlocks/test/BuildingBlocks.API.Tests/BuildingBlocks.API.Tests.csproj
@@ -11,6 +11,7 @@
+
diff --git a/BuildingBlocks/test/BuildingBlocks.API.Tests/Mvc/Middleware/UserContextBaggageMiddlewareTests.cs b/BuildingBlocks/test/BuildingBlocks.API.Tests/Mvc/Middleware/UserContextBaggageMiddlewareTests.cs
new file mode 100644
index 0000000000..3b357bee89
--- /dev/null
+++ b/BuildingBlocks/test/BuildingBlocks.API.Tests/Mvc/Middleware/UserContextBaggageMiddlewareTests.cs
@@ -0,0 +1,107 @@
+using Backbone.BuildingBlocks.API.Mvc.Middleware;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Microsoft.AspNetCore.Http;
+using OpenTelemetry;
+
+namespace Backbone.BuildingBlocks.API.Tests.Mvc.Middleware;
+
+public class UserContextBaggageMiddlewareTests
+{
+ [Fact]
+ public async Task InvokeAsync_SetsUserContextValuesAsBaggage()
+ {
+ var identityAddress = CreateRandomIdentityAddress();
+ var deviceId = CreateRandomDeviceId();
+ var userContext = new TestUserContext(identityAddress, deviceId, "client-id", "username");
+ var previousBaggage = Baggage.Current;
+
+ try
+ {
+ Baggage.ClearBaggage();
+
+ var middleware = new UserContextBaggageMiddleware(_ =>
+ {
+ Baggage.GetBaggage("deviceId").ShouldBe(deviceId.Value);
+ Baggage.GetBaggage("identityAddress").ShouldBe(identityAddress.Value);
+ Baggage.GetBaggage("clientId").ShouldBe("client-id");
+ Baggage.GetBaggage("username").ShouldBe("username");
+
+ return Task.CompletedTask;
+ });
+
+ await middleware.InvokeAsync(new DefaultHttpContext(), userContext);
+ }
+ finally
+ {
+ Baggage.Current = previousBaggage;
+ }
+ }
+
+ private class TestUserContext : IUserContext
+ {
+ private readonly IdentityAddress? _address;
+ private readonly DeviceId? _deviceId;
+ private readonly string? _clientId;
+ private readonly string? _username;
+
+ public TestUserContext(IdentityAddress? address, DeviceId? deviceId, string? clientId, string? username)
+ {
+ _address = address;
+ _deviceId = deviceId;
+ _clientId = clientId;
+ _username = username;
+ }
+
+ public IdentityAddress GetAddress()
+ {
+ return GetAddressOrNull() ?? throw new NotFoundException();
+ }
+
+ public IdentityAddress? GetAddressOrNull()
+ {
+ return _address;
+ }
+
+ public DeviceId GetDeviceId()
+ {
+ return GetDeviceIdOrNull() ?? throw new NotFoundException();
+ }
+
+ public DeviceId? GetDeviceIdOrNull()
+ {
+ return _deviceId;
+ }
+
+ public string GetUserId()
+ {
+ return GetUserIdOrNull() ?? throw new NotFoundException();
+ }
+
+ public string? GetUserIdOrNull()
+ {
+ return null;
+ }
+
+ public string GetUsername()
+ {
+ return GetUsernameOrNull() ?? throw new NotFoundException();
+ }
+
+ public string? GetUsernameOrNull()
+ {
+ return _username;
+ }
+
+ public string GetClientId()
+ {
+ return GetClientIdOrNull() ?? throw new NotFoundException();
+ }
+
+ public string? GetClientIdOrNull()
+ {
+ return _clientId;
+ }
+ }
+}
diff --git a/BuildingBlocks/test/BuildingBlocks.API.Tests/UnitTest1.cs b/BuildingBlocks/test/BuildingBlocks.API.Tests/UnitTest1.cs
deleted file mode 100644
index 792c7d0599..0000000000
--- a/BuildingBlocks/test/BuildingBlocks.API.Tests/UnitTest1.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Xunit;
-
-namespace Backbone.BuildingBlocks.API.Tests;
-
-public class UnitTest1
-{
- [Fact]
- public void Test1()
- {
- }
-}
diff --git a/BuildingBlocks/test/BuildingBlocks.API.Tests/packages.lock.json b/BuildingBlocks/test/BuildingBlocks.API.Tests/packages.lock.json
index 9edb155c25..adf5bb76e0 100644
--- a/BuildingBlocks/test/BuildingBlocks.API.Tests/packages.lock.json
+++ b/BuildingBlocks/test/BuildingBlocks.API.Tests/packages.lock.json
@@ -18,6 +18,16 @@
"Microsoft.TestPlatform.TestHost": "18.8.1"
}
},
+ "Shouldly": {
+ "type": "Direct",
+ "requested": "[4.3.0, 4.3.0]",
+ "resolved": "4.3.0",
+ "contentHash": "sDetrWXrl6YXZ4HeLsdBoNk3uIa7K+V4uvIJ+cqdRa5DrFxeTED7VkjoxCuU1kJWpUuBDZz2QXFzSxBtVXLwRQ==",
+ "dependencies": {
+ "DiffEngine": "11.3.0",
+ "EmptyFiles": "4.4.0"
+ }
+ },
"xunit.v3.mtp-v2": {
"type": "Direct",
"requested": "[3.2.2, 3.2.2]",
@@ -90,6 +100,20 @@
"System.Diagnostics.EventLog": "6.0.0"
}
},
+ "DiffEngine": {
+ "type": "Transitive",
+ "resolved": "11.3.0",
+ "contentHash": "k0ZgZqd09jLZQjR8FyQbSQE86Q7QZnjEzq1LPHtj1R2AoWO8sjV5x+jlSisL7NZAbUOI4y+7Bog8gkr9WIRBGw==",
+ "dependencies": {
+ "EmptyFiles": "4.4.0",
+ "System.Management": "6.0.1"
+ }
+ },
+ "EmptyFiles": {
+ "type": "Transitive",
+ "resolved": "4.4.0",
+ "contentHash": "gwJEfIGS7FhykvtZoscwXj/XwW+mJY6UbAZk+qtLKFUGWC95kfKXnj8VkxsZQnWBxJemM/q664rGLN5nf+OHZw=="
+ },
"Google.Api.CommonProtos": {
"type": "Transitive",
"resolved": "2.17.0",
@@ -317,6 +341,20 @@
"resolved": "10.0.10",
"contentHash": "2gLDordUCGf3aNOOuqtTbP5mxhiP9nk6TnvGiE3RnqT891O+Zf/qKu1PIREubs1M16A0SImr4vULBfU5BTDs1Q=="
},
+ "Microsoft.EntityFrameworkCore.Sqlite.Core": {
+ "type": "Transitive",
+ "resolved": "10.0.10",
+ "contentHash": "YbVWMIouzwTKBiLms8boa7xeRT88wI14R1msv3XExFk9n0/sa8nU7MwDa1CKtfLGMJs7O7QWuS9/xhcQ72AD2A==",
+ "dependencies": {
+ "Microsoft.Data.Sqlite.Core": "10.0.10",
+ "Microsoft.EntityFrameworkCore.Relational": "10.0.10",
+ "Microsoft.Extensions.Caching.Memory": "10.0.10",
+ "Microsoft.Extensions.Configuration.Abstractions": "10.0.10",
+ "Microsoft.Extensions.DependencyModel": "10.0.10",
+ "Microsoft.Extensions.Logging": "10.0.10",
+ "SQLitePCLRaw.core": "2.1.11"
+ }
+ },
"Microsoft.EntityFrameworkCore.SqlServer.Abstractions": {
"type": "Transitive",
"resolved": "10.0.3",
@@ -432,6 +470,11 @@
"Microsoft.Extensions.Hosting.Abstractions": "10.0.10"
}
},
+ "Microsoft.Extensions.DependencyModel": {
+ "type": "Transitive",
+ "resolved": "10.0.10",
+ "contentHash": "rfZA1RjR021RPqSmIPovfz2aOd79TGqJ9BengbjnzIISOVwjLmuSDnhCMmiY/1c6iYvGolQ1iNGzkav0u11XEA=="
+ },
"Microsoft.Extensions.Diagnostics": {
"type": "Transitive",
"resolved": "10.0.10",
@@ -992,11 +1035,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1072,6 +1110,28 @@
"Serilog": "4.2.0"
}
},
+ "SQLitePCLRaw.bundle_e_sqlite3": {
+ "type": "Transitive",
+ "resolved": "2.1.11",
+ "contentHash": "DC4nA7yWnf4UZdgJDF+9Mus4/cb0Y3Sfgi3gDnAoKNAIBwzkskNAbNbyu+u4atT0ruVlZNJfwZmwiEwE5oz9LQ==",
+ "dependencies": {
+ "SQLitePCLRaw.lib.e_sqlite3": "2.1.11",
+ "SQLitePCLRaw.provider.e_sqlite3": "2.1.11"
+ }
+ },
+ "SQLitePCLRaw.core": {
+ "type": "Transitive",
+ "resolved": "2.1.11",
+ "contentHash": "PK0GLFkfhZzLQeR3PJf71FmhtHox+U3vcY6ZtswoMjrefkB9k6ErNJEnwXqc5KgXDSjige2XXrezqS39gkpQKA=="
+ },
+ "SQLitePCLRaw.provider.e_sqlite3": {
+ "type": "Transitive",
+ "resolved": "2.1.11",
+ "contentHash": "Y/0ZkR+r0Cg3DQFuCl1RBnv/tmxpIZRU3HUvelPw6MVaKHwYYR8YNvgs0vuNuXCMvlyJ+Fh88U1D4tah1tt6qw==",
+ "dependencies": {
+ "SQLitePCLRaw.core": "2.1.11"
+ }
+ },
"Swashbuckle.AspNetCore.Swagger": {
"type": "Transitive",
"resolved": "10.2.3",
@@ -1244,9 +1304,11 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.Console": "[1.17.0, )",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1307,6 +1369,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1398,6 +1461,20 @@
"Microsoft.Extensions.Options": "[10.0.10, 10.0.10]"
}
},
+ "Backbone.UnitTestTools": {
+ "type": "Project",
+ "dependencies": {
+ "Backbone.BuildingBlocks.Infrastructure": "[1.0.0, )",
+ "Backbone.DevelopmentKit.Identity": "[1.0.0, )",
+ "Backbone.Tooling": "[1.0.0, )",
+ "FakeItEasy": "[9.0.1, 9.0.1]",
+ "FluentValidation": "[12.1.1, 12.1.1]",
+ "MediatR": "[12.5.0, 12.5.0]",
+ "Microsoft.EntityFrameworkCore.Sqlite": "[10.0.10, 10.0.10]",
+ "Polly": "[8.7.0, 8.7.0]",
+ "Shouldly": "[4.3.0, 4.3.0]"
+ }
+ },
"Asp.Versioning.Mvc": {
"type": "CentralTransitive",
"requested": "[10.0.1, 10.0.1]",
@@ -1523,6 +1600,15 @@
"NetTopologySuite.IO.SqlServerBytes": "2.1.0"
}
},
+ "FakeItEasy": {
+ "type": "CentralTransitive",
+ "requested": "[9.0.1, 9.0.1]",
+ "resolved": "9.0.1",
+ "contentHash": "cqM6hKjoAmjuh+GzKLX7gcqCDownqffmQ3KSBMdFowCZgwQMXpu1jlsJE649FsrMF5Ea5kYpuokGTuOaUrz/2w==",
+ "dependencies": {
+ "Castle.Core": "5.2.1"
+ }
+ },
"FirebaseAdmin": {
"type": "CentralTransitive",
"requested": "[3.6.0, 3.6.0]",
@@ -1604,6 +1690,15 @@
"Microsoft.Extensions.Identity.Stores": "10.0.10"
}
},
+ "Microsoft.Data.Sqlite.Core": {
+ "type": "CentralTransitive",
+ "requested": "[10.0.10, 10.0.10]",
+ "resolved": "10.0.10",
+ "contentHash": "TPCs0ldm7AWqcKmp6f/Xr+14sat7hx4rHfRlS4RgCURBH2thEWbAKEyX7cCWr63zVJVOJIJZTg2cBiUXa8ys6g==",
+ "dependencies": {
+ "SQLitePCLRaw.core": "2.1.11"
+ }
+ },
"Microsoft.EntityFrameworkCore": {
"type": "CentralTransitive",
"requested": "[10.0.10, 10.0.10]",
@@ -1646,6 +1741,21 @@
"Microsoft.Extensions.Logging": "10.0.10"
}
},
+ "Microsoft.EntityFrameworkCore.Sqlite": {
+ "type": "CentralTransitive",
+ "requested": "[10.0.10, 10.0.10]",
+ "resolved": "10.0.10",
+ "contentHash": "kzg9MuQNJvZQxAU+piSkEzc7/1tpW6n1nVSGGMObu2GgxLK8Nf+6fvZundaznTZ+O2KhfPZ8HFNCzMH3PWDUmA==",
+ "dependencies": {
+ "Microsoft.EntityFrameworkCore.Sqlite.Core": "10.0.10",
+ "Microsoft.Extensions.Caching.Memory": "10.0.10",
+ "Microsoft.Extensions.Configuration.Abstractions": "10.0.10",
+ "Microsoft.Extensions.DependencyModel": "10.0.10",
+ "Microsoft.Extensions.Logging": "10.0.10",
+ "SQLitePCLRaw.bundle_e_sqlite3": "2.1.11",
+ "SQLitePCLRaw.core": "2.1.11"
+ }
+ },
"Microsoft.EntityFrameworkCore.SqlServer": {
"type": "CentralTransitive",
"requested": "[10.0.10, 10.0.10]",
@@ -1894,13 +2004,28 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.Console": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "sSoCa2DMCkw7tQabiVduwKWVyg9ungCiwh+0JuDPODF6CuYvR+OCuJwqcbzJsTMecWQrbgL8OYWAt3GC5tJGhw==",
+ "dependencies": {
+ "OpenTelemetry": "1.17.0"
+ }
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -1922,6 +2047,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
@@ -2001,6 +2137,12 @@
"resolved": "5.6.3",
"contentHash": "ayL730f1gdQVYmFFLKSX83QcoltyKSMBsV94qfCBpZHMaJz/e3ALuXKZDD8SkseWbNHxBe0HxLRBe5OOpQ9HpA=="
},
+ "SQLitePCLRaw.lib.e_sqlite3": {
+ "type": "CentralTransitive",
+ "requested": "[2.1.12, 2.1.12]",
+ "resolved": "2.1.12",
+ "contentHash": "fWi8Dbknuhgg72fWinIdjXVaqO1hHL4YBBwVLnr7e1c9TAZwJ0QE38j9syW1hwx6HaqEVTwI+O07WPdZn8Rp0w=="
+ },
"Swashbuckle.AspNetCore": {
"type": "CentralTransitive",
"requested": "[10.2.3, 10.2.3]",
@@ -2097,6 +2239,12 @@
"resolved": "10.0.10",
"contentHash": "KG8t5RHczdgB3IWvRndpI0nE1DSo7ikDYSDbITxfgRFyIvnYiKzuPjaZOsPnwFQ1aOGUl9sEulJul9wlHLEUoA=="
},
+ "SQLitePCLRaw.lib.e_sqlite3": {
+ "type": "CentralTransitive",
+ "requested": "[2.1.12, 2.1.12]",
+ "resolved": "2.1.12",
+ "contentHash": "fWi8Dbknuhgg72fWinIdjXVaqO1hHL4YBBwVLnr7e1c9TAZwJ0QE38j9syW1hwx6HaqEVTwI+O07WPdZn8Rp0w=="
+ },
"System.Data.SqlClient": {
"type": "CentralTransitive",
"requested": "[4.9.1, 4.9.1]",
@@ -2181,6 +2329,12 @@
"resolved": "10.0.10",
"contentHash": "KG8t5RHczdgB3IWvRndpI0nE1DSo7ikDYSDbITxfgRFyIvnYiKzuPjaZOsPnwFQ1aOGUl9sEulJul9wlHLEUoA=="
},
+ "SQLitePCLRaw.lib.e_sqlite3": {
+ "type": "CentralTransitive",
+ "requested": "[2.1.12, 2.1.12]",
+ "resolved": "2.1.12",
+ "contentHash": "fWi8Dbknuhgg72fWinIdjXVaqO1hHL4YBBwVLnr7e1c9TAZwJ0QE38j9syW1hwx6HaqEVTwI+O07WPdZn8Rp0w=="
+ },
"System.Data.SqlClient": {
"type": "CentralTransitive",
"requested": "[4.9.1, 4.9.1]",
@@ -2265,6 +2419,12 @@
"resolved": "10.0.10",
"contentHash": "KG8t5RHczdgB3IWvRndpI0nE1DSo7ikDYSDbITxfgRFyIvnYiKzuPjaZOsPnwFQ1aOGUl9sEulJul9wlHLEUoA=="
},
+ "SQLitePCLRaw.lib.e_sqlite3": {
+ "type": "CentralTransitive",
+ "requested": "[2.1.12, 2.1.12]",
+ "resolved": "2.1.12",
+ "contentHash": "fWi8Dbknuhgg72fWinIdjXVaqO1hHL4YBBwVLnr7e1c9TAZwJ0QE38j9syW1hwx6HaqEVTwI+O07WPdZn8Rp0w=="
+ },
"System.Data.SqlClient": {
"type": "CentralTransitive",
"requested": "[4.9.1, 4.9.1]",
@@ -2349,6 +2509,12 @@
"resolved": "10.0.10",
"contentHash": "KG8t5RHczdgB3IWvRndpI0nE1DSo7ikDYSDbITxfgRFyIvnYiKzuPjaZOsPnwFQ1aOGUl9sEulJul9wlHLEUoA=="
},
+ "SQLitePCLRaw.lib.e_sqlite3": {
+ "type": "CentralTransitive",
+ "requested": "[2.1.12, 2.1.12]",
+ "resolved": "2.1.12",
+ "contentHash": "fWi8Dbknuhgg72fWinIdjXVaqO1hHL4YBBwVLnr7e1c9TAZwJ0QE38j9syW1hwx6HaqEVTwI+O07WPdZn8Rp0w=="
+ },
"System.Data.SqlClient": {
"type": "CentralTransitive",
"requested": "[4.9.1, 4.9.1]",
diff --git a/BuildingBlocks/test/BuildingBlocks.Application.Tests/packages.lock.json b/BuildingBlocks/test/BuildingBlocks.Application.Tests/packages.lock.json
index a62fbd456c..a1127661b4 100644
--- a/BuildingBlocks/test/BuildingBlocks.Application.Tests/packages.lock.json
+++ b/BuildingBlocks/test/BuildingBlocks.Application.Tests/packages.lock.json
@@ -904,6 +904,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1329,6 +1330,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/packages.lock.json b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/packages.lock.json
index 6d19f723e4..5d02e3f788 100644
--- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/packages.lock.json
+++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/packages.lock.json
@@ -744,6 +744,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1012,6 +1013,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/BuildingBlocks/test/Crypto.Tests/packages.lock.json b/BuildingBlocks/test/Crypto.Tests/packages.lock.json
index b81b61a08b..be17c6caba 100644
--- a/BuildingBlocks/test/Crypto.Tests/packages.lock.json
+++ b/BuildingBlocks/test/Crypto.Tests/packages.lock.json
@@ -780,6 +780,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1169,6 +1170,12 @@
"libsodium": "[1.0.22, 1.0.23)"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/BuildingBlocks/test/DevelopmentKit.Identity.Tests/packages.lock.json b/BuildingBlocks/test/DevelopmentKit.Identity.Tests/packages.lock.json
index 5e8d5734df..49a49b165e 100644
--- a/BuildingBlocks/test/DevelopmentKit.Identity.Tests/packages.lock.json
+++ b/BuildingBlocks/test/DevelopmentKit.Identity.Tests/packages.lock.json
@@ -775,6 +775,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1142,6 +1143,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/BuildingBlocks/test/Tooling.Tests/packages.lock.json b/BuildingBlocks/test/Tooling.Tests/packages.lock.json
index 5e8d5734df..49a49b165e 100644
--- a/BuildingBlocks/test/Tooling.Tests/packages.lock.json
+++ b/BuildingBlocks/test/Tooling.Tests/packages.lock.json
@@ -775,6 +775,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1142,6 +1143,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Common/src/Common.Infrastructure/packages.lock.json b/Common/src/Common.Infrastructure/packages.lock.json
index 4043a27961..8d45412b7d 100644
--- a/Common/src/Common.Infrastructure/packages.lock.json
+++ b/Common/src/Common.Infrastructure/packages.lock.json
@@ -605,6 +605,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -897,6 +898,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"RabbitMQ.Client": {
"type": "CentralTransitive",
"requested": "[7.2.1, 7.2.1]",
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 847e4a5795..cafdd86dfc 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -69,10 +69,11 @@
-
-
+
+
+
diff --git a/Modules/Announcements/src/Announcements.Application/Announcements/Commands/ExecuteHousekeeping/Handler.cs b/Modules/Announcements/src/Announcements.Application/Announcements/Commands/ExecuteHousekeeping/Handler.cs
index e77c894acb..6bfc93c7bd 100644
--- a/Modules/Announcements/src/Announcements.Application/Announcements/Commands/ExecuteHousekeeping/Handler.cs
+++ b/Modules/Announcements/src/Announcements.Application/Announcements/Commands/ExecuteHousekeeping/Handler.cs
@@ -1,21 +1,17 @@
-using System.Diagnostics;
-using Backbone.BuildingBlocks.Application.Housekeeping;
+using Backbone.BuildingBlocks.Application.Housekeeping;
using Backbone.Modules.Announcements.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Announcements.Domain.Entities;
using MediatR;
-using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Announcements.Application.Announcements.Commands.ExecuteHousekeeping;
public class Handler : IRequestHandler
{
private readonly IAnnouncementsRepository _announcementsRepository;
- private readonly ILogger _logger;
- public Handler(IAnnouncementsRepository announcementsRepository, ILogger logger)
+ public Handler(IAnnouncementsRepository announcementsRepository)
{
_announcementsRepository = announcementsRepository;
- _logger = logger;
}
public async Task Handle(ExecuteHousekeepingCommand request, CancellationToken cancellationToken)
@@ -25,10 +21,6 @@ public async Task Handle(ExecuteHousekeepingCommand request, CancellationToken c
private async Task DeleteAnnouncements(CancellationToken cancellationToken)
{
- var stopwatch = Stopwatch.StartNew();
- var numberOfDeletedItems = await _announcementsRepository.Delete(Announcement.CanBeCleanedUp, cancellationToken);
- stopwatch.Stop();
-
- _logger.DataDeleted(numberOfDeletedItems, "announcements", stopwatch.ElapsedMilliseconds);
+ await HousekeepingTelemetry.TrackItemDeletion("announcements", ct => _announcementsRepository.Delete(Announcement.CanBeCleanedUp, ct), cancellationToken);
}
}
diff --git a/Modules/Announcements/src/Announcements.Application/packages.lock.json b/Modules/Announcements/src/Announcements.Application/packages.lock.json
index a1549fdf1b..aab6490e33 100644
--- a/Modules/Announcements/src/Announcements.Application/packages.lock.json
+++ b/Modules/Announcements/src/Announcements.Application/packages.lock.json
@@ -717,6 +717,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1109,6 +1110,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Announcements/src/Announcements.Infrastructure.Database.Postgres/packages.lock.json b/Modules/Announcements/src/Announcements.Infrastructure.Database.Postgres/packages.lock.json
index 95c663af8c..2fba97ac90 100644
--- a/Modules/Announcements/src/Announcements.Infrastructure.Database.Postgres/packages.lock.json
+++ b/Modules/Announcements/src/Announcements.Infrastructure.Database.Postgres/packages.lock.json
@@ -707,6 +707,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1129,6 +1130,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Announcements/src/Announcements.Infrastructure.Database.SqlServer/packages.lock.json b/Modules/Announcements/src/Announcements.Infrastructure.Database.SqlServer/packages.lock.json
index 95c663af8c..2fba97ac90 100644
--- a/Modules/Announcements/src/Announcements.Infrastructure.Database.SqlServer/packages.lock.json
+++ b/Modules/Announcements/src/Announcements.Infrastructure.Database.SqlServer/packages.lock.json
@@ -707,6 +707,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1129,6 +1130,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Announcements/src/Announcements.Infrastructure/packages.lock.json b/Modules/Announcements/src/Announcements.Infrastructure/packages.lock.json
index 63c6b88e90..229e1cf241 100644
--- a/Modules/Announcements/src/Announcements.Infrastructure/packages.lock.json
+++ b/Modules/Announcements/src/Announcements.Infrastructure/packages.lock.json
@@ -749,6 +749,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1117,6 +1118,12 @@
"Microsoft.Extensions.Primitives": "10.0.10"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Announcements/src/Announcements.Module/packages.lock.json b/Modules/Announcements/src/Announcements.Module/packages.lock.json
index f04a654c62..f383c2d44d 100644
--- a/Modules/Announcements/src/Announcements.Module/packages.lock.json
+++ b/Modules/Announcements/src/Announcements.Module/packages.lock.json
@@ -917,11 +917,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1112,9 +1107,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1175,6 +1171,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1802,13 +1799,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -1830,6 +1833,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Modules/Announcements/test/Announcements.Application.Tests/packages.lock.json b/Modules/Announcements/test/Announcements.Application.Tests/packages.lock.json
index a9f455d2fc..1e85922241 100644
--- a/Modules/Announcements/test/Announcements.Application.Tests/packages.lock.json
+++ b/Modules/Announcements/test/Announcements.Application.Tests/packages.lock.json
@@ -928,6 +928,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1385,6 +1386,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Announcements/test/Announcements.Domain.Tests/packages.lock.json b/Modules/Announcements/test/Announcements.Domain.Tests/packages.lock.json
index c255df051d..08cc489eef 100644
--- a/Modules/Announcements/test/Announcements.Domain.Tests/packages.lock.json
+++ b/Modules/Announcements/test/Announcements.Domain.Tests/packages.lock.json
@@ -775,6 +775,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1156,6 +1157,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Challenges/src/Challenges.Application/Challenges/Commands/ExecuteHousekeeping/Handler.cs b/Modules/Challenges/src/Challenges.Application/Challenges/Commands/ExecuteHousekeeping/Handler.cs
index b535c821e3..8b722ecb5c 100644
--- a/Modules/Challenges/src/Challenges.Application/Challenges/Commands/ExecuteHousekeeping/Handler.cs
+++ b/Modules/Challenges/src/Challenges.Application/Challenges/Commands/ExecuteHousekeeping/Handler.cs
@@ -1,21 +1,17 @@
-using System.Diagnostics;
-using Backbone.BuildingBlocks.Application.Housekeeping;
+using Backbone.BuildingBlocks.Application.Housekeeping;
using Backbone.Modules.Challenges.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Challenges.Domain.Entities;
using MediatR;
-using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Challenges.Application.Challenges.Commands.ExecuteHousekeeping;
public class Handler : IRequestHandler
{
private readonly IChallengesRepository _challengesRepository;
- private readonly ILogger _logger;
- public Handler(IChallengesRepository challengesRepository, ILogger logger)
+ public Handler(IChallengesRepository challengesRepository)
{
_challengesRepository = challengesRepository;
- _logger = logger;
}
public async Task Handle(ExecuteHousekeepingCommand request, CancellationToken cancellationToken)
@@ -25,10 +21,6 @@ public async Task Handle(ExecuteHousekeepingCommand request, CancellationToken c
private async Task DeleteChallenges(CancellationToken cancellationToken)
{
- var stopwatch = Stopwatch.StartNew();
- var numberOfDeletedItems = await _challengesRepository.Delete(Challenge.CanBeCleanedUp, cancellationToken);
- stopwatch.Stop();
-
- _logger.DataDeleted(numberOfDeletedItems, "challenges", stopwatch.ElapsedMilliseconds);
+ await HousekeepingTelemetry.TrackItemDeletion("challenges", ct => _challengesRepository.Delete(Challenge.CanBeCleanedUp, ct), cancellationToken);
}
}
diff --git a/Modules/Challenges/src/Challenges.Application/packages.lock.json b/Modules/Challenges/src/Challenges.Application/packages.lock.json
index 94bb56581b..07deb20eaf 100644
--- a/Modules/Challenges/src/Challenges.Application/packages.lock.json
+++ b/Modules/Challenges/src/Challenges.Application/packages.lock.json
@@ -723,6 +723,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1102,6 +1103,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Challenges/src/Challenges.Infrastructure.Database.Postgres/packages.lock.json b/Modules/Challenges/src/Challenges.Infrastructure.Database.Postgres/packages.lock.json
index 0e431093ac..c7305d7bcb 100644
--- a/Modules/Challenges/src/Challenges.Infrastructure.Database.Postgres/packages.lock.json
+++ b/Modules/Challenges/src/Challenges.Infrastructure.Database.Postgres/packages.lock.json
@@ -707,6 +707,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1123,6 +1124,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Challenges/src/Challenges.Infrastructure.Database.SqlServer/packages.lock.json b/Modules/Challenges/src/Challenges.Infrastructure.Database.SqlServer/packages.lock.json
index 0e431093ac..c7305d7bcb 100644
--- a/Modules/Challenges/src/Challenges.Infrastructure.Database.SqlServer/packages.lock.json
+++ b/Modules/Challenges/src/Challenges.Infrastructure.Database.SqlServer/packages.lock.json
@@ -707,6 +707,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1123,6 +1124,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Challenges/src/Challenges.Infrastructure/packages.lock.json b/Modules/Challenges/src/Challenges.Infrastructure/packages.lock.json
index e1481e1406..e9da05fd7e 100644
--- a/Modules/Challenges/src/Challenges.Infrastructure/packages.lock.json
+++ b/Modules/Challenges/src/Challenges.Infrastructure/packages.lock.json
@@ -743,6 +743,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1111,6 +1112,12 @@
"Microsoft.Extensions.Primitives": "10.0.10"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Challenges/src/Challenges.Module/packages.lock.json b/Modules/Challenges/src/Challenges.Module/packages.lock.json
index 2d0c70ffb7..40eb8a9d32 100644
--- a/Modules/Challenges/src/Challenges.Module/packages.lock.json
+++ b/Modules/Challenges/src/Challenges.Module/packages.lock.json
@@ -917,11 +917,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1112,9 +1107,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1175,6 +1171,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1802,13 +1799,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -1830,6 +1833,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Modules/Challenges/test/Challenges.Application.Tests/packages.lock.json b/Modules/Challenges/test/Challenges.Application.Tests/packages.lock.json
index becd21b3a4..cfe37ec63f 100644
--- a/Modules/Challenges/test/Challenges.Application.Tests/packages.lock.json
+++ b/Modules/Challenges/test/Challenges.Application.Tests/packages.lock.json
@@ -913,6 +913,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1367,6 +1368,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Devices/src/Devices.Application/Devices/Commands/ExecuteHousekeeping/Handler.cs b/Modules/Devices/src/Devices.Application/Devices/Commands/ExecuteHousekeeping/Handler.cs
index 6aa8a93cc3..17c6931456 100644
--- a/Modules/Devices/src/Devices.Application/Devices/Commands/ExecuteHousekeeping/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Devices/Commands/ExecuteHousekeeping/Handler.cs
@@ -1,21 +1,17 @@
-using System.Diagnostics;
-using Backbone.BuildingBlocks.Application.Housekeeping;
+using Backbone.BuildingBlocks.Application.Housekeeping;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Entities.Identities;
using MediatR;
-using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Devices.Application.Devices.Commands.ExecuteHousekeeping;
public class Handler : IRequestHandler
{
private readonly IIdentitiesRepository _identitiesRepository;
- private readonly ILogger _logger;
- public Handler(IIdentitiesRepository identitiesRepository, ILogger logger)
+ public Handler(IIdentitiesRepository identitiesRepository)
{
_identitiesRepository = identitiesRepository;
- _logger = logger;
}
public async Task Handle(ExecuteHousekeepingCommand request, CancellationToken cancellationToken)
@@ -26,19 +22,13 @@ public async Task Handle(ExecuteHousekeepingCommand request, CancellationToken c
private async Task DeleteDeletionProcesses(CancellationToken cancellationToken)
{
- var stopwatch = Stopwatch.StartNew();
- var numberOfDeletedItems = await _identitiesRepository.DeleteDeletionProcesses(IdentityDeletionProcess.CanBeCleanedUp, cancellationToken);
- stopwatch.Stop();
-
- _logger.DataDeleted(numberOfDeletedItems, "identity deletion processes", stopwatch.ElapsedMilliseconds);
+ await HousekeepingTelemetry.TrackItemDeletion("identity deletion processes", ct => _identitiesRepository.DeleteDeletionProcesses(IdentityDeletionProcess.CanBeCleanedUp, ct),
+ cancellationToken);
}
private async Task DeleteDeletionProcessAuditLogEntries(CancellationToken cancellationToken)
{
- var stopwatch = Stopwatch.StartNew();
- var numberOfDeletedItems = await _identitiesRepository.DeleteDeletionProcessAuditLogEntries(IdentityDeletionProcessAuditLogEntry.CanBeCleanedUp, cancellationToken);
- stopwatch.Stop();
-
- _logger.DataDeleted(numberOfDeletedItems, "identity deletion process audit log entries", stopwatch.ElapsedMilliseconds);
+ await HousekeepingTelemetry.TrackItemDeletion("identity deletion process audit log entries",
+ ct => _identitiesRepository.DeleteDeletionProcessAuditLogEntries(IdentityDeletionProcessAuditLogEntry.CanBeCleanedUp, ct), cancellationToken);
}
}
diff --git a/Modules/Devices/src/Devices.Application/packages.lock.json b/Modules/Devices/src/Devices.Application/packages.lock.json
index 4942cbfedf..60726347be 100644
--- a/Modules/Devices/src/Devices.Application/packages.lock.json
+++ b/Modules/Devices/src/Devices.Application/packages.lock.json
@@ -782,6 +782,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1213,6 +1214,12 @@
"libsodium": "[1.0.22, 1.0.23)"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"RabbitMQ.Client": {
"type": "CentralTransitive",
"requested": "[7.2.1, 7.2.1]",
diff --git a/Modules/Devices/src/Devices.Infrastructure.Database.Postgres/packages.lock.json b/Modules/Devices/src/Devices.Infrastructure.Database.Postgres/packages.lock.json
index fb94ff05fb..bed319bd4d 100644
--- a/Modules/Devices/src/Devices.Infrastructure.Database.Postgres/packages.lock.json
+++ b/Modules/Devices/src/Devices.Infrastructure.Database.Postgres/packages.lock.json
@@ -1031,6 +1031,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1571,6 +1572,12 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Devices/src/Devices.Infrastructure.Database.SqlServer/packages.lock.json b/Modules/Devices/src/Devices.Infrastructure.Database.SqlServer/packages.lock.json
index fb94ff05fb..bed319bd4d 100644
--- a/Modules/Devices/src/Devices.Infrastructure.Database.SqlServer/packages.lock.json
+++ b/Modules/Devices/src/Devices.Infrastructure.Database.SqlServer/packages.lock.json
@@ -1031,6 +1031,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1571,6 +1572,12 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Devices/src/Devices.Infrastructure/packages.lock.json b/Modules/Devices/src/Devices.Infrastructure/packages.lock.json
index d260fcc3e3..b1ae00ad4d 100644
--- a/Modules/Devices/src/Devices.Infrastructure/packages.lock.json
+++ b/Modules/Devices/src/Devices.Infrastructure/packages.lock.json
@@ -1186,6 +1186,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1558,6 +1559,12 @@
"OpenIddict.Abstractions": "7.6.0"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"RabbitMQ.Client": {
"type": "CentralTransitive",
"requested": "[7.2.1, 7.2.1]",
diff --git a/Modules/Devices/src/Devices.Module/packages.lock.json b/Modules/Devices/src/Devices.Module/packages.lock.json
index 79a1bbcc2c..127ca1a74e 100644
--- a/Modules/Devices/src/Devices.Module/packages.lock.json
+++ b/Modules/Devices/src/Devices.Module/packages.lock.json
@@ -917,11 +917,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1112,9 +1107,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1175,6 +1171,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1774,13 +1771,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -1802,6 +1805,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Modules/Devices/test/Devices.Application.Tests/packages.lock.json b/Modules/Devices/test/Devices.Application.Tests/packages.lock.json
index b4ba96f8a7..875d51adfd 100644
--- a/Modules/Devices/test/Devices.Application.Tests/packages.lock.json
+++ b/Modules/Devices/test/Devices.Application.Tests/packages.lock.json
@@ -1237,6 +1237,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1815,6 +1816,12 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Devices/test/Devices.Domain.Tests/packages.lock.json b/Modules/Devices/test/Devices.Domain.Tests/packages.lock.json
index 0aec2365d9..7c706dfc3f 100644
--- a/Modules/Devices/test/Devices.Domain.Tests/packages.lock.json
+++ b/Modules/Devices/test/Devices.Domain.Tests/packages.lock.json
@@ -784,6 +784,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1179,6 +1180,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Devices/test/Devices.Infrastructure.Tests/packages.lock.json b/Modules/Devices/test/Devices.Infrastructure.Tests/packages.lock.json
index b4ba96f8a7..875d51adfd 100644
--- a/Modules/Devices/test/Devices.Infrastructure.Tests/packages.lock.json
+++ b/Modules/Devices/test/Devices.Infrastructure.Tests/packages.lock.json
@@ -1237,6 +1237,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1815,6 +1816,12 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Files/src/Files.Application/Files/Commands/ExecuteHousekeeping/Handler.cs b/Modules/Files/src/Files.Application/Files/Commands/ExecuteHousekeeping/Handler.cs
index 348500a9d2..b01c1f2573 100644
--- a/Modules/Files/src/Files.Application/Files/Commands/ExecuteHousekeeping/Handler.cs
+++ b/Modules/Files/src/Files.Application/Files/Commands/ExecuteHousekeeping/Handler.cs
@@ -1,8 +1,6 @@
-using System.Diagnostics;
-using Backbone.BuildingBlocks.Application.Housekeeping;
+using Backbone.BuildingBlocks.Application.Housekeeping;
using Backbone.Modules.Files.Application.Infrastructure.Persistence.Repository;
using MediatR;
-using Microsoft.Extensions.Logging;
using File = Backbone.Modules.Files.Domain.Entities.File;
namespace Backbone.Modules.Files.Application.Files.Commands.ExecuteHousekeeping;
@@ -10,12 +8,10 @@ namespace Backbone.Modules.Files.Application.Files.Commands.ExecuteHousekeeping;
public class Handler : IRequestHandler
{
private readonly IFilesRepository _filesRepository;
- private readonly ILogger _logger;
- public Handler(IFilesRepository filesRepository, ILogger logger)
+ public Handler(IFilesRepository filesRepository)
{
_filesRepository = filesRepository;
- _logger = logger;
}
public async Task Handle(ExecuteHousekeepingCommand request, CancellationToken cancellationToken)
@@ -26,19 +22,11 @@ public async Task Handle(ExecuteHousekeepingCommand request, CancellationToken c
private async Task DeleteFiles(CancellationToken cancellationToken)
{
- var stopwatch = Stopwatch.StartNew();
- var numberOfDeletedItems = await _filesRepository.Delete(File.CanBeCleanedUp, cancellationToken);
- stopwatch.Stop();
-
- _logger.DataDeleted(numberOfDeletedItems, "files", stopwatch.ElapsedMilliseconds);
+ await HousekeepingTelemetry.TrackItemDeletion("files", ct => _filesRepository.Delete(File.CanBeCleanedUp, ct), cancellationToken);
}
private async Task DeleteOrphanedBlobs(CancellationToken cancellationToken)
{
- var stopwatch = Stopwatch.StartNew();
- var numberOfDeletedItems = await _filesRepository.DeleteOrphanedBlobs(cancellationToken);
- stopwatch.Stop();
-
- _logger.DataDeleted(numberOfDeletedItems, "orphaned file contents", stopwatch.ElapsedMilliseconds);
+ await HousekeepingTelemetry.TrackItemDeletion("orphaned file contents", _filesRepository.DeleteOrphanedBlobs, cancellationToken);
}
}
diff --git a/Modules/Files/src/Files.Application/packages.lock.json b/Modules/Files/src/Files.Application/packages.lock.json
index fe7423ba22..178bf3b215 100644
--- a/Modules/Files/src/Files.Application/packages.lock.json
+++ b/Modules/Files/src/Files.Application/packages.lock.json
@@ -717,6 +717,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1102,6 +1103,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Files/src/Files.Infrastructure.Database.Postgres/packages.lock.json b/Modules/Files/src/Files.Infrastructure.Database.Postgres/packages.lock.json
index 326a7a3955..4dd7d17cd3 100644
--- a/Modules/Files/src/Files.Infrastructure.Database.Postgres/packages.lock.json
+++ b/Modules/Files/src/Files.Infrastructure.Database.Postgres/packages.lock.json
@@ -707,6 +707,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1123,6 +1124,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Files/src/Files.Infrastructure.Database.SqlServer/packages.lock.json b/Modules/Files/src/Files.Infrastructure.Database.SqlServer/packages.lock.json
index 326a7a3955..4dd7d17cd3 100644
--- a/Modules/Files/src/Files.Infrastructure.Database.SqlServer/packages.lock.json
+++ b/Modules/Files/src/Files.Infrastructure.Database.SqlServer/packages.lock.json
@@ -707,6 +707,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1123,6 +1124,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Files/src/Files.Infrastructure/packages.lock.json b/Modules/Files/src/Files.Infrastructure/packages.lock.json
index 8a5a5d8bb5..e4714cd198 100644
--- a/Modules/Files/src/Files.Infrastructure/packages.lock.json
+++ b/Modules/Files/src/Files.Infrastructure/packages.lock.json
@@ -743,6 +743,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1111,6 +1112,12 @@
"Microsoft.Extensions.Primitives": "10.0.10"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Files/src/Files.Module/packages.lock.json b/Modules/Files/src/Files.Module/packages.lock.json
index d8e528dcb6..ec79607250 100644
--- a/Modules/Files/src/Files.Module/packages.lock.json
+++ b/Modules/Files/src/Files.Module/packages.lock.json
@@ -917,11 +917,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1112,9 +1107,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1175,6 +1171,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1802,13 +1799,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -1830,6 +1833,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Modules/Files/test/Files.Application.Tests/packages.lock.json b/Modules/Files/test/Files.Application.Tests/packages.lock.json
index 993dad1ffd..e0195c9822 100644
--- a/Modules/Files/test/Files.Application.Tests/packages.lock.json
+++ b/Modules/Files/test/Files.Application.Tests/packages.lock.json
@@ -913,6 +913,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1355,6 +1356,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Files/test/Files.Domain.Tests/packages.lock.json b/Modules/Files/test/Files.Domain.Tests/packages.lock.json
index b46eb9bcab..d9d00a121e 100644
--- a/Modules/Files/test/Files.Domain.Tests/packages.lock.json
+++ b/Modules/Files/test/Files.Domain.Tests/packages.lock.json
@@ -775,6 +775,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1149,6 +1150,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Files/test/Files.Infrastructure.Tests/packages.lock.json b/Modules/Files/test/Files.Infrastructure.Tests/packages.lock.json
index ee08428377..a7c9d26bc5 100644
--- a/Modules/Files/test/Files.Infrastructure.Tests/packages.lock.json
+++ b/Modules/Files/test/Files.Infrastructure.Tests/packages.lock.json
@@ -913,6 +913,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1367,6 +1368,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Messages/src/Messages.Application/packages.lock.json b/Modules/Messages/src/Messages.Application/packages.lock.json
index e604cb5ef3..b5f3bac59f 100644
--- a/Modules/Messages/src/Messages.Application/packages.lock.json
+++ b/Modules/Messages/src/Messages.Application/packages.lock.json
@@ -717,6 +717,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1102,6 +1103,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Messages/src/Messages.Infrastructure.Database.Postgres/packages.lock.json b/Modules/Messages/src/Messages.Infrastructure.Database.Postgres/packages.lock.json
index 57c8867134..422efc74f4 100644
--- a/Modules/Messages/src/Messages.Infrastructure.Database.Postgres/packages.lock.json
+++ b/Modules/Messages/src/Messages.Infrastructure.Database.Postgres/packages.lock.json
@@ -707,6 +707,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1123,6 +1124,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Messages/src/Messages.Infrastructure.Database.SqlServer/packages.lock.json b/Modules/Messages/src/Messages.Infrastructure.Database.SqlServer/packages.lock.json
index 57c8867134..422efc74f4 100644
--- a/Modules/Messages/src/Messages.Infrastructure.Database.SqlServer/packages.lock.json
+++ b/Modules/Messages/src/Messages.Infrastructure.Database.SqlServer/packages.lock.json
@@ -707,6 +707,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1123,6 +1124,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Messages/src/Messages.Infrastructure/packages.lock.json b/Modules/Messages/src/Messages.Infrastructure/packages.lock.json
index 849090b0c2..d9f0c58c51 100644
--- a/Modules/Messages/src/Messages.Infrastructure/packages.lock.json
+++ b/Modules/Messages/src/Messages.Infrastructure/packages.lock.json
@@ -743,6 +743,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1111,6 +1112,12 @@
"Microsoft.Extensions.Primitives": "10.0.10"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Messages/src/Messages.Module/packages.lock.json b/Modules/Messages/src/Messages.Module/packages.lock.json
index 66d5f7d07d..25f7300cce 100644
--- a/Modules/Messages/src/Messages.Module/packages.lock.json
+++ b/Modules/Messages/src/Messages.Module/packages.lock.json
@@ -917,11 +917,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1112,9 +1107,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1175,6 +1171,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1802,13 +1799,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -1830,6 +1833,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Modules/Messages/test/Messages.Application.Tests/packages.lock.json b/Modules/Messages/test/Messages.Application.Tests/packages.lock.json
index e1df3a35f7..ffa3a80c90 100644
--- a/Modules/Messages/test/Messages.Application.Tests/packages.lock.json
+++ b/Modules/Messages/test/Messages.Application.Tests/packages.lock.json
@@ -913,6 +913,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1367,6 +1368,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Messages/test/Messages.Domain.Tests/packages.lock.json b/Modules/Messages/test/Messages.Domain.Tests/packages.lock.json
index 2387fe80cd..3f17afea03 100644
--- a/Modules/Messages/test/Messages.Domain.Tests/packages.lock.json
+++ b/Modules/Messages/test/Messages.Domain.Tests/packages.lock.json
@@ -784,6 +784,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1149,6 +1150,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Quotas/src/Quotas.Application/Metrics/MetricStatusesService.cs b/Modules/Quotas/src/Quotas.Application/Metrics/MetricStatusesService.cs
index fe1dddecbc..661488dea2 100644
--- a/Modules/Quotas/src/Quotas.Application/Metrics/MetricStatusesService.cs
+++ b/Modules/Quotas/src/Quotas.Application/Metrics/MetricStatusesService.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
using Backbone.Modules.Quotas.Domain.Metrics;
@@ -18,7 +19,8 @@ public MetricStatusesService(MetricCalculatorFactory metricCalculatorFactory, II
public async Task RecalculateMetricStatuses(List identityAddresses, List metrics, MetricUpdateType updateType, CancellationToken cancellationToken)
{
- var identities = await _identitiesRepository.ListByAddresses(identityAddresses, cancellationToken, track: true);
+ var identities = (await _identitiesRepository.ListByAddresses(identityAddresses, cancellationToken, track: true)).ToList();
+
foreach (var identity in identities)
{
await identity.UpdateMetricStatuses(metrics, _metricCalculatorFactory, updateType, cancellationToken);
diff --git a/Modules/Quotas/src/Quotas.Application/packages.lock.json b/Modules/Quotas/src/Quotas.Application/packages.lock.json
index c9474369ec..9c3d60281d 100644
--- a/Modules/Quotas/src/Quotas.Application/packages.lock.json
+++ b/Modules/Quotas/src/Quotas.Application/packages.lock.json
@@ -707,6 +707,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1100,6 +1101,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Quotas/src/Quotas.Infrastructure.Database.Postgres/packages.lock.json b/Modules/Quotas/src/Quotas.Infrastructure.Database.Postgres/packages.lock.json
index 6affd7afdc..60b6bc57a8 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure.Database.Postgres/packages.lock.json
+++ b/Modules/Quotas/src/Quotas.Infrastructure.Database.Postgres/packages.lock.json
@@ -707,6 +707,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1142,6 +1143,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Quotas/src/Quotas.Infrastructure.Database.SqlServer/packages.lock.json b/Modules/Quotas/src/Quotas.Infrastructure.Database.SqlServer/packages.lock.json
index 6affd7afdc..60b6bc57a8 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure.Database.SqlServer/packages.lock.json
+++ b/Modules/Quotas/src/Quotas.Infrastructure.Database.SqlServer/packages.lock.json
@@ -707,6 +707,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1142,6 +1143,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/packages.lock.json b/Modules/Quotas/src/Quotas.Infrastructure/packages.lock.json
index 4e9a5e8ac5..0fc839a16b 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/packages.lock.json
+++ b/Modules/Quotas/src/Quotas.Infrastructure/packages.lock.json
@@ -753,6 +753,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1129,6 +1130,12 @@
"Microsoft.Extensions.Primitives": "10.0.10"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Quotas/src/Quotas.Module/packages.lock.json b/Modules/Quotas/src/Quotas.Module/packages.lock.json
index 547e48c851..c48eb7b25c 100644
--- a/Modules/Quotas/src/Quotas.Module/packages.lock.json
+++ b/Modules/Quotas/src/Quotas.Module/packages.lock.json
@@ -917,11 +917,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1112,9 +1107,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1175,6 +1171,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1804,13 +1801,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -1832,6 +1835,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Modules/Quotas/test/Quotas.Application.Tests/packages.lock.json b/Modules/Quotas/test/Quotas.Application.Tests/packages.lock.json
index 41465b5071..8a3c1baaba 100644
--- a/Modules/Quotas/test/Quotas.Application.Tests/packages.lock.json
+++ b/Modules/Quotas/test/Quotas.Application.Tests/packages.lock.json
@@ -913,6 +913,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1352,6 +1353,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Quotas/test/Quotas.Domain.Tests/packages.lock.json b/Modules/Quotas/test/Quotas.Domain.Tests/packages.lock.json
index 0f582abca4..581530866a 100644
--- a/Modules/Quotas/test/Quotas.Domain.Tests/packages.lock.json
+++ b/Modules/Quotas/test/Quotas.Domain.Tests/packages.lock.json
@@ -781,6 +781,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1163,6 +1164,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Quotas/test/Quotas.Infrastructure.Tests/packages.lock.json b/Modules/Quotas/test/Quotas.Infrastructure.Tests/packages.lock.json
index dc841262fb..578c87fb06 100644
--- a/Modules/Quotas/test/Quotas.Infrastructure.Tests/packages.lock.json
+++ b/Modules/Quotas/test/Quotas.Infrastructure.Tests/packages.lock.json
@@ -913,6 +913,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1001,20 +1002,29 @@
"Backbone.BuildingBlocks.Domain": "[1.0.0, )",
"Backbone.Modules.Relationships.Common": "[1.0.0, )",
"Backbone.Modules.Relationships.Domain": "[1.0.0, )",
- "FluentValidation.DependencyInjectionExtensions": "[12.1.1, 12.1.1]"
+ "Backbone.UnitTestTools": "[1.0.0, )",
+ "FluentValidation.DependencyInjectionExtensions": "[12.1.1, 12.1.1]",
+ "GitHubActionsTestLogger": "[3.0.5, 3.0.5]",
+ "Microsoft.NET.Test.Sdk": "[18.8.1, 18.8.1]"
}
},
"Backbone.Modules.Relationships.Common": {
"type": "Project",
"dependencies": {
- "FluentValidation": "[12.1.1, 12.1.1]"
+ "Backbone.UnitTestTools": "[1.0.0, )",
+ "FluentValidation": "[12.1.1, 12.1.1]",
+ "GitHubActionsTestLogger": "[3.0.5, 3.0.5]",
+ "Microsoft.NET.Test.Sdk": "[18.8.1, 18.8.1]"
}
},
"Backbone.Modules.Relationships.Domain": {
"type": "Project",
"dependencies": {
"Backbone.DevelopmentKit.Identity": "[1.0.0, )",
- "Backbone.Tooling": "[1.0.0, )"
+ "Backbone.Tooling": "[1.0.0, )",
+ "Backbone.UnitTestTools": "[1.0.0, )",
+ "GitHubActionsTestLogger": "[3.0.5, 3.0.5]",
+ "Microsoft.NET.Test.Sdk": "[18.8.1, 18.8.1]"
}
},
"Backbone.Modules.Relationships.Infrastructure": {
@@ -1024,8 +1034,11 @@
"Backbone.BuildingBlocks.Infrastructure": "[1.0.0, )",
"Backbone.Modules.Relationships.Application": "[1.0.0, )",
"Backbone.Modules.Relationships.Domain": "[1.0.0, )",
+ "Backbone.UnitTestTools": "[1.0.0, )",
+ "GitHubActionsTestLogger": "[3.0.5, 3.0.5]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.SqlServer": "[10.0.10, 10.0.10]",
+ "Microsoft.NET.Test.Sdk": "[18.8.1, 18.8.1]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]"
}
},
@@ -1460,6 +1473,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/ExecuteHousekeeping/Handler.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/ExecuteHousekeeping/Handler.cs
index 513ee29203..34f6cdff29 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/ExecuteHousekeeping/Handler.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/ExecuteHousekeeping/Handler.cs
@@ -1,24 +1,20 @@
-using System.Diagnostics;
-using Backbone.BuildingBlocks.Application.Housekeeping;
+using Backbone.BuildingBlocks.Application.Housekeeping;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Domain.Aggregates.Relationships;
using Backbone.Modules.Relationships.Domain.Aggregates.RelationshipTemplates;
using MediatR;
-using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Relationships.Application.Relationships.Commands.ExecuteHousekeeping;
public class Handler : IRequestHandler
{
private readonly IRelationshipTemplatesRepository _relationshipTemplatesRepository;
- private readonly ILogger _logger;
private readonly IRelationshipsRepository _relationshipsRepository;
- public Handler(IRelationshipTemplatesRepository relationshipTemplatesRepository, IRelationshipsRepository relationshipsRepository, ILogger logger)
+ public Handler(IRelationshipTemplatesRepository relationshipTemplatesRepository, IRelationshipsRepository relationshipsRepository)
{
_relationshipTemplatesRepository = relationshipTemplatesRepository;
_relationshipsRepository = relationshipsRepository;
- _logger = logger;
}
public async Task Handle(ExecuteHousekeepingCommand request, CancellationToken cancellationToken)
@@ -29,20 +25,11 @@ public async Task Handle(ExecuteHousekeepingCommand request, CancellationToken c
private async Task DeleteRelationshipTemplates(CancellationToken cancellationToken)
{
- var stopwatch = Stopwatch.StartNew();
- var numberOfDeletedItems = await _relationshipTemplatesRepository.Delete(RelationshipTemplate.CanBeCleanedUp, cancellationToken);
- stopwatch.Stop();
-
- _logger.DataDeleted(numberOfDeletedItems, "relationship templates", stopwatch.ElapsedMilliseconds);
-
+ await HousekeepingTelemetry.TrackItemDeletion("relationship templates", ct => _relationshipTemplatesRepository.Delete(RelationshipTemplate.CanBeCleanedUp, ct), cancellationToken);
}
private async Task DeleteRelationships(CancellationToken cancellationToken)
{
- var stopwatch = Stopwatch.StartNew();
- var numberOfDeletedItems = await _relationshipsRepository.Delete(Relationship.CanBeCleanedUp, cancellationToken);
- stopwatch.Stop();
-
- _logger.DataDeleted(numberOfDeletedItems, "relationships", stopwatch.ElapsedMilliseconds);
+ await HousekeepingTelemetry.TrackItemDeletion("relationships", ct => _relationshipsRepository.Delete(Relationship.CanBeCleanedUp, ct), cancellationToken);
}
}
diff --git a/Modules/Relationships/src/Relationships.Application/packages.lock.json b/Modules/Relationships/src/Relationships.Application/packages.lock.json
index 4858842384..f6cb83af71 100644
--- a/Modules/Relationships/src/Relationships.Application/packages.lock.json
+++ b/Modules/Relationships/src/Relationships.Application/packages.lock.json
@@ -717,6 +717,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1108,6 +1109,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Relationships/src/Relationships.Infrastructure.Database.Postgres/packages.lock.json b/Modules/Relationships/src/Relationships.Infrastructure.Database.Postgres/packages.lock.json
index cb779750b2..47c24c4966 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure.Database.Postgres/packages.lock.json
+++ b/Modules/Relationships/src/Relationships.Infrastructure.Database.Postgres/packages.lock.json
@@ -707,6 +707,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1131,6 +1132,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Relationships/src/Relationships.Infrastructure.Database.SqlServer/packages.lock.json b/Modules/Relationships/src/Relationships.Infrastructure.Database.SqlServer/packages.lock.json
index cb779750b2..47c24c4966 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure.Database.SqlServer/packages.lock.json
+++ b/Modules/Relationships/src/Relationships.Infrastructure.Database.SqlServer/packages.lock.json
@@ -707,6 +707,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1131,6 +1132,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/packages.lock.json b/Modules/Relationships/src/Relationships.Infrastructure/packages.lock.json
index 427e080fbe..d4bbd19692 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/packages.lock.json
+++ b/Modules/Relationships/src/Relationships.Infrastructure/packages.lock.json
@@ -743,6 +743,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1119,6 +1120,12 @@
"Microsoft.Extensions.Primitives": "10.0.10"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Relationships/src/Relationships.Module/packages.lock.json b/Modules/Relationships/src/Relationships.Module/packages.lock.json
index 02c70b327f..0a4f1b6d6f 100644
--- a/Modules/Relationships/src/Relationships.Module/packages.lock.json
+++ b/Modules/Relationships/src/Relationships.Module/packages.lock.json
@@ -917,11 +917,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1112,9 +1107,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1175,6 +1171,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1810,13 +1807,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -1838,6 +1841,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Modules/Relationships/test/Relationships.Application.Tests/packages.lock.json b/Modules/Relationships/test/Relationships.Application.Tests/packages.lock.json
index dcd7649be9..77fd6a0e4c 100644
--- a/Modules/Relationships/test/Relationships.Application.Tests/packages.lock.json
+++ b/Modules/Relationships/test/Relationships.Application.Tests/packages.lock.json
@@ -913,6 +913,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1363,6 +1364,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Relationships/test/Relationships.Domain.Tests/packages.lock.json b/Modules/Relationships/test/Relationships.Domain.Tests/packages.lock.json
index 09524736bb..5ff7847095 100644
--- a/Modules/Relationships/test/Relationships.Domain.Tests/packages.lock.json
+++ b/Modules/Relationships/test/Relationships.Domain.Tests/packages.lock.json
@@ -775,6 +775,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1149,6 +1150,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Relationships/test/Relationships.Infrastructure.Tests/packages.lock.json b/Modules/Relationships/test/Relationships.Infrastructure.Tests/packages.lock.json
index 4379a50862..c28cb4a828 100644
--- a/Modules/Relationships/test/Relationships.Infrastructure.Tests/packages.lock.json
+++ b/Modules/Relationships/test/Relationships.Infrastructure.Tests/packages.lock.json
@@ -904,6 +904,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1375,6 +1376,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/ExecuteHousekeeping/Handler.cs b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/ExecuteHousekeeping/Handler.cs
index 00647fc1a8..436c0347da 100644
--- a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/ExecuteHousekeeping/Handler.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/ExecuteHousekeeping/Handler.cs
@@ -1,23 +1,19 @@
-using System.Diagnostics;
-using Backbone.BuildingBlocks.Application.Housekeeping;
+using Backbone.BuildingBlocks.Application.Housekeeping;
using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Domain.Entities;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
using MediatR;
using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Synchronization.Application.SyncRuns.Commands.ExecuteHousekeeping;
public class Handler : IRequestHandler
{
private readonly ISynchronizationDbContext _dbContext;
- private readonly ILogger _logger;
- public Handler(ISynchronizationDbContext dbContext, ILogger logger)
+ public Handler(ISynchronizationDbContext dbContext)
{
_dbContext = dbContext;
- _logger = logger;
}
public async Task Handle(ExecuteHousekeepingCommand request, CancellationToken cancellationToken)
@@ -28,19 +24,12 @@ public async Task Handle(ExecuteHousekeepingCommand request, CancellationToken c
private async Task DeleteSyncRuns(CancellationToken cancellationToken)
{
- var stopwatch = Stopwatch.StartNew();
- var numberOfDeletedItems = await _dbContext.Set().Where(SyncRun.CanBeCleanedUp).ExecuteDeleteAsync(cancellationToken);
- stopwatch.Stop();
-
- _logger.DataDeleted(numberOfDeletedItems, "sync runs", stopwatch.ElapsedMilliseconds);
+ await HousekeepingTelemetry.TrackItemDeletion("sync runs", ct => _dbContext.Set().Where(SyncRun.CanBeCleanedUp).ExecuteDeleteAsync(ct), cancellationToken);
}
private async Task DeleteDatawalletModifications(CancellationToken cancellationToken)
{
- var stopwatch = Stopwatch.StartNew();
- var numberOfDeletedItems = await _dbContext.Set().Where(DatawalletModification.CanBeCleanedUp).ExecuteDeleteAsync(cancellationToken);
- stopwatch.Stop();
-
- _logger.DataDeleted(numberOfDeletedItems, "datawallet modifications", stopwatch.ElapsedMilliseconds);
+ await HousekeepingTelemetry.TrackItemDeletion("datawallet modifications",
+ ct => _dbContext.Set().Where(DatawalletModification.CanBeCleanedUp).ExecuteDeleteAsync(ct), cancellationToken);
}
}
diff --git a/Modules/Synchronization/src/Synchronization.Application/packages.lock.json b/Modules/Synchronization/src/Synchronization.Application/packages.lock.json
index a684b9c074..aaeaa40082 100644
--- a/Modules/Synchronization/src/Synchronization.Application/packages.lock.json
+++ b/Modules/Synchronization/src/Synchronization.Application/packages.lock.json
@@ -723,6 +723,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1102,6 +1103,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Synchronization/src/Synchronization.Infrastructure.Database.Postgres/packages.lock.json b/Modules/Synchronization/src/Synchronization.Infrastructure.Database.Postgres/packages.lock.json
index b05b1b5faf..8300d5b400 100644
--- a/Modules/Synchronization/src/Synchronization.Infrastructure.Database.Postgres/packages.lock.json
+++ b/Modules/Synchronization/src/Synchronization.Infrastructure.Database.Postgres/packages.lock.json
@@ -712,6 +712,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1139,6 +1140,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Synchronization/src/Synchronization.Infrastructure.Database.SqlServer/packages.lock.json b/Modules/Synchronization/src/Synchronization.Infrastructure.Database.SqlServer/packages.lock.json
index b05b1b5faf..8300d5b400 100644
--- a/Modules/Synchronization/src/Synchronization.Infrastructure.Database.SqlServer/packages.lock.json
+++ b/Modules/Synchronization/src/Synchronization.Infrastructure.Database.SqlServer/packages.lock.json
@@ -712,6 +712,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1139,6 +1140,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Synchronization/src/Synchronization.Infrastructure/packages.lock.json b/Modules/Synchronization/src/Synchronization.Infrastructure/packages.lock.json
index 627a13a348..b1686af405 100644
--- a/Modules/Synchronization/src/Synchronization.Infrastructure/packages.lock.json
+++ b/Modules/Synchronization/src/Synchronization.Infrastructure/packages.lock.json
@@ -757,6 +757,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1126,6 +1127,12 @@
"Microsoft.Extensions.Primitives": "10.0.10"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Synchronization/src/Synchronization.Module/packages.lock.json b/Modules/Synchronization/src/Synchronization.Module/packages.lock.json
index bc46eaba24..8ac332c7d6 100644
--- a/Modules/Synchronization/src/Synchronization.Module/packages.lock.json
+++ b/Modules/Synchronization/src/Synchronization.Module/packages.lock.json
@@ -917,11 +917,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1117,9 +1112,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1180,6 +1176,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1818,13 +1815,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -1846,6 +1849,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Modules/Synchronization/test/Synchronization.Application.Tests/packages.lock.json b/Modules/Synchronization/test/Synchronization.Application.Tests/packages.lock.json
index 06226946fe..1ce8bf6397 100644
--- a/Modules/Synchronization/test/Synchronization.Application.Tests/packages.lock.json
+++ b/Modules/Synchronization/test/Synchronization.Application.Tests/packages.lock.json
@@ -913,6 +913,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1369,6 +1370,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Synchronization/test/Synchronization.Domain.Tests/packages.lock.json b/Modules/Synchronization/test/Synchronization.Domain.Tests/packages.lock.json
index 4397de7f45..23ebebd80c 100644
--- a/Modules/Synchronization/test/Synchronization.Domain.Tests/packages.lock.json
+++ b/Modules/Synchronization/test/Synchronization.Domain.Tests/packages.lock.json
@@ -775,6 +775,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1149,6 +1150,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Tags/src/Tags.Application/packages.lock.json b/Modules/Tags/src/Tags.Application/packages.lock.json
index 053ade0a25..2391cb87af 100644
--- a/Modules/Tags/src/Tags.Application/packages.lock.json
+++ b/Modules/Tags/src/Tags.Application/packages.lock.json
@@ -707,6 +707,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1088,6 +1089,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Tags/src/Tags.Infrastructure/packages.lock.json b/Modules/Tags/src/Tags.Infrastructure/packages.lock.json
index d1d4b1bc0a..2b2d7607be 100644
--- a/Modules/Tags/src/Tags.Infrastructure/packages.lock.json
+++ b/Modules/Tags/src/Tags.Infrastructure/packages.lock.json
@@ -707,6 +707,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1096,6 +1097,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Tags/src/Tags.Module/packages.lock.json b/Modules/Tags/src/Tags.Module/packages.lock.json
index c35e89f2d5..522040fa37 100644
--- a/Modules/Tags/src/Tags.Module/packages.lock.json
+++ b/Modules/Tags/src/Tags.Module/packages.lock.json
@@ -717,6 +717,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1122,6 +1123,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"Polly": {
"type": "CentralTransitive",
"requested": "[8.7.0, 8.7.0]",
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens/Commands/ExecuteHousekeeping/Handler.cs b/Modules/Tokens/src/Tokens.Application/Tokens/Commands/ExecuteHousekeeping/Handler.cs
index a300885cad..823d6ad127 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens/Commands/ExecuteHousekeeping/Handler.cs
+++ b/Modules/Tokens/src/Tokens.Application/Tokens/Commands/ExecuteHousekeeping/Handler.cs
@@ -1,21 +1,17 @@
-using System.Diagnostics;
-using Backbone.BuildingBlocks.Application.Housekeeping;
+using Backbone.BuildingBlocks.Application.Housekeeping;
using Backbone.Modules.Tokens.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Tokens.Domain.Entities;
using MediatR;
-using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Tokens.Application.Tokens.Commands.ExecuteHousekeeping;
public class Handler : IRequestHandler
{
private readonly ITokensRepository _tokensRepository;
- private readonly ILogger _logger;
- public Handler(ITokensRepository tokensRepository, ILogger logger)
+ public Handler(ITokensRepository tokensRepository)
{
_tokensRepository = tokensRepository;
- _logger = logger;
}
public async Task Handle(ExecuteHousekeepingCommand request, CancellationToken cancellationToken)
@@ -25,10 +21,6 @@ public async Task Handle(ExecuteHousekeepingCommand request, CancellationToken c
private async Task DeleteTokens(CancellationToken cancellationToken)
{
- var stopwatch = Stopwatch.StartNew();
- var numberOfDeletedItems = await _tokensRepository.Delete(Token.CanBeCleanedUp, cancellationToken);
- stopwatch.Stop();
-
- _logger.DataDeleted(numberOfDeletedItems, "tokens", stopwatch.ElapsedMilliseconds);
+ await HousekeepingTelemetry.TrackItemDeletion("tokens", ct => _tokensRepository.Delete(Token.CanBeCleanedUp, ct), cancellationToken);
}
}
diff --git a/Modules/Tokens/src/Tokens.Application/packages.lock.json b/Modules/Tokens/src/Tokens.Application/packages.lock.json
index e6794b17ef..b0f37d0061 100644
--- a/Modules/Tokens/src/Tokens.Application/packages.lock.json
+++ b/Modules/Tokens/src/Tokens.Application/packages.lock.json
@@ -726,6 +726,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1111,6 +1112,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"RabbitMQ.Client": {
"type": "CentralTransitive",
"requested": "[7.2.1, 7.2.1]",
diff --git a/Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/packages.lock.json b/Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/packages.lock.json
index bc0a937c77..694195933b 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/packages.lock.json
+++ b/Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/packages.lock.json
@@ -716,6 +716,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1134,6 +1135,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"RabbitMQ.Client": {
"type": "CentralTransitive",
"requested": "[7.2.1, 7.2.1]",
diff --git a/Modules/Tokens/src/Tokens.Infrastructure.Database.SqlServer/packages.lock.json b/Modules/Tokens/src/Tokens.Infrastructure.Database.SqlServer/packages.lock.json
index bc0a937c77..694195933b 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure.Database.SqlServer/packages.lock.json
+++ b/Modules/Tokens/src/Tokens.Infrastructure.Database.SqlServer/packages.lock.json
@@ -716,6 +716,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1134,6 +1135,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"RabbitMQ.Client": {
"type": "CentralTransitive",
"requested": "[7.2.1, 7.2.1]",
diff --git a/Modules/Tokens/src/Tokens.Infrastructure/packages.lock.json b/Modules/Tokens/src/Tokens.Infrastructure/packages.lock.json
index 2a653ae72b..b793a355ce 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure/packages.lock.json
+++ b/Modules/Tokens/src/Tokens.Infrastructure/packages.lock.json
@@ -752,6 +752,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1121,6 +1122,12 @@
"Microsoft.Extensions.Primitives": "10.0.10"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"RabbitMQ.Client": {
"type": "CentralTransitive",
"requested": "[7.2.1, 7.2.1]",
diff --git a/Modules/Tokens/src/Tokens.Module/packages.lock.json b/Modules/Tokens/src/Tokens.Module/packages.lock.json
index fb9da6ef28..3cc976ed05 100644
--- a/Modules/Tokens/src/Tokens.Module/packages.lock.json
+++ b/Modules/Tokens/src/Tokens.Module/packages.lock.json
@@ -917,11 +917,6 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "1.17.0"
}
},
- "OpenTelemetry.Api": {
- "type": "Transitive",
- "resolved": "1.17.0",
- "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
- },
"OpenTelemetry.Api.ProviderBuilderExtensions": {
"type": "Transitive",
"resolved": "1.17.0",
@@ -1112,9 +1107,10 @@
"DotNetDiag.HealthChecks.SqlServer": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore": "[10.0.10, 10.0.10]",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.10, 10.0.10]",
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": "[1.11.2-beta.1, 1.11.2-beta.1]",
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions.Hosting": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.AspNetCore": "[1.17.0, 1.17.0]",
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.17.0-beta.1, )",
"OpenTelemetry.Instrumentation.Http": "[1.17.0, 1.17.0]",
"OpenTelemetry.Instrumentation.Runtime": "[1.17.0, 1.17.0]",
"Polly": "[8.7.0, 8.7.0]",
@@ -1175,6 +1171,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1806,13 +1803,19 @@
"OpenIddict.EntityFrameworkCore.Models": "7.6.0"
}
},
- "OpenTelemetry.Exporter.Prometheus.AspNetCore": {
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
+ "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
"type": "CentralTransitive",
- "requested": "[1.11.2-beta.1, 1.11.2-beta.1]",
- "resolved": "1.11.2-beta.1",
- "contentHash": "jouLU4VHpzyXuzF2yi/bpt9DoseZGyUudSdTFvylgIwIx6ST1bdI/AXNoJ4/n6HwMiso677ILLm/RM8DY+EYwA==",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "R1omQOrQpGlS0Cp5UIr/TAiuEA48JrPlgr1NPV5gESiTU7HhWU+ILe2EBSYb1fKdsSavZ7nZkHcUxAzofPqr2A==",
"dependencies": {
- "OpenTelemetry": "[1.11.2, 2.0.0)"
+ "OpenTelemetry": "1.17.0"
}
},
"OpenTelemetry.Extensions.Hosting": {
@@ -1834,6 +1837,17 @@
"OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
}
},
+ "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0-beta.1, )",
+ "resolved": "1.17.0-beta.1",
+ "contentHash": "BPSv1rk6qEkGZUGTNBfk7XmYqBAWdF3FBdjXEjVClp0bKUl6VCumlaosT84qvlK7YnHLCv5FFqJHx2N62TbKEw==",
+ "dependencies": {
+ "Microsoft.Extensions.Configuration": "10.0.0",
+ "Microsoft.Extensions.Options": "10.0.0",
+ "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.17.0, 2.0.0)"
+ }
+ },
"OpenTelemetry.Instrumentation.Http": {
"type": "CentralTransitive",
"requested": "[1.17.0, 1.17.0]",
diff --git a/Modules/Tokens/test/Tokens.Application.Tests/packages.lock.json b/Modules/Tokens/test/Tokens.Application.Tests/packages.lock.json
index 86383cc6f4..eb094aaecb 100644
--- a/Modules/Tokens/test/Tokens.Application.Tests/packages.lock.json
+++ b/Modules/Tokens/test/Tokens.Application.Tests/packages.lock.json
@@ -922,6 +922,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1378,6 +1379,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"RabbitMQ.Client": {
"type": "CentralTransitive",
"requested": "[7.2.1, 7.2.1]",
diff --git a/Modules/Tokens/test/Tokens.Domain.Tests/packages.lock.json b/Modules/Tokens/test/Tokens.Domain.Tests/packages.lock.json
index ec41395032..533d364c63 100644
--- a/Modules/Tokens/test/Tokens.Domain.Tests/packages.lock.json
+++ b/Modules/Tokens/test/Tokens.Domain.Tests/packages.lock.json
@@ -784,6 +784,7 @@
"Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
"Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+ "OpenTelemetry.Api": "[1.17.0, )",
"Polly": "[8.7.0, 8.7.0]",
"RabbitMQ.Client": "[7.2.1, 7.2.1]",
"Serilog": "[4.4.0, 4.4.0]"
@@ -1158,6 +1159,12 @@
"Npgsql": "10.0.3"
}
},
+ "OpenTelemetry.Api": {
+ "type": "CentralTransitive",
+ "requested": "[1.17.0, )",
+ "resolved": "1.17.0",
+ "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+ },
"RabbitMQ.Client": {
"type": "CentralTransitive",
"requested": "[7.2.1, 7.2.1]",
diff --git a/appsettings.override.json b/appsettings.override.json
index f732a6719c..2262b87dd7 100644
--- a/appsettings.override.json
+++ b/appsettings.override.json
@@ -1,292 +1,288 @@
{
- "RunMigrations": true,
- "Authentication": {
- "JwtSigningCertificate": "MIIJ7wIBAzCCCaUGCSqGSIb3DQEHAaCCCZYEggmSMIIJjjCCBAIGCSqGSIb3DQEHBqCCA/MwggPvAgEAMIID6AYJKoZIhvcNAQcBMFcGCSqGSIb3DQEFDTBKMCkGCSqGSIb3DQEFDDAcBAiIVEGIEnzbyAICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEC1tOaulJJjkAl2W7xeF3G6AggOAm1VdXzAQ6MhHabp6+rzEuaAyBpuMi8zD8OEl8/xMv47UsFUor38aZjQd14qTTLz5MnksI/qgjQHLuMEmN1eWARsUBkeYvLuz0icl2q9A5Rn9CaKHIemQWq9mIobq3XnXhwDFEd+G/WgjNoK65Ndu20pnuc9LDlfq6fx2eXDbHAWLeUTnlQsEY4M/owNKIjlO/VsYJCshvEPlbtCnyzXwkrtQ5i2XufIJsfX0qoK/dXfoMVUjPxa/L8uR40bAWc1LVkvO0Ox4rY9VCtC1eHe3fcS48AaYCGRMpkZ7N+nDOb7lPs7BcxVoIrj/PkqiNI4rMOZVEgz21OWhueIjBv4gxfV+vW7IZ7xWvC1uUYIKEKEl6mk8KJ5zruO3tObX70+4saBiTNd/76+CVR4qCSwYcD7bZjpMOiaVFyxy0ay3dCwoivLK1jWNFJ25tngYpXKGCtOP0/Zi1fyseo4C54Ef5Yoo+BG3bkKR9VHChWzbB+b1p2lOwfBWIWlGjoZ+expyBjnk+FWrFDZeMknpW3PANCtcT/zqzqPKG3g4DAnSx9xDqvR7GBEgUlaUBAsCM3NvbahzevFFNE21aVajmTpSdejqvgNgvHPHA+BHfhMYx3mcMEkZ+phEHrWRSg925Iy64afL9/XvxoB/uFOYta/ir4ZqCbOy+yrc4+ppQlvLEIUnL4BGWcZ7d2NNRHWOHg0UqzxakezWhoGh1DDWfNdEj+eoa8DTvQr9hX0DQljym1I51qYdrv18rSf+MQj9jhBgQ77WBCX4sDkj4W9d7kKah8Fa0v+4bB1CqrETAsCESvBzSNyYEXKpyjdR/m8w/dti13Kz9ptvi8zd70tcqsqjaB3Qaz3gZRzRlPJORrg2cjWm+xLTOIQ+thk+O3U7l5R47h7QT44eSroKmX8Ptt/wkn9HRcI9bjylzrjTFw45/Re61RpHm3+NXUfvTPLaaXYSolldAgYN1gq+yYZJvBViWQB7gE05fpph6t6DYhEr2VtkLljxDclRPF14AKZaQCIndTiUX69eQfIpD4edHyBvFWSkf+fC1whOE/tqKY0vDflhBDrWFsvDwnEo0iYy671nu19RnBnZws0vseJeikQdCWBY6m0Wq7oViCyFCWyJPDukz3E9uCRrckki2i5+V2MM2IMtgImVFvRqaRbi7vF+Qjccs9Ri0+evcsc9dWjsnHkwggWEBgkqhkiG9w0BBwGgggV1BIIFcTCCBW0wggVpBgsqhkiG9w0BDAoBAqCCBTEwggUtMFcGCSqGSIb3DQEFDTBKMCkGCSqGSIb3DQEFDDAcBAj06Hc+Gh2z5wICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEOwPSnf4F479I2AKr8i0TLYEggTQFtwGZHL6BF2++nDi2EAjc7XXIxp0u4qM17eZjafdltFpketf6pQCD/hDry+mVeIapTY9hOPE5XdjdFoJtOZPZHfvrrb0Jn+rgGAPYGBzqGK4NPVWHiDZ3uA4R4Tiwhgqd/ZQIdRshUEPVfu4EzTIAEhmHl+1g8JiD8EcYAXO1IRCLm17IsIYXT6d8cYe3Zy3AgULsF0/OwQIPVqaJCIwPR3qw68GXNA4iWWHuXJhdtrqHrGrkfBRuZZ5+7R838RM9Bk+ljWphidPmIFZmhjACt/c1qorGPhQTil0WT9VU9rN/gJ1rKcu3RQ1TRJDTjZYaPSMu9ycvFLpsP8XBJUpfHnczPS25bclKaJRUvou6aiwtyQsqWCDLGRuwN06Oins28R5/QQNYbcOr77WBlgh28K1TLcnQopE9xp12XBj8iOeUlVMiMVlph02TrGMXOqU0rlRpsYECMSfHw4xdH87GBUxmE4ndE7JI7wu73MsHQ+3kDTTvGG6xzY6rbNg+V6CfOZc102645sJskdCD6ygzUfgDwDcxjyky2u86qBFR/9d3M7Vh+PQpijYxQ/w4FzwgHUPII+JqqY8secPSA64L8qXj4daG74Wc3y+veajJzkFBUiaJnCER1WEJf0b4eBAEG1gaJ/B2hrp+lEd30qbE//iJWna5gYboIzMENfJ4RsqxlW4hZs6aqBuDr8QXL1chc11g0nMY9sI0kZVwF8+13eFh4ypt4H34usOiWHft2eeA/Z2h8agrT8UFkRfy3/1dGoNwqicXgqY3MgoxqlfDQ6hjPkO5JAbRc0cuZQMPu38dO66+qoI/Db4zdo+8G6sXOgZkzduQlARhx6VORq2QFoufsyqXvsUWFWSXEOjWLbLwKK5og8sV4OmWXGRPbTo+Hc3pmmuYcpEwtH6wFCb0vXVeOhSd7GX8Yv2V0yVt19IjgUGtukVWt9DUe6uImzsPm9ZdivWUB3RlKYRGpS16yhG0ZdRwBJweDoitK091ooN6Um74eO17dH0jAQw3XPBxgJ64qEdSzfJ/xybM45BSUPAft2wXXlckLOId9Us56oV7WeszTOkOPDKz9GnKT05xPXNDgAqstVZc0nXEq0eFzTORREBP0w2ijwPu9mfPvRACY8p7YMnNbZzMGBvpa3ILezRIgThMbnzf+YiBP2Ddt9bWoxDsIj7jaqDzxjG2WtI1qGEqFyLCeUkSx2UpkbGViCkx8CsMwXJwLrYdoxqjyOg2Oz09EFF5eI1wkLqEtez8dOTLEn7oFjTyFbRkNoynuwvNqHEG2qzbw02Rb82qyrurKmOnNHog7FXLDe0kGFgKuNXbCw+to2lAhWY0CmEe8qfQLeAiV3TsGHSrGSkoegmfPHsuboCdez/ETJZWoodryUPdY3PFNa0xZOJvbtkiG2Vo55Rjq9wbd+MWAGcxhaCVEmEJ0UWWsn3Oe+h4mn3wT9+P+hkAR9duXT6tq+5DmKB2RD3fR3vIc4H5eLaIzOOmjSdfGFvIaj+06jS7SGicuKqF5ND4HPtXJrQgQUdO/gIHCkE9nn4hXCoz/bGkU4FN2WPz5TTMVsYuxMVp1I2UayoQppltkp3oaDb/S36FeO644d5zb7ARayF68NL5MrM/MRK24jhtx2WV4ZN9HIxJTAjBgkqhkiG9w0BCRUxFgQU/S6zDu6S3P4i1WdDz+j3esGxT4UwQTAxMA0GCWCGSAFlAwQCAQUABCCiOwVWGDHil8dA7XvoQNTLTJDm7EwdfGC4KJUV9smgUgQI4ZRrDNXXl8cCAggA",
- "JwtLifetimeInSeconds": 300,
- "ApiKey": "test"
- },
- "Cors": {
- "AllowedOrigins": "http://localhost:8080;https://localhost:8080",
- "AccessControlAllowCredentials": true
- },
- "Infrastructure": {
- "EventBus": {
- "ProductName": "RabbitMQ",
- // possible values: InMemory, RabbitMQ, GoogleCloudPubSub, AzureServiceBus
-
- "RabbitMQ": {
- "EnableSsl": false,
- "HostName": "localhost",
- "Username": "guest",
- "Password": "guest"
- }
+ "RunMigrations": true,
+ "Authentication": {
+ "JwtSigningCertificate": "MIIJ7wIBAzCCCaUGCSqGSIb3DQEHAaCCCZYEggmSMIIJjjCCBAIGCSqGSIb3DQEHBqCCA/MwggPvAgEAMIID6AYJKoZIhvcNAQcBMFcGCSqGSIb3DQEFDTBKMCkGCSqGSIb3DQEFDDAcBAiIVEGIEnzbyAICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEC1tOaulJJjkAl2W7xeF3G6AggOAm1VdXzAQ6MhHabp6+rzEuaAyBpuMi8zD8OEl8/xMv47UsFUor38aZjQd14qTTLz5MnksI/qgjQHLuMEmN1eWARsUBkeYvLuz0icl2q9A5Rn9CaKHIemQWq9mIobq3XnXhwDFEd+G/WgjNoK65Ndu20pnuc9LDlfq6fx2eXDbHAWLeUTnlQsEY4M/owNKIjlO/VsYJCshvEPlbtCnyzXwkrtQ5i2XufIJsfX0qoK/dXfoMVUjPxa/L8uR40bAWc1LVkvO0Ox4rY9VCtC1eHe3fcS48AaYCGRMpkZ7N+nDOb7lPs7BcxVoIrj/PkqiNI4rMOZVEgz21OWhueIjBv4gxfV+vW7IZ7xWvC1uUYIKEKEl6mk8KJ5zruO3tObX70+4saBiTNd/76+CVR4qCSwYcD7bZjpMOiaVFyxy0ay3dCwoivLK1jWNFJ25tngYpXKGCtOP0/Zi1fyseo4C54Ef5Yoo+BG3bkKR9VHChWzbB+b1p2lOwfBWIWlGjoZ+expyBjnk+FWrFDZeMknpW3PANCtcT/zqzqPKG3g4DAnSx9xDqvR7GBEgUlaUBAsCM3NvbahzevFFNE21aVajmTpSdejqvgNgvHPHA+BHfhMYx3mcMEkZ+phEHrWRSg925Iy64afL9/XvxoB/uFOYta/ir4ZqCbOy+yrc4+ppQlvLEIUnL4BGWcZ7d2NNRHWOHg0UqzxakezWhoGh1DDWfNdEj+eoa8DTvQr9hX0DQljym1I51qYdrv18rSf+MQj9jhBgQ77WBCX4sDkj4W9d7kKah8Fa0v+4bB1CqrETAsCESvBzSNyYEXKpyjdR/m8w/dti13Kz9ptvi8zd70tcqsqjaB3Qaz3gZRzRlPJORrg2cjWm+xLTOIQ+thk+O3U7l5R47h7QT44eSroKmX8Ptt/wkn9HRcI9bjylzrjTFw45/Re61RpHm3+NXUfvTPLaaXYSolldAgYN1gq+yYZJvBViWQB7gE05fpph6t6DYhEr2VtkLljxDclRPF14AKZaQCIndTiUX69eQfIpD4edHyBvFWSkf+fC1whOE/tqKY0vDflhBDrWFsvDwnEo0iYy671nu19RnBnZws0vseJeikQdCWBY6m0Wq7oViCyFCWyJPDukz3E9uCRrckki2i5+V2MM2IMtgImVFvRqaRbi7vF+Qjccs9Ri0+evcsc9dWjsnHkwggWEBgkqhkiG9w0BBwGgggV1BIIFcTCCBW0wggVpBgsqhkiG9w0BDAoBAqCCBTEwggUtMFcGCSqGSIb3DQEFDTBKMCkGCSqGSIb3DQEFDDAcBAj06Hc+Gh2z5wICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEOwPSnf4F479I2AKr8i0TLYEggTQFtwGZHL6BF2++nDi2EAjc7XXIxp0u4qM17eZjafdltFpketf6pQCD/hDry+mVeIapTY9hOPE5XdjdFoJtOZPZHfvrrb0Jn+rgGAPYGBzqGK4NPVWHiDZ3uA4R4Tiwhgqd/ZQIdRshUEPVfu4EzTIAEhmHl+1g8JiD8EcYAXO1IRCLm17IsIYXT6d8cYe3Zy3AgULsF0/OwQIPVqaJCIwPR3qw68GXNA4iWWHuXJhdtrqHrGrkfBRuZZ5+7R838RM9Bk+ljWphidPmIFZmhjACt/c1qorGPhQTil0WT9VU9rN/gJ1rKcu3RQ1TRJDTjZYaPSMu9ycvFLpsP8XBJUpfHnczPS25bclKaJRUvou6aiwtyQsqWCDLGRuwN06Oins28R5/QQNYbcOr77WBlgh28K1TLcnQopE9xp12XBj8iOeUlVMiMVlph02TrGMXOqU0rlRpsYECMSfHw4xdH87GBUxmE4ndE7JI7wu73MsHQ+3kDTTvGG6xzY6rbNg+V6CfOZc102645sJskdCD6ygzUfgDwDcxjyky2u86qBFR/9d3M7Vh+PQpijYxQ/w4FzwgHUPII+JqqY8secPSA64L8qXj4daG74Wc3y+veajJzkFBUiaJnCER1WEJf0b4eBAEG1gaJ/B2hrp+lEd30qbE//iJWna5gYboIzMENfJ4RsqxlW4hZs6aqBuDr8QXL1chc11g0nMY9sI0kZVwF8+13eFh4ypt4H34usOiWHft2eeA/Z2h8agrT8UFkRfy3/1dGoNwqicXgqY3MgoxqlfDQ6hjPkO5JAbRc0cuZQMPu38dO66+qoI/Db4zdo+8G6sXOgZkzduQlARhx6VORq2QFoufsyqXvsUWFWSXEOjWLbLwKK5og8sV4OmWXGRPbTo+Hc3pmmuYcpEwtH6wFCb0vXVeOhSd7GX8Yv2V0yVt19IjgUGtukVWt9DUe6uImzsPm9ZdivWUB3RlKYRGpS16yhG0ZdRwBJweDoitK091ooN6Um74eO17dH0jAQw3XPBxgJ64qEdSzfJ/xybM45BSUPAft2wXXlckLOId9Us56oV7WeszTOkOPDKz9GnKT05xPXNDgAqstVZc0nXEq0eFzTORREBP0w2ijwPu9mfPvRACY8p7YMnNbZzMGBvpa3ILezRIgThMbnzf+YiBP2Ddt9bWoxDsIj7jaqDzxjG2WtI1qGEqFyLCeUkSx2UpkbGViCkx8CsMwXJwLrYdoxqjyOg2Oz09EFF5eI1wkLqEtez8dOTLEn7oFjTyFbRkNoynuwvNqHEG2qzbw02Rb82qyrurKmOnNHog7FXLDe0kGFgKuNXbCw+to2lAhWY0CmEe8qfQLeAiV3TsGHSrGSkoegmfPHsuboCdez/ETJZWoodryUPdY3PFNa0xZOJvbtkiG2Vo55Rjq9wbd+MWAGcxhaCVEmEJ0UWWsn3Oe+h4mn3wT9+P+hkAR9duXT6tq+5DmKB2RD3fR3vIc4H5eLaIzOOmjSdfGFvIaj+06jS7SGicuKqF5ND4HPtXJrQgQUdO/gIHCkE9nn4hXCoz/bGkU4FN2WPz5TTMVsYuxMVp1I2UayoQppltkp3oaDb/S36FeO644d5zb7ARayF68NL5MrM/MRK24jhtx2WV4ZN9HIxJTAjBgkqhkiG9w0BCRUxFgQU/S6zDu6S3P4i1WdDz+j3esGxT4UwQTAxMA0GCWCGSAFlAwQCAQUABCCiOwVWGDHil8dA7XvoQNTLTJDm7EwdfGC4KJUV9smgUgQI4ZRrDNXXl8cCAggA",
+ "JwtLifetimeInSeconds": 300,
+ "ApiKey": "test"
},
- "SqlDatabase": {
- "Provider": "Postgres",
- "ConnectionString": "User ID=postgres;Password=admin;Server=localhost;Port=5432;Database=enmeshed;"
- // postgres,
- // "ConnectionString": "Server=localhost;Database=enmeshed;User Id=sa;Password=Passw0rd;TrustServerCertificate=True" // sqlserver
- }
- },
- "SwaggerUi": {
- "Enabled": true
- },
- "ModuleDefaults": {
- "Application": {
- "DidDomainName": "localhost"
+ "Cors": {
+ "AllowedOrigins": "http://localhost:8080;https://localhost:8080",
+ "AccessControlAllowCredentials": true
},
"Infrastructure": {
- "SqlDatabase": {
- "Provider": "Postgres",
- "ConnectionString": "User ID=postgres;Password=admin;Server=localhost;Port=5432;Database=enmeshed;"
- // postgres
- // "ConnectionString": "Server=localhost;Database=enmeshed;User Id=sa;Password=Passw0rd;TrustServerCertificate=True" // sqlserver
- }
- }
- },
- "Modules": {
- "Announcements": {},
- "Challenges": {},
- "Quotas": {},
- "Devices": {
- "Application": {
- "IdentityDeletion": {
- "AuditLogRetentionPeriodInDays": 1
- },
- "Notifications": {
- "Texts": [
- {
- "Code": "TestCode",
- "Translations": {
- "en": {
- "Title": "Test Title",
- "Body": "Test Body"
- },
- "de": {
- "Title": "Test Titel",
- "Body": "Test Inhalt"
- }
- }
- }
- ]
- }
- },
- "Infrastructure": {
- "PushNotifications": {
- "Providers": {
- "dummy": {
- "enabled": true
- },
- "sse": {
- "enabled": true,
- "SseServerBaseAddress": "http://localhost:8083"
+ "EventBus": {
+ "ProductName": "RabbitMQ",
+ // possible values: InMemory, RabbitMQ, GoogleCloudPubSub, AzureServiceBus
+
+ "RabbitMQ": {
+ "EnableSsl": false,
+ "HostName": "localhost",
+ "Username": "guest",
+ "Password": "guest"
}
- }
- }
- }
- },
- "Files": {
- "Infrastructure": {
- "BlobStorage": {
- "ProductName": "AzureStorageAccount",
- "AzureStorageAccount": {
- "ConnectionString": "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://localhost:10000/devstoreaccount1;",
- "ContainerName": "files"
- }
+ },
+ "SqlDatabase": {
+ "Provider": "Postgres",
+ "ConnectionString": "User ID=postgres;Password=admin;Server=localhost;Port=5432;Database=enmeshed;"
+ // postgres,
+ // "ConnectionString": "Server=localhost;Database=enmeshed;User Id=sa;Password=Passw0rd;TrustServerCertificate=True" // sqlserver
}
- }
},
- "Messages": {
- "Application": {
- "MaxNumberOfMessageRecipients": 20
- }
+ "SwaggerUi": {
+ "Enabled": true
},
- "Relationships": {
- "PublicRelationshipTemplateReferences": {
- "test": [
- {
- "title": "a",
- "description": "Description",
- "truncatedReference": "Reference"
- },
- {
- "title": "b",
- "description": "Description",
- "truncatedReference": "Reference"
- },
- {
- "title": "c",
- "description": "Description",
- "truncatedReference": "Reference"
- }
- ],
- "client2": [
- {
- "title": "d",
- "description": "Description",
- "truncatedReference": "Reference"
- },
- {
- "title": "e",
- "description": "Description",
- "truncatedReference": "Reference"
- }
- ]
- }
+ "ModuleDefaults": {
+ "Application": {
+ "DidDomainName": "localhost"
+ },
+ "Infrastructure": {
+ "SqlDatabase": {
+ "Provider": "Postgres",
+ "ConnectionString": "User ID=postgres;Password=admin;Server=localhost;Port=5432;Database=enmeshed;"
+ // postgres
+ // "ConnectionString": "Server=localhost;Database=enmeshed;User Id=sa;Password=Passw0rd;TrustServerCertificate=True" // sqlserver
+ }
+ }
},
- "Synchronization": {},
- "Tags": {
- "Application": {
- "SupportedLanguages": [
- "de",
- "en"
- ],
- "TagsForAttributeValueTypes": {
- "IdentityFileReference": {
- "schulabschluss": {
- "displayNames": {
- "de": "Abschluss",
- "en": "Degree"
- },
- "children": {
- "realschule": {
- "displayNames": {
- "de": "Realschule",
- "en": "Secondary School"
- },
- "children": {
- "zeugnis": {
- "displayNames": {
- "de": "Zeugnis",
- "en": "Diploma"
- }
- }
- }
+ "Modules": {
+ "Announcements": {},
+ "Challenges": {},
+ "Quotas": {},
+ "Devices": {
+ "Application": {
+ "IdentityDeletion": {
+ "AuditLogRetentionPeriodInDays": 1
},
- "gymnasium": {
- "displayNames": {
- "de": "Gymnasium",
- "en": "High School"
- },
- "children": {
- "zeugnis": {
- "displayNames": {
- "de": "Zeugnis",
- "en": "Diploma"
- }
+ "Notifications": {
+ "Texts": [
+ {
+ "Code": "TestCode",
+ "Translations": {
+ "en": {
+ "Title": "Test Title",
+ "Body": "Test Body"
+ },
+ "de": {
+ "Title": "Test Titel",
+ "Body": "Test Inhalt"
+ }
+ }
+ }
+ ]
+ }
+ },
+ "Infrastructure": {
+ "PushNotifications": {
+ "Providers": {
+ "dummy": {
+ "enabled": true
+ },
+ "sse": {
+ "enabled": true,
+ "SseServerBaseAddress": "http://localhost:8083"
+ }
}
- }
}
- }
}
- },
- "PhoneNumber": {
- "notfall": {
- "displayNames": {
- "de": "Notfallkontakt",
- "en": "Emergency Contact"
- }
+ },
+ "Files": {
+ "Infrastructure": {
+ "BlobStorage": {
+ "ProductName": "AzureStorageAccount",
+ "AzureStorageAccount": {
+ "ConnectionString": "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://localhost:10000/devstoreaccount1;",
+ "ContainerName": "files"
+ }
+ }
}
- },
- "StreetAddress": {
- "lieferung": {
- "displayNames": {
- "de": "Lieferadresse",
- "en": "Deliver Address"
- }
- },
- "heimat": {
- "displayNames": {
- "de": "Heimatadresse",
- "en": "Home Address"
- }
+ },
+ "Messages": {
+ "Application": {
+ "MaxNumberOfMessageRecipients": 20
}
- }
- }
- }
- },
- "Tokens": {}
- },
- "Logging": {
- "MinimumLevel": {
- "Default": "Information",
- "Override": {
- "Backbone": "Debug"
- }
- },
- "WriteTo": {
- "Seq": {
- "Name": "Seq",
- "Args": {
- "ServerUrl": "http://localhost:5341"
- }
- },
- "Console": {
- "Args": {
- "Theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Sixteen, Serilog.Sinks.Console",
- "OutputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} (Correlation ID: {CorrelationId}){NewLine}{Exception}"
- }
- }
- }
- },
- "AppOnboarding": {
- "DefaultAppId": "frosch",
- "Apps": [
- {
- "Id": "frosch",
- "DisplayName": "Frosch",
- "Description": "Sie haben einen QR-Code der Frosch Wallet gescannt. Um fortfahren zu können, laden Sie die Frosch Wallet-App auf Ihr Gerät.",
- "IconUrl": "data:image/svg+xml;base64,<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_74083_138721)">
<mask id="mask0_74083_138721" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="60" height="60">
<path fill-rule="evenodd" clip-rule="evenodd" d="M38.1445 6.50434e-06C38.9789 6.50434e-06 39.8135 0.000201817 40.6484 0.00488932C41.3515 0.00899123 42.0544 0.0173909 42.7568 0.0361393C44.2878 0.0777453 45.8322 0.167611 47.3467 0.43946C48.8829 0.715419 50.3124 1.16629 51.708 1.87696C53.0797 2.57539 54.3358 3.48752 55.4238 4.57618C56.5119 5.66485 57.4246 6.92032 58.1231 8.292C58.8331 9.68763 59.2846 11.1171 59.5606 12.6533C59.833 14.1672 59.9223 15.7117 59.9639 17.2432C59.9832 17.9456 59.991 18.6491 59.9951 19.3516C60.0004 20.1859 60 21.0205 60 21.8555V38.1445C60 38.9789 59.9998 39.8135 59.9951 40.6484C59.991 41.3515 59.9826 42.0544 59.9639 42.7568C59.9223 44.2878 59.8324 45.8322 59.5606 47.3467C59.2846 48.8829 58.8337 50.3124 58.1231 51.708C57.4246 53.0797 56.5125 54.3358 55.4238 55.4238C54.3352 56.5119 53.0797 57.4246 51.708 58.1231C50.3124 58.8331 48.8829 59.2846 47.3467 59.5606C45.8328 59.833 44.2884 59.9223 42.7568 59.9639C42.0544 59.9832 41.3509 59.991 40.6484 59.9951C39.8141 60.0004 38.9795 60 38.1445 60H21.8555C21.0211 60 20.1865 59.9998 19.3516 59.9951C18.6485 59.991 17.9456 59.9826 17.2432 59.9639C15.7123 59.9223 14.1678 59.8324 12.6533 59.5606C11.1171 59.2846 9.68763 58.8337 8.292 58.1231C6.92032 57.4246 5.66426 56.5125 4.57618 55.4238C3.4881 54.3352 2.57539 53.0797 1.87696 51.708C1.16688 50.3124 0.715418 48.8829 0.43946 47.3467C0.167026 45.8328 0.0777448 44.2884 0.0361393 42.7568C0.0168048 42.0544 0.0089911 41.3509 0.00488932 40.6484C-0.000384122 39.8141 6.50365e-06 38.9795 6.50365e-06 38.1445V21.8555C6.50365e-06 21.0211 0.000201889 20.1865 0.00488932 19.3516C0.00899133 18.6485 0.0173914 17.9456 0.0361393 17.2432C0.0777462 15.7123 0.167611 14.1678 0.43946 12.6533C0.715423 11.1171 1.16628 9.68763 1.87696 8.292C2.5754 6.92032 3.48751 5.66426 4.57618 4.57618C5.66485 3.4881 6.92032 2.57539 8.292 1.87696C9.68762 1.16687 11.1171 0.715421 12.6533 0.43946C14.1673 0.167023 15.7117 0.0777458 17.2432 0.0361393C17.9456 0.0168053 18.6491 0.00899117 19.3516 0.00488932C20.1859 -0.000384089 21.0205 6.49731e-06 21.8555 6.50434e-06H38.1445Z" fill="#D9D9D9"/>
</mask>
<g mask="url(#mask0_74083_138721)">
<rect width="60" height="60" fill="#FFCBA5"/>
<g clip-path="url(#clip1_74083_138721)">
<path d="M28.9772 16.2215C30.8599 16.2215 32.3861 14.6954 32.3861 12.8129C32.3861 10.9304 30.8599 9.4043 28.9772 9.4043C27.0946 9.4043 25.5683 10.9304 25.5683 12.8129C25.5683 14.6954 27.0946 16.2215 28.9772 16.2215Z" fill="#192952"/>
<path d="M63.5695 51.8556C63.3124 51.1498 63.1318 50.4057 63.0333 49.6343C62.6776 46.8057 63.5258 44.1029 65.1728 42.0348C64.0839 41.1539 62.9841 40.3004 61.8624 39.4687C61.8076 39.4304 61.7584 39.3921 61.7037 39.3538C61.2003 38.9818 60.6914 38.6152 60.1825 38.2541C59.5806 37.8274 58.9733 37.4061 58.3604 36.9957C58.3495 36.9903 58.3386 36.9793 58.3276 36.9739C56.4563 42.0566 53.9666 46.3187 51.9421 49.317C55.3291 51.3304 59.3672 52.2988 63.5695 51.8556Z" fill="#192952"/>
<path d="M36.8401 45.7278C37.1739 46.5157 38.022 46.9917 38.8975 46.8221C39.9043 46.6251 40.5609 45.6567 40.3639 44.65C40.1669 43.6433 39.193 42.9868 38.1916 43.1837C37.8688 43.2439 37.5897 43.3916 37.3599 43.5886C35.8388 42.9922 34.2356 42.5873 32.5722 42.3959C33.6665 39.9338 34.5475 37.138 34.8046 34.2054C39.1382 37.1927 43.1162 40.6888 46.6236 44.6391C47.4772 39.5344 47.6194 34.8127 47.3951 30.6929C46.7166 30.3591 46.0381 30.0363 45.3541 29.719C44.6319 29.3853 43.9041 29.057 43.1709 28.7396C32.6597 24.2313 21.2347 21.6052 9.35559 21.2331C10.9533 23.9468 14.2583 24.7839 14.2583 24.7839C18.1541 25.7961 21.9187 27.1639 25.5191 28.8545C26.1155 30.8351 27.4178 36.0602 26.9965 42.5655C24.08 43.0852 21.4262 44.2397 19.1609 45.881C18.8107 45.706 18.4004 45.6348 17.9845 45.7169C16.9777 45.9139 16.3211 46.8877 16.5181 47.889C16.7151 48.8902 17.6836 49.5522 18.6904 49.3553C19.4838 49.2021 20.0528 48.5619 20.1623 47.8014C22.2251 47.0902 24.37 46.5376 26.5861 46.1601C26.3836 47.402 26.1155 48.6768 25.7544 49.968C25.7489 49.968 25.738 49.968 25.7325 49.968C24.7257 50.165 24.0691 51.1389 24.2661 52.1401C24.463 53.1414 25.4315 53.8034 26.4383 53.6064C27.4451 53.4095 28.1018 52.4356 27.9048 51.4343C27.8446 51.1334 27.7133 50.8708 27.5327 50.6465C28.3206 49.6562 29.612 47.9109 30.8978 45.6622C32.9005 45.5363 34.8812 45.5582 36.8292 45.7224L36.8401 45.7278Z" fill="#192952"/>
<path d="M99.2507 39.1135C98.6379 34.2167 94.1675 30.7425 89.2703 31.3553C89.0952 31.3772 88.9256 31.41 88.7559 31.4428C81.9163 24.1661 75.4323 16.9221 66.1522 14.6625C65.9443 14.6133 65.7364 14.564 65.5284 14.5203C55.8927 12.4357 45.9506 11.2922 35.8169 11.1609C34.9961 9.08733 32.8622 7.74688 30.5476 8.03686C30.3889 8.05874 30.2303 8.0861 30.0771 8.11893C29.021 6.93167 27.4178 6.26965 25.7216 6.48303C23.117 6.8113 21.2347 9.08186 21.3496 11.6588C13.1037 12.8734 7.78521 16.665 9.3556 21.2335C21.2293 21.6055 32.6597 24.2317 43.16 28.7345C44.5881 29.3473 45.9943 30.0039 47.3896 30.6878C47.7179 36.728 47.2638 44.0595 44.9273 52.0092C39.8933 52.4578 36.0194 54.0664 34.1097 55.0238C33.6993 54.6901 33.1522 54.5314 32.5941 54.6354C31.5873 54.8324 30.9306 55.8062 31.1276 56.8075C31.3246 57.8087 32.2986 58.4707 33.2999 58.2738C34.1863 58.1041 34.7992 57.3272 34.7992 56.4573C38.7552 55.4068 41.5786 55.5327 41.5786 55.5327C39.6909 56.5284 37.7101 58.8209 36.6377 60.1832C36.4571 60.1668 36.2765 60.1613 36.0905 60.1996C35.0837 60.3966 34.4271 61.365 34.6241 62.3717C34.821 63.3784 35.795 64.035 36.7963 63.838C37.7977 63.641 38.4597 62.6726 38.2628 61.6659C38.2409 61.562 38.208 61.4635 38.1752 61.365C42.1641 58.2136 45.4855 56.906 45.4855 56.906C45.5238 58.1643 45.4253 60.0738 45.3377 61.4252C44.4622 61.7097 43.9151 62.6015 44.0902 63.5316C44.2871 64.5383 45.2611 65.1949 46.2624 64.9979C47.2638 64.8009 47.9258 63.8325 47.7289 62.8258C47.6523 62.421 47.4389 62.0763 47.1543 61.8136C48.8998 57.8908 49.0038 54.3673 48.9874 53.2895C50.6617 51.2542 55.2963 45.1756 58.3221 36.9688C60.6805 38.5445 62.9567 40.2406 65.1673 42.0297C63.5203 44.0978 62.6777 46.8006 63.0278 49.6292C63.5477 53.76 66.475 56.999 70.2286 58.1151C66.9511 58.8045 64.445 59.8823 63.0224 60.5936C62.612 60.2598 62.0648 60.1012 61.5067 60.2051C60.4999 60.4021 59.8433 61.3705 60.0403 62.3772C60.2373 63.3839 61.2112 64.0404 62.2125 63.8435C63.099 63.6739 63.7118 62.8969 63.7118 62.027C67.6679 60.9765 70.4913 61.1024 70.4913 61.1024C68.6035 62.0982 66.6228 64.3906 65.5503 65.7529C65.3697 65.7365 65.1892 65.7311 65.0031 65.7694C63.9963 65.9663 63.3397 66.9402 63.5367 67.9414C63.7337 68.9481 64.7077 69.6047 65.709 69.4077C66.7103 69.2108 67.3724 68.2369 67.1754 67.2356C67.1535 67.1317 67.1207 67.0332 67.0879 66.9347C71.0768 63.7833 74.3981 62.4757 74.3981 62.4757C74.4364 63.7341 74.3379 65.6435 74.2504 66.9949C73.3749 67.2794 72.8277 68.1712 73.0028 69.1013C73.1998 70.108 74.1738 70.7646 75.1751 70.5676C76.1819 70.3707 76.8385 69.4023 76.6415 68.3955C76.5649 67.9907 76.3515 67.646 76.067 67.3834C77.424 64.3304 77.7906 61.5127 77.8781 59.9042C78.6278 59.6744 89.5986 56.1947 97.3137 45.8376C97.5326 45.5641 97.7405 45.285 97.932 44.9896C97.943 44.9732 97.9539 44.9568 97.9703 44.9404H97.9649C99.01 43.2552 99.5079 41.2254 99.2452 39.108L99.2507 39.1135ZM29.3986 16.1945C27.5327 16.4297 25.831 15.1057 25.5957 13.24C25.3604 11.3743 26.6846 9.67276 28.5504 9.43749C30.4163 9.20223 32.118 10.5263 32.3533 12.392C32.5886 14.2577 31.2644 15.9592 29.3986 16.1945Z" fill="white"/>
</g>
</g>
</g>
<defs>
<clipPath id="clip0_74083_138721">
<rect width="60" height="60" fill="white"/>
</clipPath>
<clipPath id="clip1_74083_138721">
<rect width="90.2344" height="64.1667" fill="white" transform="translate(9.08203 6.44531)"/>
</clipPath>
</defs>
</svg>
",
- "BannerUrl": "data:image/svg+xml;base64,<svg width="279" height="81" viewBox="0 0 279 81" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_74083_138397)">
<g clip-path="url(#clip1_74083_138397)">
<g clip-path="url(#clip2_74083_138397)">
<path d="M46.0025 14.1657C48.5299 14.1657 50.5789 12.117 50.5789 9.58969C50.5789 7.06243 48.5299 5.01367 46.0025 5.01367C43.475 5.01367 41.426 7.06243 41.426 9.58969C41.426 12.117 43.475 14.1657 46.0025 14.1657Z" fill="#192952"/>
<path d="M92.4426 62.0046C92.0974 61.0571 91.855 60.0581 91.7227 59.0224C91.2453 55.225 92.3839 51.5965 94.5949 48.8201C93.1331 47.6375 91.6566 46.4916 90.1507 45.3752C90.0773 45.3238 90.0112 45.2724 89.9377 45.2209C89.2619 44.7215 88.5787 44.2293 87.8956 43.7446C87.0875 43.1716 86.2721 42.6061 85.4494 42.0552C85.4347 42.0478 85.42 42.0332 85.4053 42.0258C82.8931 48.8494 79.5507 54.5713 76.8328 58.5964C81.3798 61.2994 86.801 62.5995 92.4426 62.0046Z" fill="#192952"/>
<path d="M56.5584 53.778C57.0065 54.8357 58.1451 55.4748 59.3204 55.2471C60.672 54.9826 61.5535 53.6825 61.2891 52.331C61.0246 50.9795 59.7171 50.0981 58.3728 50.3625C57.9394 50.4433 57.5647 50.6417 57.2562 50.9061C55.2141 50.1055 53.0618 49.5619 50.8286 49.3048C52.2978 45.9995 53.4805 42.2462 53.8257 38.3092C59.6436 42.3196 64.984 47.0132 69.6927 52.3163C70.8386 45.4633 71.0296 39.1245 70.7284 33.5936C69.8175 33.1455 68.9067 32.7122 67.9884 32.2862C67.0188 31.8381 66.0418 31.3974 65.0575 30.9714C50.9462 24.919 35.6081 21.3933 19.6604 20.8939C21.8054 24.537 26.2422 25.6608 26.2422 25.6608C31.4725 27.0197 36.5264 28.856 41.3599 31.1256C42.1606 33.7846 43.9089 40.7992 43.3433 49.5325C39.428 50.2303 35.8652 51.7802 32.8241 53.9837C32.3539 53.7486 31.803 53.6532 31.2447 53.7633C29.8931 54.0278 29.0116 55.3352 29.2761 56.6794C29.5405 58.0235 30.8407 58.9123 32.1923 58.6479C33.2575 58.4422 34.0214 57.5828 34.1684 56.5618C36.9377 55.607 39.8173 54.8651 42.7923 54.3583C42.5205 56.0256 42.1606 57.7371 41.6758 59.4705C41.6684 59.4705 41.6537 59.4705 41.6464 59.4705C40.2948 59.7349 39.4133 61.0424 39.6777 62.3865C39.9422 63.7307 41.2424 64.6194 42.594 64.355C43.9456 64.0906 44.8271 62.7832 44.5627 61.439C44.4819 61.035 44.3056 60.6825 44.0632 60.3813C45.121 59.0518 46.8546 56.7087 48.5808 53.6899C51.2694 53.5209 53.9286 53.5503 56.5437 53.7707L56.5584 53.778Z" fill="#192952"/>
<path d="M140.345 44.8967C139.522 38.3228 133.52 33.6587 126.946 34.4813C126.711 34.5107 126.483 34.5548 126.255 34.5989C117.073 24.8298 108.368 15.1049 95.9098 12.0713C95.6307 12.0052 95.3515 11.9391 95.0724 11.8804C82.1364 9.08187 68.7891 7.54674 55.1847 7.37045C54.0828 4.58665 51.2179 2.78709 48.1107 3.17638C47.8976 3.20576 47.6846 3.24249 47.4789 3.28656C46.0612 1.69266 43.9089 0.803901 41.6317 1.09036C38.1351 1.53107 35.6081 4.5793 35.7624 8.03886C24.6922 9.66948 17.5521 14.7597 19.6604 20.8928C35.6008 21.3923 50.9461 24.918 65.0427 30.963C66.96 31.7857 68.8479 32.6671 70.721 33.5852C71.1618 41.6943 70.5521 51.5368 67.4154 62.2092C60.6573 62.8115 55.4565 64.971 52.8928 66.2564C52.3418 65.8083 51.6073 65.5953 50.858 65.7349C49.5064 65.9993 48.6249 67.3068 48.8893 68.6509C49.1538 69.9951 50.4613 70.8838 51.8056 70.6194C52.9956 70.3917 53.8183 69.3487 53.8183 68.1808C59.1294 66.7706 62.9198 66.9395 62.9198 66.9395C60.3855 68.2763 57.7263 71.3539 56.2865 73.1829C56.0441 73.1608 55.8017 73.1535 55.552 73.2049C54.2003 73.4693 53.3188 74.7694 53.5833 76.1209C53.8477 77.4724 55.1553 78.3538 56.4996 78.0894C57.8438 77.825 58.7327 76.5249 58.4682 75.1734C58.4389 75.0338 58.3948 74.9016 58.3507 74.7694C63.7058 70.5386 68.1647 68.7831 68.1647 68.7831C68.2161 70.4725 68.0839 73.036 67.9664 74.8502C66.791 75.2322 66.0565 76.4294 66.2915 77.6781C66.556 79.0296 67.8635 79.911 69.2078 79.6466C70.5521 79.3822 71.4409 78.0821 71.1765 76.7306C71.0736 76.187 70.7872 75.7243 70.4052 75.3717C72.7485 70.1052 72.8881 65.375 72.866 63.928C75.1138 61.1956 81.3357 53.0352 85.398 42.0175C88.564 44.1329 91.6199 46.4098 94.5876 48.8117C92.3765 51.5882 91.2452 55.2167 91.7153 59.0141C92.4132 64.5597 96.3432 68.908 101.382 70.4064C96.9823 71.3319 93.6179 72.7789 91.708 73.7337C91.1571 73.2857 90.4225 73.0727 89.6732 73.2122C88.3216 73.4767 87.4401 74.7768 87.7045 76.1283C87.969 77.4798 89.2765 78.3612 90.6208 78.0968C91.8108 77.8691 92.6336 76.826 92.6336 75.6582C97.9446 74.2479 101.735 74.4168 101.735 74.4168C99.2007 75.7537 96.5415 78.8313 95.1018 80.6602C94.8593 80.6382 94.6169 80.6308 94.3672 80.6823C93.0156 80.9467 92.1341 82.2541 92.3985 83.5983C92.663 84.9498 93.9705 85.8312 95.3148 85.5668C96.6591 85.3023 97.5479 83.9949 97.2835 82.6507C97.2541 82.5112 97.21 82.379 97.1659 82.2468C102.521 78.016 106.98 76.2605 106.98 76.2605C107.031 77.9499 106.899 80.5133 106.782 82.3276C105.606 82.7095 104.872 83.9068 105.107 85.1554C105.371 86.5069 106.679 87.3884 108.023 87.1239C109.375 86.8595 110.256 85.5594 109.992 84.2079C109.889 83.6644 109.602 83.2016 109.22 82.8491C111.042 78.7505 111.534 74.9677 111.652 72.8083C112.658 72.4998 127.387 67.8283 137.744 53.9239C138.038 53.5567 138.317 53.1821 138.574 52.7854C138.589 52.7634 138.604 52.7414 138.626 52.7193H138.618C140.021 50.457 140.69 47.732 140.337 44.8894L140.345 44.8967ZM46.568 14.128C44.0631 14.4438 41.7786 12.6663 41.4627 10.1616C41.1468 7.65691 42.9245 5.37258 45.4294 5.05673C47.9344 4.74089 50.2189 6.51842 50.5348 9.02311C50.8506 11.5278 49.073 13.8121 46.568 14.128Z" fill="#FFCBA5"/>
</g>
<rect x="87.4674" y="-0.304688" width="2.01375" height="80.55" fill="#192952"/>
</g>
<path d="M113.396 55.1715L105.215 28.1013C105.093 27.6886 105.399 27.2682 105.835 27.2682H110.542C110.832 27.2682 111.093 27.4593 111.169 27.7421L117.054 48.851H117.445L123.605 27.7344C123.689 27.4593 123.942 27.2682 124.233 27.2682H128.771C129.062 27.2682 129.314 27.4593 129.398 27.7344L135.498 48.851H135.941L141.773 27.7421C141.849 27.4593 142.11 27.2682 142.4 27.2682H146.992C147.428 27.2682 147.742 27.6886 147.612 28.1089L139.37 55.1792C139.286 55.4543 139.033 55.6377 138.75 55.6377H132.697C132.413 55.6377 132.153 55.4467 132.077 55.1792L126.59 36.9515H126.146L120.766 55.1792C120.682 55.4543 120.429 55.6454 120.146 55.6454H114.039C113.756 55.6454 113.503 55.4543 113.419 55.1868L113.396 55.1715Z" fill="#192952"/>
<path d="M158.487 56.0733C156.558 56.0733 154.928 55.8135 153.612 55.2938C152.296 54.7741 151.301 53.9105 150.635 52.7106C149.969 51.503 149.632 49.8675 149.632 47.7887C149.632 45.6029 149.893 43.8681 150.413 42.5917C150.933 41.3154 151.821 40.3906 153.084 39.8404C154.346 39.2825 156.13 39.0073 158.433 39.0073C158.8 39.0073 159.351 39.015 160.078 39.0379C160.805 39.0532 161.64 39.0761 162.589 39.0914C163.538 39.1143 164.479 39.1296 165.428 39.1449C166.109 39.1602 166.744 39.1755 167.341 39.1984C167.716 39.2137 168.022 38.9156 168.022 38.5411V37.8915C168.022 36.447 167.93 35.3159 167.747 34.4982C167.563 33.6804 167.18 33.0766 166.606 32.6945C166.032 32.3047 165.206 32.0525 164.127 31.9455C163.048 31.8309 161.655 31.7774 159.948 31.7774C159.129 31.7774 158.173 31.808 157.079 31.8615C155.984 31.915 154.913 31.9837 153.88 32.0525C153.237 32.0984 152.686 32.1519 152.227 32.213C151.829 32.2665 151.484 31.9608 151.484 31.5634V28.2083C151.484 27.8949 151.706 27.6198 152.02 27.5587C153.398 27.3141 154.89 27.1307 156.497 27.016C158.318 26.8861 160.132 26.8173 161.953 26.8173C164.073 26.8173 165.841 26.9472 167.272 27.2071C168.703 27.4669 169.859 27.872 170.754 28.4299C171.642 28.9878 172.315 29.7062 172.759 30.6004C173.203 31.4946 173.517 32.5569 173.708 33.7951C173.892 35.0408 173.984 36.4547 173.984 38.052V54.9804C173.984 55.3397 173.693 55.6301 173.333 55.6301H169.139C168.795 55.6301 168.512 55.3626 168.489 55.0187L168.305 51.9616H167.969C167.333 53.1462 166.492 54.048 165.435 54.6595C164.379 55.2709 163.231 55.6606 162.007 55.8288C160.783 55.9969 159.612 56.081 158.494 56.081L158.487 56.0733ZM161.104 51.2891C162.03 51.2891 162.879 51.2279 163.637 51.098C164.395 50.9681 165.068 50.7464 165.642 50.4331C166.216 50.1197 166.675 49.6841 167.004 49.1262C167.341 48.4995 167.586 47.7734 167.754 46.9557C167.923 46.1379 168.007 45.1749 168.007 44.0668V43.0656H159.872C158.647 43.0656 157.706 43.1573 157.056 43.3407C156.405 43.5241 155.969 43.9139 155.747 44.51C155.525 45.1062 155.41 46.008 155.41 47.2385C155.41 48.3925 155.54 49.2485 155.801 49.8217C156.061 50.3949 156.612 50.7846 157.446 50.991C158.28 51.1973 159.497 51.2967 161.096 51.2967L161.104 51.2891Z" fill="#192952"/>
<path d="M179.555 55.0569V19.6103C179.555 19.297 179.846 19.0371 180.198 19.0371H184.805C185.164 19.0371 185.455 19.297 185.455 19.6103V55.0569C185.455 55.3702 185.164 55.6301 184.812 55.6301H180.198C179.838 55.6301 179.555 55.3779 179.555 55.0569Z" fill="#192952"/>
<path d="M192.305 55.0492V19.618C192.305 19.297 192.595 19.0371 192.963 19.0371H197.554C197.914 19.0371 198.213 19.297 198.213 19.618V55.0492C198.213 55.3702 197.922 55.6301 197.554 55.6301H192.963C192.603 55.6301 192.305 55.3702 192.305 55.0492Z" fill="#192952"/>
<path d="M216.709 56.0733C214.299 56.0733 212.286 55.9129 210.694 55.5995C209.095 55.2862 207.817 54.7665 206.853 54.0404C205.888 53.3144 205.161 52.3896 204.679 51.2585C204.197 50.1274 203.883 48.7517 203.73 47.1391C203.585 45.5265 203.508 43.6464 203.508 41.4912C203.508 38.9309 203.638 36.7298 203.899 34.8727C204.159 33.0155 204.694 31.487 205.513 30.2794C206.332 29.0719 207.603 28.193 209.332 27.6351C211.062 27.0772 213.373 26.802 216.266 26.802C218.531 26.802 220.39 26.9778 221.837 27.3294C223.283 27.6809 224.423 28.2312 225.265 28.9725C226.107 29.7139 226.712 30.6692 227.102 31.8385C227.492 33.0079 227.745 34.3988 227.852 36.0114C227.967 37.624 228.02 39.4506 228.02 41.4912V42.7217C228.02 43.0885 227.722 43.3789 227.362 43.3789H209.477C209.477 45.045 209.554 46.3901 209.699 47.4142C209.845 48.4307 210.189 49.2103 210.733 49.7529C211.268 50.2879 212.125 50.6624 213.296 50.8687C214.467 51.0751 216.051 51.1744 218.056 51.1744C218.906 51.1744 219.847 51.1591 220.873 51.1209C221.89 51.0827 222.939 51.0063 224.018 50.8993C224.798 50.8152 225.525 50.7464 226.191 50.6853C226.582 50.6471 226.911 50.9528 226.911 51.3426V54.6824C226.911 55.011 226.673 55.2862 226.352 55.332C225.656 55.4467 224.86 55.5536 223.957 55.653C222.809 55.7829 221.6 55.8823 220.337 55.9587C219.074 56.0351 217.865 56.0733 216.717 56.0733H216.709ZM222.334 39.336V39.1678C222.334 37.5017 222.235 36.1719 222.028 35.1937C221.821 34.2078 221.492 33.4664 221.026 32.9696C220.559 32.4652 219.931 32.1366 219.135 31.9685C218.339 31.8003 217.345 31.7163 216.158 31.7163C214.674 31.7163 213.495 31.8156 212.623 32.022C211.75 32.2283 211.092 32.6028 210.648 33.1607C210.204 33.7186 209.898 34.4905 209.73 35.4688C209.562 36.4547 209.477 37.7387 209.477 39.336H222.342H222.334Z" fill="#192952"/>
<path d="M242.943 26.695V19.6027C242.943 19.2893 242.691 19.0371 242.377 19.0371H237.533C237.219 19.0371 236.966 19.2893 236.966 19.6027V26.695C236.966 27.0084 236.714 27.2606 236.4 27.2606H231.785C231.472 27.2606 231.219 27.5128 231.219 27.8261V31.6398C231.219 31.9532 231.472 32.2054 231.785 32.2054H236.4C236.714 32.2054 236.966 32.4576 236.966 32.7709V55.0569C236.966 55.3702 237.219 55.6224 237.533 55.6224H242.377C242.691 55.6224 242.943 55.3702 242.943 55.0569V32.7709C242.943 32.4576 243.196 32.2054 243.51 32.2054H257.147C259.106 32.2054 260.698 30.6234 260.698 28.6592V27.8261C260.698 27.5128 260.445 27.2606 260.132 27.2606H243.51C243.196 27.2606 242.943 27.0084 242.943 26.6874V26.695Z" fill="#192952"/>
</g>
<defs>
<clipPath id="clip0_74083_138397">
<rect width="279" height="80.5512" fill="white"/>
</clipPath>
<clipPath id="clip1_74083_138397">
<rect width="70.4812" height="80.55" fill="white" transform="translate(19 -0.304688)"/>
</clipPath>
<clipPath id="clip2_74083_138397">
<rect width="121.14" height="86.1437" fill="white" transform="translate(19.2931 1.03906)"/>
</clipPath>
</defs>
</svg>
",
- "ColorScheme":
- {
- "Primary": "#192952",
- "Secondary": "#EFE0D5",
- "Background": "#FFF8F5",
- "OnPrimary": "#FFF8F5",
- "OnSecondary": "#221A14"
},
- "AppleAppStore": {
- "AppLink": "https://apps.apple.com/de/app/frosch/id6756783868"
+ "Relationships": {
+ "PublicRelationshipTemplateReferences": {
+ "test": [
+ {
+ "title": "a",
+ "description": "Description",
+ "truncatedReference": "Reference"
+ },
+ {
+ "title": "b",
+ "description": "Description",
+ "truncatedReference": "Reference"
+ },
+ {
+ "title": "c",
+ "description": "Description",
+ "truncatedReference": "Reference"
+ }
+ ],
+ "client2": [
+ {
+ "title": "d",
+ "description": "Description",
+ "truncatedReference": "Reference"
+ },
+ {
+ "title": "e",
+ "description": "Description",
+ "truncatedReference": "Reference"
+ }
+ ]
+ }
},
- "GooglePlayStore": {
- "AppLink": "https://play.google.com/store/apps/details?id=app.frosch.prod"
- }
- },
- {
- "Id": "enmeshed",
- "DisplayName": "enmeshed",
- "Description": "Sie haben einen QR-Code der enmeshed-Plattform gescannt. Um fortfahren zu können, laden Sie die enmeshed-App auf Ihr Gerät.",
- "ColorScheme":
- {
- "Primary": "#192952",
- "Secondary": "#EFE0D5",
- "Background": "#FFF8F5",
- "OnPrimary": "#FFF8F5",
- "OnSecondary": "#221A14"
+ "Synchronization": {},
+ "Tags": {
+ "Application": {
+ "SupportedLanguages": ["de", "en"],
+ "TagsForAttributeValueTypes": {
+ "IdentityFileReference": {
+ "schulabschluss": {
+ "displayNames": {
+ "de": "Abschluss",
+ "en": "Degree"
+ },
+ "children": {
+ "realschule": {
+ "displayNames": {
+ "de": "Realschule",
+ "en": "Secondary School"
+ },
+ "children": {
+ "zeugnis": {
+ "displayNames": {
+ "de": "Zeugnis",
+ "en": "Diploma"
+ }
+ }
+ }
+ },
+ "gymnasium": {
+ "displayNames": {
+ "de": "Gymnasium",
+ "en": "High School"
+ },
+ "children": {
+ "zeugnis": {
+ "displayNames": {
+ "de": "Zeugnis",
+ "en": "Diploma"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "PhoneNumber": {
+ "notfall": {
+ "displayNames": {
+ "de": "Notfallkontakt",
+ "en": "Emergency Contact"
+ }
+ }
+ },
+ "StreetAddress": {
+ "lieferung": {
+ "displayNames": {
+ "de": "Lieferadresse",
+ "en": "Deliver Address"
+ }
+ },
+ "heimat": {
+ "displayNames": {
+ "de": "Heimatadresse",
+ "en": "Home Address"
+ }
+ }
+ }
+ }
+ }
},
- "IconUrl": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPAAAADwCAMAAAAJixmgAAAAA3NCSVQICAjb4U/gAAAATlBMVEX///8BNor49vUBAAAgICD+bQCVlZX/dgCampoXQo17fH0AH4Xm6OzS1d2/wceqrrj/x6n+18Jsf6s7XZz/nl+Jl7r/6dr6hiz/t4w6RV1ba3fKAAAFhklEQVR4nO2d65LaMAxGE283JJsbCQTY93/R2klgIYUQS526n6zzYzvT6XR8RrIsG5tNEkVRFEVRFEVRFEVRFEVRFOUppnKY0MP4J1R10+bZTN42srWrZnTNLeMP+4eVrqU61202az6S5Y1E5eqF7oQ4ZdOu2I5RrkMP8a9S5+u+TrkVFOQ34b1ShR7nX+JdOv8EWUZam/fpfBUWYbzdV0aMvXwlxHjr/L0pg1euxtPXAr06Vf6+eRt60Bz8dbELFyGhHbBJbWi+eRN64FSIAYYNMTXAsLO4pgrneeih0yDrgnYflDX4KgxZtsgly51/hB48hZbsi5nThuELWacZU9gdcIUevj+MRQlTmFGzHKGH7w9POMPrLqMT5qxKmMLRRZhVpQGFo5vDzGUJT5jVeCCuw6zWEvGsltdLI26IOQFG3B6yqhZgkWZVLcTNUsI6xAPc/yecnIbMaEadBs1oek5D1mgHMcSwAabuiWEDTAwxZJd1hVSoMUv0hPFPatA1+Ip3UkMntOXr29MXt0KPfH18fPkZhx4xj6+PX798jDPogjX5+hij3xGffK3x97bKlYE/fLj62hBXW67UwtfnH99kQweStbgN5cij7/iKZ00X/lHL0jdZe7gk4KXWE9/ETC/xlrJZJuAt3jPfEWOdb08tp+eWNfjcdbz0dRhT1U3TtK39Uct4W7rqKxBpvubUdfvLZd91p6f5KMrXdMfz7vPG7nzpltKSfLujk3zA/sWxu/83cnzNfre0vTrv9rcwy/G1us9sZ+fdfvpXYnxPxxXdUfl4Sh58sdfX/fNkXgTZSImveRfeWfksxfe8yddVLxm+a9VqqSzC14dPeN9kaz5fjdF9t9WrO87o65Gn7+5zH3rMHE6+us74FHrUDLwT2gkfQ4+aTkfwRU5qvxXpjtADp+JfscBDfKZGGDTEtBk8hrh7/7//h1BK9AxkoSaXLAdiu0XPaNCcvnCEL6FHT4CuazmHHj0BljDgJD4xMtqCt4PgCQNWLU6RhhSmNtKzMF47rcIqLEw4uqIV3bLEFMZrPKJrLePbPES3PYzuACC6Ix7GIR7opy3RHdNGdxAf30ct0X2YFt3HpfF9IB7flYfoLrX4J/Un+LWl+C6meV21FHH1MDl5xFjC5VKP68M7GdeH47sgnkT3BCCJ75FHEt0znmTlodZO5kMtR1xP8UYie2w5EdVz2k1EbQy/Om1j1dhUdTsMfd8Pg5xfqP36ay2a4ZCWZTpTpkWP/pU0Iy+6zLq3imnxgLU+gH+r1MgT4+ZQLmSvzmU64Id5aVy/0p2dwb8LL1kYm2FN11Ee0L9v6d7YhnddV0aQb8Z/VKoXQe7Ri9ds/L3FdgzyAb12jcabfYUYe/ha4wI+q99Xq0WMQ4+YSb2pXN0bD6GHzMIcfIWLEvrrLQdvXzuNgQtX7TmDJ2PgpPZPaEcJ22SSAmxD3IceOBVagHFDTAwwboh7YoBtiCELtSH7Fpg7RXJGozaY9IwGzWlqjR6FAet0xfCF7LYYUxhzErecCBdp6OH7Q9go3QvjnXxwijRkmVZhP2G8dUmF/YTxUppZpaMTxluWmtg6LV5rCXjmwdo8QJ4AsPbDeKsSb/dQhh48Bc4RD+B22MIIMGJG25wmn0sDLkoOcp2GrNEOarMF2GZNEEMMG2AbYtosRg1wkpiCEGPoOw+EtRixjb7DO6nh76b5dtSgPccPld9HTNATeKLadpV29sVdkX7wMBbha403Lk6pgHyeMP2WWp0W6PXqjuZtWqdlD74ePVL16688ykJKOt9Ye8dTpgNu//yapn/62sM9TROVzXfU7aF8kHbPD3v8XyG+RtUMVnqm6AX8wvQtVFVd15WUt7SKoiiKoiiKoiiKoiiKoijb+A3hKz2nnuI0BgAAAABJRU5ErkJggg==",
- "BannerUrl": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjU1IiBoZWlnaHQ9Ijc0IiB2aWV3Qm94PSIwIDAgMjU1IDc0IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNNzIuNDIyNyAzOS4yNjY4SDU3LjM0MzFDNTcuNzQzNyA0Mi4zNDg4IDU5LjM3NyA0My41OTg0IDYxLjk4ODIgNDMuNTk4NEM2NC4xOTg5IDQzLjU5ODQgNjUuNDgzNyA0Mi42NTg2IDY2LjE0NDMgNDEuMDUyTDcyLjE1NzUgNDMuMDYyOUM3MC44NzI2IDQ2LjkwMSA2Ni42MjgxIDQ4Ljk1MzkgNjEuOTg4MiA0OC45NTM5QzU0LjY0ODcgNDguOTUzOSA1MC4wNTA0IDQ0LjcxMTUgNTAuMDUwNCAzNy4zNTA0QzUwLjA1MDQgMjkuOTg5MiA1NC43ODM5IDI1Ljc0NjkgNjEuNjM0NSAyNS43NDY5QzY4LjQ4NTEgMjUuNzQ2OSA3Mi41OTk2IDMwLjE2NzggNzIuNTk5NiAzNi4zMjY1QzcyLjU5OTYgMzcuNDQ0OSA3Mi41MTEyIDM4LjU1OCA3Mi40MjI3IDM5LjI3MjFWMzkuMjY2OFpNNTcuMzkgMzUuMjAyOUg2NS40MzY5QzY1LjE3MTYgMzIuNTI1MiA2My45MzM2IDMxLjA0OTggNjEuNjM0NSAzMS4wNDk4QzU5LjMzNTQgMzEuMDQ5OCA1Ny44MzIxIDMyLjM0NjcgNTcuMzkgMzUuMjAyOVoiIGZpbGw9IiMyMTIxMjEiLz4KPHBhdGggZD0iTTk2Ljc0MDUgMzMuNjQzNlY0OC41MDc2SDg5LjIyNDFWMzUuNjU0NUM4OS4yMjQxIDMyLjU3MjUgODcuOTM5MyAzMS41NDg2IDg2LjA4MjMgMzEuNTQ4NkM4My45MTMyIDMxLjU0ODYgODIuMTAzIDMyLjk3NjcgODIuMTAzIDM2LjY4MzZWNDguNTEyOUg3NC41ODY2VjI2LjE5ODRIODEuMzA3Mkw4MS41MjU2IDMwLjcwODVDODIuODUyMSAyNy40NDggODUuNTUxNyAyNS43NTIxIDg5LjA4ODggMjUuNzUyMUM5My42NDU1IDI1Ljc1MjEgOTYuNzQwNSAyOC40NzcxIDk2Ljc0MDUgMzMuNjU0MVYzMy42NDM2WiIgZmlsbD0iIzIxMjEyMSIvPgo8cGF0aCBkPSJNOTkuNzkzOSAyNi4xODc5SDEwNi41MTRMMTA2LjczMyAzMC41MTk1QzEwOC4xNDggMjcuMzk1NSAxMTAuODAxIDI1Ljc0MTYgMTE0LjE2MSAyNS43NDE2QzExNy41MjEgMjUuNzQxNiAxMTkuOTk3IDI3LjI1OSAxMjEuMTQ3IDMwLjE2MjVDMTIyLjUyIDI3LjI1OSAxMjUuMzkxIDI1Ljc0MTYgMTI4LjU3NSAyNS43NDE2QzEzMi45MDggMjUuNzQxNiAxMzYuMTc5IDI4LjQxOTMgMTM2LjEzOCAzMy42NDM2TDEzNi4wNDkgNDguNTA3NkgxMjguNjIxVjM1LjM4NjdDMTI4LjYyMSAzMi41Nzc3IDEyNy40MjUgMzEuNTQ4NiAxMjUuNjE1IDMxLjU0ODZDMTIzLjM2MyAzMS41NDg2IDEyMS43MjQgMzMuMjQ0NSAxMjEuNzI0IDM2LjU5NDNWNDguNTEyOUgxMTQuMjA4VjM1LjM5MkMxMTQuMjA4IDMyLjU4MyAxMTIuOTcgMzEuNTUzOSAxMTEuMjAxIDMxLjU1MzlDMTA5LjEyIDMxLjU1MzkgMTA3LjMxIDMzLjA3MTMgMTA3LjMxIDM2LjczMDhWNDguNTEyOUg5OS43OTM5VjI2LjE4NzlaIiBmaWxsPSIjMjEyMTIxIi8+CjxwYXRoIGQ9Ik0xNjAuNDA5IDM5LjI2NjhIMTQ1LjMyOUMxNDUuNzI0IDQyLjM0ODggMTQ3LjM2MyA0My41OTg0IDE0OS45NzQgNDMuNTk4NEMxNTIuMTg1IDQzLjU5ODQgMTUzLjQ2NSA0Mi42NTg2IDE1NC4xMyA0MS4wNTJMMTYwLjE0MyA0My4wNjI5QzE1OC44NjQgNDYuOTAxIDE1NC42MTQgNDguOTUzOSAxNDkuOTc0IDQ4Ljk1MzlDMTQyLjYzNSA0OC45NTM5IDEzOC4wMzYgNDQuNzExNSAxMzguMDM2IDM3LjM1MDRDMTM4LjAzNiAyOS45ODkyIDE0Mi43NyAyNS43NDY5IDE0OS42MjEgMjUuNzQ2OUMxNTYuNDcxIDI1Ljc0NjkgMTYwLjU4NiAzMC4xNjc4IDE2MC41ODYgMzYuMzI2NUMxNjAuNTg2IDM3LjQ0NDkgMTYwLjQ5NyAzOC41NTggMTYwLjQwOSAzOS4yNzIxVjM5LjI2NjhaTTE0NS4zNzYgMzUuMjAyOUgxNTMuNDIzQzE1My4xNTggMzIuNTI1MiAxNTEuOTIgMzEuMDQ5OCAxNDkuNjIxIDMxLjA0OThDMTQ3LjMyMSAzMS4wNDk4IDE0NS44MTggMzIuMzQ2NyAxNDUuMzc2IDM1LjIwMjlaIiBmaWxsPSIjMjEyMTIxIi8+CjxwYXRoIGQ9Ik0xNjAuOTgxIDQ0LjcxMTVMMTY0LjUxOCA0MC41MTY0QzE2NS45NzUgNDIuNDM4MSAxNjguNTQ0IDQzLjg2NjIgMTcxLjU1MSA0My44NjYyQzE3My4zNjYgNDMuODY2MiAxNzQuNjkyIDQzLjMzMDcgMTc0LjY5MiA0Mi4yMTIzQzE3NC42OTIgNDEuNDA5IDE3NC4yNSA0MC45MTU1IDE3Mi40ODIgNDAuNTU4NEwxNjkuMzg3IDM5LjkzMzZDMTYzLjgxNiAzOC43NzMzIDE2MS43MzUgMzYuNjMxMSAxNjEuNzM1IDMzLjAxMzVDMTYxLjczNSAyOS4zOTU5IDE2NS4wMDcgMjUuNzM2NCAxNzIuMTI4IDI1LjczNjRDMTc2LjYzOCAyNS43MzY0IDE4MC4wODcgMjcuMTIyNSAxODIuMTIgMjkuNTc0NEwxNzguNTM3IDMzLjY4MDNDMTc3LjEyMiAzMS44OTUyIDE3NC42NDYgMzAuODI0MSAxNzIuNDM1IDMwLjgyNDFDMTcwLjIyNCAzMC44MjQxIDE2OS4yMDUgMzEuNDQ4OSAxNjkuMjA1IDMyLjQ3OEMxNjkuMjA1IDMzLjI4MTMgMTY5LjgyNCAzMy44MTY4IDE3MS44MTYgMzQuMjIxMUwxNzUuODQyIDM1LjAyNDRDMTgwLjM5OSAzNS44Njk4IDE4Mi4yNTYgMzguMTQ4NSAxODIuMjU2IDQxLjI3MjVDMTgyLjI1NiA0NS42MDQxIDE3OC44MDcgNDguOTQ4NyAxNzEuODYzIDQ4Ljk0ODdDMTY3LjQ0MSA0OC45NDg3IDE2My41MDQgNDcuNDczMyAxNjAuOTg2IDQ0LjcwNjNMMTYwLjk4MSA0NC43MTE1WiIgZmlsbD0iIzIxMjEyMSIvPgo8cGF0aCBkPSJNMTgzLjkzMSAxNi43MjY2SDE5MS40NDdWMzAuMjUxOEMxOTIuNzczIDI3LjI1OSAxOTUuMjQ5IDI1Ljc0MTYgMTk4LjQzMyAyNS43NDE2QzIwMi45OSAyNS43NDE2IDIwNi4wODQgMjguNDY2NiAyMDYuMDg0IDMzLjY0MzZWNDguNTA3NkgxOTguNTY4VjM1Ljc0MzdDMTk4LjU2OCAzMi41NzI1IDE5Ny4yODggMzEuNTAxNCAxOTUuNDI2IDMxLjUwMTRDMTkzLjI1NyAzMS41MDE0IDE5MS40NDcgMzMuMDE4OCAxOTEuNDQ3IDM2Ljc2NzZWNDguNTA3NkgxODMuOTMxVjE2LjcyNjZaIiBmaWxsPSIjMjEyMTIxIi8+CjxwYXRoIGQ9Ik0yMzAuMzU1IDM5LjI2NjhIMjE1LjI3NkMyMTUuNjc2IDQyLjM0ODggMjE3LjMxIDQzLjU5ODQgMjE5LjkyMSA0My41OTg0QzIyMi4xMzIgNDMuNTk4NCAyMjMuNDE2IDQyLjY1ODYgMjI0LjA3NyA0MS4wNTJMMjMwLjA5IDQzLjA2MjlDMjI4LjgxMSA0Ni45MDEgMjI0LjU2MSA0OC45NTM5IDIxOS45MjEgNDguOTUzOUMyMTIuNTgxIDQ4Ljk1MzkgMjA3Ljk4MyA0NC43MTE1IDIwNy45ODMgMzcuMzUwNEMyMDcuOTgzIDI5Ljk4OTIgMjEyLjcxNyAyNS43NDY5IDIxOS41NjcgMjUuNzQ2OUMyMjYuNDE4IDI1Ljc0NjkgMjMwLjUzMiAzMC4xNjc4IDIzMC41MzIgMzYuMzI2NUMyMzAuNTMyIDM3LjQ0NDkgMjMwLjQ0NCAzOC41NTggMjMwLjM1NSAzOS4yNzIxVjM5LjI2NjhaTTIxNS4zMjMgMzUuMjAyOUgyMjMuMzdDMjIzLjEwNCAzMi41MjUyIDIyMS44NjYgMzEuMDQ5OCAyMTkuNTY3IDMxLjA0OThDMjE3LjI2OCAzMS4wNDk4IDIxNS43NjUgMzIuMzQ2NyAyMTUuMzIzIDM1LjIwMjlaIiBmaWxsPSIjMjEyMTIxIi8+CjxwYXRoIGQ9Ik0yNTQuODUgMTYuNzI2NlY0OC41MDI0SDI0OC4xMjlMMjQ3Ljg2NCA0NC4xMjg3QzI0Ni42MjYgNDcuMTIxNSAyNDQuMDE1IDQ4Ljk0ODcgMjQwLjY1NSA0OC45NDg3QzIzNS4xNzIgNDguOTQ4NyAyMzEuNTQ3IDQ0LjcwNjMgMjMxLjU0NyAzNy40MzQ0QzIzMS41NDcgMzAuMTYyNSAyMzUuMzQ5IDI1Ljc0MTYgMjQwLjgzMiAyNS43NDE2QzI0My45NzMgMjUuNzQxNiAyNDYuMTg0IDI3LjQzNzUgMjQ3LjMzNCAyOS45ODRWMTYuNzI2NkgyNTQuODVaTTI0Ny4zMzQgMzcuMjEzOUMyNDcuMzM0IDMzLjQ2NSAyNDUuODMgMzEuMzIyOSAyNDMuMzA4IDMxLjMyMjlDMjQwLjc4NSAzMS4zMjI5IDIzOS4xMDUgMzMuMTk3MyAyMzkuMTA1IDM3LjM1MDRDMjM5LjEwNSA0MS41MDM1IDI0MC42NSA0My4zNzc5IDI0My4yNjEgNDMuMzc3OUMyNDUuODcyIDQzLjM3NzkgMjQ3LjMyOCA0MS4yMzU3IDI0Ny4zMjggMzcuMjE5MUwyNDcuMzM0IDM3LjIxMzlaIiBmaWxsPSIjMjEyMTIxIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMzcuOTc0NCAxMS4xMzA2QzM4LjQ4MTkgMTEuNjM4MSAzOC40ODE5IDEyLjQ2MDkgMzcuOTc0NCAxMi45Njg0TDEzLjk0MzEgMzYuOTk5N0wzNy45NzQ0IDYxLjAzMUMzOC40ODE5IDYxLjUzODUgMzguNDgxOSA2Mi4zNjEzIDM3Ljk3NDQgNjIuODY4OEMzNy40NjY5IDYzLjM3NjMgMzYuNjQ0MSA2My4zNzYzIDM2LjEzNjcgNjIuODY4OEwxMC4yNjc2IDM2Ljk5OTdMMzYuMTM2NyAxMS4xMzA2QzM2LjY0NDEgMTAuNjIzMSAzNy40NjY5IDEwLjYyMzEgMzcuOTc0NCAxMS4xMzA2WiIgZmlsbD0iIzIxMjEyMSIvPgo8Y2lyY2xlIGN4PSIzNy4wNTU1IiBjeT0iMTIuMDQ5MSIgcj0iMTEuOTU1MyIgZmlsbD0iIzlBOUE5QSIvPgo8Y2lyY2xlIGN4PSIzNy4wNTU1IiBjeT0iNjEuOTQ5NCIgcj0iMTEuOTU1MyIgZmlsbD0iIzE3NDI4RCIvPgo8Y2lyY2xlIGN4PSIxMi4xMDUzIiBjeT0iMzYuOTk4MyIgcj0iMTEuOTU1MyIgZmlsbD0iI0ZGNzYwMCIvPgo8L3N2Zz4K",
- "AppleAppStore": {
- "AppLink": "https://apps.apple.com/us/app/enmeshed/id1576693742"
+ "Tokens": {}
+ },
+ "Telemetry": {
+ "OpenTelemetryCollector": {
+ "Endpoint": "http://localhost:4317"
},
- "GooglePlayStore": {
- "AppLink": "https://play.google.com/store/apps/details?id=eu.enmeshed.app"
+ "Logging": {
+ "MinimumLevel": {
+ "Default": "Information",
+ "Override": {
+ "Backbone": "Debug"
+ }
+ },
+ "WriteTo": {
+ "Seq": {
+ "Name": "Seq",
+ "Args": {
+ "ServerUrl": "http://localhost:5341"
+ }
+ },
+ "Console": {
+ "Args": {
+ "Theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Sixteen, Serilog.Sinks.Console",
+ "OutputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} (Correlation ID: {CorrelationId}){NewLine}{Exception}"
+ }
+ }
+ }
}
- }
- ]
- },
- "WellKnownEndpoints": {
- "AppleAppSiteAssociations": [
- "R7Y6NESEQW.eu.enmeshed.app"
- ],
- "AndroidAssetLinks": [
- {
- "PackageName": "eu.enmeshed.app",
- "Sha256CertFingerprints": [
- "0F:6F:48:FF:59:E7:B4:EC:52:4A:BB:E7:45:41:E7:38:5B:13:D1:0B:14:37:CF:C3:59:08:DF:22:F3:CA:70:38"
+ },
+ "AppOnboarding": {
+ "DefaultAppId": "frosch",
+ "Apps": [
+ {
+ "Id": "frosch",
+ "DisplayName": "Frosch",
+ "Description": "Sie haben einen QR-Code der Frosch Wallet gescannt. Um fortfahren zu können, laden Sie die Frosch Wallet-App auf Ihr Gerät.",
+ "IconUrl": "data:image/svg+xml;base64,<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_74083_138721)">
<mask id="mask0_74083_138721" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="60" height="60">
<path fill-rule="evenodd" clip-rule="evenodd" d="M38.1445 6.50434e-06C38.9789 6.50434e-06 39.8135 0.000201817 40.6484 0.00488932C41.3515 0.00899123 42.0544 0.0173909 42.7568 0.0361393C44.2878 0.0777453 45.8322 0.167611 47.3467 0.43946C48.8829 0.715419 50.3124 1.16629 51.708 1.87696C53.0797 2.57539 54.3358 3.48752 55.4238 4.57618C56.5119 5.66485 57.4246 6.92032 58.1231 8.292C58.8331 9.68763 59.2846 11.1171 59.5606 12.6533C59.833 14.1672 59.9223 15.7117 59.9639 17.2432C59.9832 17.9456 59.991 18.6491 59.9951 19.3516C60.0004 20.1859 60 21.0205 60 21.8555V38.1445C60 38.9789 59.9998 39.8135 59.9951 40.6484C59.991 41.3515 59.9826 42.0544 59.9639 42.7568C59.9223 44.2878 59.8324 45.8322 59.5606 47.3467C59.2846 48.8829 58.8337 50.3124 58.1231 51.708C57.4246 53.0797 56.5125 54.3358 55.4238 55.4238C54.3352 56.5119 53.0797 57.4246 51.708 58.1231C50.3124 58.8331 48.8829 59.2846 47.3467 59.5606C45.8328 59.833 44.2884 59.9223 42.7568 59.9639C42.0544 59.9832 41.3509 59.991 40.6484 59.9951C39.8141 60.0004 38.9795 60 38.1445 60H21.8555C21.0211 60 20.1865 59.9998 19.3516 59.9951C18.6485 59.991 17.9456 59.9826 17.2432 59.9639C15.7123 59.9223 14.1678 59.8324 12.6533 59.5606C11.1171 59.2846 9.68763 58.8337 8.292 58.1231C6.92032 57.4246 5.66426 56.5125 4.57618 55.4238C3.4881 54.3352 2.57539 53.0797 1.87696 51.708C1.16688 50.3124 0.715418 48.8829 0.43946 47.3467C0.167026 45.8328 0.0777448 44.2884 0.0361393 42.7568C0.0168048 42.0544 0.0089911 41.3509 0.00488932 40.6484C-0.000384122 39.8141 6.50365e-06 38.9795 6.50365e-06 38.1445V21.8555C6.50365e-06 21.0211 0.000201889 20.1865 0.00488932 19.3516C0.00899133 18.6485 0.0173914 17.9456 0.0361393 17.2432C0.0777462 15.7123 0.167611 14.1678 0.43946 12.6533C0.715423 11.1171 1.16628 9.68763 1.87696 8.292C2.5754 6.92032 3.48751 5.66426 4.57618 4.57618C5.66485 3.4881 6.92032 2.57539 8.292 1.87696C9.68762 1.16687 11.1171 0.715421 12.6533 0.43946C14.1673 0.167023 15.7117 0.0777458 17.2432 0.0361393C17.9456 0.0168053 18.6491 0.00899117 19.3516 0.00488932C20.1859 -0.000384089 21.0205 6.49731e-06 21.8555 6.50434e-06H38.1445Z" fill="#D9D9D9"/>
</mask>
<g mask="url(#mask0_74083_138721)">
<rect width="60" height="60" fill="#FFCBA5"/>
<g clip-path="url(#clip1_74083_138721)">
<path d="M28.9772 16.2215C30.8599 16.2215 32.3861 14.6954 32.3861 12.8129C32.3861 10.9304 30.8599 9.4043 28.9772 9.4043C27.0946 9.4043 25.5683 10.9304 25.5683 12.8129C25.5683 14.6954 27.0946 16.2215 28.9772 16.2215Z" fill="#192952"/>
<path d="M63.5695 51.8556C63.3124 51.1498 63.1318 50.4057 63.0333 49.6343C62.6776 46.8057 63.5258 44.1029 65.1728 42.0348C64.0839 41.1539 62.9841 40.3004 61.8624 39.4687C61.8076 39.4304 61.7584 39.3921 61.7037 39.3538C61.2003 38.9818 60.6914 38.6152 60.1825 38.2541C59.5806 37.8274 58.9733 37.4061 58.3604 36.9957C58.3495 36.9903 58.3386 36.9793 58.3276 36.9739C56.4563 42.0566 53.9666 46.3187 51.9421 49.317C55.3291 51.3304 59.3672 52.2988 63.5695 51.8556Z" fill="#192952"/>
<path d="M36.8401 45.7278C37.1739 46.5157 38.022 46.9917 38.8975 46.8221C39.9043 46.6251 40.5609 45.6567 40.3639 44.65C40.1669 43.6433 39.193 42.9868 38.1916 43.1837C37.8688 43.2439 37.5897 43.3916 37.3599 43.5886C35.8388 42.9922 34.2356 42.5873 32.5722 42.3959C33.6665 39.9338 34.5475 37.138 34.8046 34.2054C39.1382 37.1927 43.1162 40.6888 46.6236 44.6391C47.4772 39.5344 47.6194 34.8127 47.3951 30.6929C46.7166 30.3591 46.0381 30.0363 45.3541 29.719C44.6319 29.3853 43.9041 29.057 43.1709 28.7396C32.6597 24.2313 21.2347 21.6052 9.35559 21.2331C10.9533 23.9468 14.2583 24.7839 14.2583 24.7839C18.1541 25.7961 21.9187 27.1639 25.5191 28.8545C26.1155 30.8351 27.4178 36.0602 26.9965 42.5655C24.08 43.0852 21.4262 44.2397 19.1609 45.881C18.8107 45.706 18.4004 45.6348 17.9845 45.7169C16.9777 45.9139 16.3211 46.8877 16.5181 47.889C16.7151 48.8902 17.6836 49.5522 18.6904 49.3553C19.4838 49.2021 20.0528 48.5619 20.1623 47.8014C22.2251 47.0902 24.37 46.5376 26.5861 46.1601C26.3836 47.402 26.1155 48.6768 25.7544 49.968C25.7489 49.968 25.738 49.968 25.7325 49.968C24.7257 50.165 24.0691 51.1389 24.2661 52.1401C24.463 53.1414 25.4315 53.8034 26.4383 53.6064C27.4451 53.4095 28.1018 52.4356 27.9048 51.4343C27.8446 51.1334 27.7133 50.8708 27.5327 50.6465C28.3206 49.6562 29.612 47.9109 30.8978 45.6622C32.9005 45.5363 34.8812 45.5582 36.8292 45.7224L36.8401 45.7278Z" fill="#192952"/>
<path d="M99.2507 39.1135C98.6379 34.2167 94.1675 30.7425 89.2703 31.3553C89.0952 31.3772 88.9256 31.41 88.7559 31.4428C81.9163 24.1661 75.4323 16.9221 66.1522 14.6625C65.9443 14.6133 65.7364 14.564 65.5284 14.5203C55.8927 12.4357 45.9506 11.2922 35.8169 11.1609C34.9961 9.08733 32.8622 7.74688 30.5476 8.03686C30.3889 8.05874 30.2303 8.0861 30.0771 8.11893C29.021 6.93167 27.4178 6.26965 25.7216 6.48303C23.117 6.8113 21.2347 9.08186 21.3496 11.6588C13.1037 12.8734 7.78521 16.665 9.3556 21.2335C21.2293 21.6055 32.6597 24.2317 43.16 28.7345C44.5881 29.3473 45.9943 30.0039 47.3896 30.6878C47.7179 36.728 47.2638 44.0595 44.9273 52.0092C39.8933 52.4578 36.0194 54.0664 34.1097 55.0238C33.6993 54.6901 33.1522 54.5314 32.5941 54.6354C31.5873 54.8324 30.9306 55.8062 31.1276 56.8075C31.3246 57.8087 32.2986 58.4707 33.2999 58.2738C34.1863 58.1041 34.7992 57.3272 34.7992 56.4573C38.7552 55.4068 41.5786 55.5327 41.5786 55.5327C39.6909 56.5284 37.7101 58.8209 36.6377 60.1832C36.4571 60.1668 36.2765 60.1613 36.0905 60.1996C35.0837 60.3966 34.4271 61.365 34.6241 62.3717C34.821 63.3784 35.795 64.035 36.7963 63.838C37.7977 63.641 38.4597 62.6726 38.2628 61.6659C38.2409 61.562 38.208 61.4635 38.1752 61.365C42.1641 58.2136 45.4855 56.906 45.4855 56.906C45.5238 58.1643 45.4253 60.0738 45.3377 61.4252C44.4622 61.7097 43.9151 62.6015 44.0902 63.5316C44.2871 64.5383 45.2611 65.1949 46.2624 64.9979C47.2638 64.8009 47.9258 63.8325 47.7289 62.8258C47.6523 62.421 47.4389 62.0763 47.1543 61.8136C48.8998 57.8908 49.0038 54.3673 48.9874 53.2895C50.6617 51.2542 55.2963 45.1756 58.3221 36.9688C60.6805 38.5445 62.9567 40.2406 65.1673 42.0297C63.5203 44.0978 62.6777 46.8006 63.0278 49.6292C63.5477 53.76 66.475 56.999 70.2286 58.1151C66.9511 58.8045 64.445 59.8823 63.0224 60.5936C62.612 60.2598 62.0648 60.1012 61.5067 60.2051C60.4999 60.4021 59.8433 61.3705 60.0403 62.3772C60.2373 63.3839 61.2112 64.0404 62.2125 63.8435C63.099 63.6739 63.7118 62.8969 63.7118 62.027C67.6679 60.9765 70.4913 61.1024 70.4913 61.1024C68.6035 62.0982 66.6228 64.3906 65.5503 65.7529C65.3697 65.7365 65.1892 65.7311 65.0031 65.7694C63.9963 65.9663 63.3397 66.9402 63.5367 67.9414C63.7337 68.9481 64.7077 69.6047 65.709 69.4077C66.7103 69.2108 67.3724 68.2369 67.1754 67.2356C67.1535 67.1317 67.1207 67.0332 67.0879 66.9347C71.0768 63.7833 74.3981 62.4757 74.3981 62.4757C74.4364 63.7341 74.3379 65.6435 74.2504 66.9949C73.3749 67.2794 72.8277 68.1712 73.0028 69.1013C73.1998 70.108 74.1738 70.7646 75.1751 70.5676C76.1819 70.3707 76.8385 69.4023 76.6415 68.3955C76.5649 67.9907 76.3515 67.646 76.067 67.3834C77.424 64.3304 77.7906 61.5127 77.8781 59.9042C78.6278 59.6744 89.5986 56.1947 97.3137 45.8376C97.5326 45.5641 97.7405 45.285 97.932 44.9896C97.943 44.9732 97.9539 44.9568 97.9703 44.9404H97.9649C99.01 43.2552 99.5079 41.2254 99.2452 39.108L99.2507 39.1135ZM29.3986 16.1945C27.5327 16.4297 25.831 15.1057 25.5957 13.24C25.3604 11.3743 26.6846 9.67276 28.5504 9.43749C30.4163 9.20223 32.118 10.5263 32.3533 12.392C32.5886 14.2577 31.2644 15.9592 29.3986 16.1945Z" fill="white"/>
</g>
</g>
</g>
<defs>
<clipPath id="clip0_74083_138721">
<rect width="60" height="60" fill="white"/>
</clipPath>
<clipPath id="clip1_74083_138721">
<rect width="90.2344" height="64.1667" fill="white" transform="translate(9.08203 6.44531)"/>
</clipPath>
</defs>
</svg>
",
+ "BannerUrl": "data:image/svg+xml;base64,<svg width="279" height="81" viewBox="0 0 279 81" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_74083_138397)">
<g clip-path="url(#clip1_74083_138397)">
<g clip-path="url(#clip2_74083_138397)">
<path d="M46.0025 14.1657C48.5299 14.1657 50.5789 12.117 50.5789 9.58969C50.5789 7.06243 48.5299 5.01367 46.0025 5.01367C43.475 5.01367 41.426 7.06243 41.426 9.58969C41.426 12.117 43.475 14.1657 46.0025 14.1657Z" fill="#192952"/>
<path d="M92.4426 62.0046C92.0974 61.0571 91.855 60.0581 91.7227 59.0224C91.2453 55.225 92.3839 51.5965 94.5949 48.8201C93.1331 47.6375 91.6566 46.4916 90.1507 45.3752C90.0773 45.3238 90.0112 45.2724 89.9377 45.2209C89.2619 44.7215 88.5787 44.2293 87.8956 43.7446C87.0875 43.1716 86.2721 42.6061 85.4494 42.0552C85.4347 42.0478 85.42 42.0332 85.4053 42.0258C82.8931 48.8494 79.5507 54.5713 76.8328 58.5964C81.3798 61.2994 86.801 62.5995 92.4426 62.0046Z" fill="#192952"/>
<path d="M56.5584 53.778C57.0065 54.8357 58.1451 55.4748 59.3204 55.2471C60.672 54.9826 61.5535 53.6825 61.2891 52.331C61.0246 50.9795 59.7171 50.0981 58.3728 50.3625C57.9394 50.4433 57.5647 50.6417 57.2562 50.9061C55.2141 50.1055 53.0618 49.5619 50.8286 49.3048C52.2978 45.9995 53.4805 42.2462 53.8257 38.3092C59.6436 42.3196 64.984 47.0132 69.6927 52.3163C70.8386 45.4633 71.0296 39.1245 70.7284 33.5936C69.8175 33.1455 68.9067 32.7122 67.9884 32.2862C67.0188 31.8381 66.0418 31.3974 65.0575 30.9714C50.9462 24.919 35.6081 21.3933 19.6604 20.8939C21.8054 24.537 26.2422 25.6608 26.2422 25.6608C31.4725 27.0197 36.5264 28.856 41.3599 31.1256C42.1606 33.7846 43.9089 40.7992 43.3433 49.5325C39.428 50.2303 35.8652 51.7802 32.8241 53.9837C32.3539 53.7486 31.803 53.6532 31.2447 53.7633C29.8931 54.0278 29.0116 55.3352 29.2761 56.6794C29.5405 58.0235 30.8407 58.9123 32.1923 58.6479C33.2575 58.4422 34.0214 57.5828 34.1684 56.5618C36.9377 55.607 39.8173 54.8651 42.7923 54.3583C42.5205 56.0256 42.1606 57.7371 41.6758 59.4705C41.6684 59.4705 41.6537 59.4705 41.6464 59.4705C40.2948 59.7349 39.4133 61.0424 39.6777 62.3865C39.9422 63.7307 41.2424 64.6194 42.594 64.355C43.9456 64.0906 44.8271 62.7832 44.5627 61.439C44.4819 61.035 44.3056 60.6825 44.0632 60.3813C45.121 59.0518 46.8546 56.7087 48.5808 53.6899C51.2694 53.5209 53.9286 53.5503 56.5437 53.7707L56.5584 53.778Z" fill="#192952"/>
<path d="M140.345 44.8967C139.522 38.3228 133.52 33.6587 126.946 34.4813C126.711 34.5107 126.483 34.5548 126.255 34.5989C117.073 24.8298 108.368 15.1049 95.9098 12.0713C95.6307 12.0052 95.3515 11.9391 95.0724 11.8804C82.1364 9.08187 68.7891 7.54674 55.1847 7.37045C54.0828 4.58665 51.2179 2.78709 48.1107 3.17638C47.8976 3.20576 47.6846 3.24249 47.4789 3.28656C46.0612 1.69266 43.9089 0.803901 41.6317 1.09036C38.1351 1.53107 35.6081 4.5793 35.7624 8.03886C24.6922 9.66948 17.5521 14.7597 19.6604 20.8928C35.6008 21.3923 50.9461 24.918 65.0427 30.963C66.96 31.7857 68.8479 32.6671 70.721 33.5852C71.1618 41.6943 70.5521 51.5368 67.4154 62.2092C60.6573 62.8115 55.4565 64.971 52.8928 66.2564C52.3418 65.8083 51.6073 65.5953 50.858 65.7349C49.5064 65.9993 48.6249 67.3068 48.8893 68.6509C49.1538 69.9951 50.4613 70.8838 51.8056 70.6194C52.9956 70.3917 53.8183 69.3487 53.8183 68.1808C59.1294 66.7706 62.9198 66.9395 62.9198 66.9395C60.3855 68.2763 57.7263 71.3539 56.2865 73.1829C56.0441 73.1608 55.8017 73.1535 55.552 73.2049C54.2003 73.4693 53.3188 74.7694 53.5833 76.1209C53.8477 77.4724 55.1553 78.3538 56.4996 78.0894C57.8438 77.825 58.7327 76.5249 58.4682 75.1734C58.4389 75.0338 58.3948 74.9016 58.3507 74.7694C63.7058 70.5386 68.1647 68.7831 68.1647 68.7831C68.2161 70.4725 68.0839 73.036 67.9664 74.8502C66.791 75.2322 66.0565 76.4294 66.2915 77.6781C66.556 79.0296 67.8635 79.911 69.2078 79.6466C70.5521 79.3822 71.4409 78.0821 71.1765 76.7306C71.0736 76.187 70.7872 75.7243 70.4052 75.3717C72.7485 70.1052 72.8881 65.375 72.866 63.928C75.1138 61.1956 81.3357 53.0352 85.398 42.0175C88.564 44.1329 91.6199 46.4098 94.5876 48.8117C92.3765 51.5882 91.2452 55.2167 91.7153 59.0141C92.4132 64.5597 96.3432 68.908 101.382 70.4064C96.9823 71.3319 93.6179 72.7789 91.708 73.7337C91.1571 73.2857 90.4225 73.0727 89.6732 73.2122C88.3216 73.4767 87.4401 74.7768 87.7045 76.1283C87.969 77.4798 89.2765 78.3612 90.6208 78.0968C91.8108 77.8691 92.6336 76.826 92.6336 75.6582C97.9446 74.2479 101.735 74.4168 101.735 74.4168C99.2007 75.7537 96.5415 78.8313 95.1018 80.6602C94.8593 80.6382 94.6169 80.6308 94.3672 80.6823C93.0156 80.9467 92.1341 82.2541 92.3985 83.5983C92.663 84.9498 93.9705 85.8312 95.3148 85.5668C96.6591 85.3023 97.5479 83.9949 97.2835 82.6507C97.2541 82.5112 97.21 82.379 97.1659 82.2468C102.521 78.016 106.98 76.2605 106.98 76.2605C107.031 77.9499 106.899 80.5133 106.782 82.3276C105.606 82.7095 104.872 83.9068 105.107 85.1554C105.371 86.5069 106.679 87.3884 108.023 87.1239C109.375 86.8595 110.256 85.5594 109.992 84.2079C109.889 83.6644 109.602 83.2016 109.22 82.8491C111.042 78.7505 111.534 74.9677 111.652 72.8083C112.658 72.4998 127.387 67.8283 137.744 53.9239C138.038 53.5567 138.317 53.1821 138.574 52.7854C138.589 52.7634 138.604 52.7414 138.626 52.7193H138.618C140.021 50.457 140.69 47.732 140.337 44.8894L140.345 44.8967ZM46.568 14.128C44.0631 14.4438 41.7786 12.6663 41.4627 10.1616C41.1468 7.65691 42.9245 5.37258 45.4294 5.05673C47.9344 4.74089 50.2189 6.51842 50.5348 9.02311C50.8506 11.5278 49.073 13.8121 46.568 14.128Z" fill="#FFCBA5"/>
</g>
<rect x="87.4674" y="-0.304688" width="2.01375" height="80.55" fill="#192952"/>
</g>
<path d="M113.396 55.1715L105.215 28.1013C105.093 27.6886 105.399 27.2682 105.835 27.2682H110.542C110.832 27.2682 111.093 27.4593 111.169 27.7421L117.054 48.851H117.445L123.605 27.7344C123.689 27.4593 123.942 27.2682 124.233 27.2682H128.771C129.062 27.2682 129.314 27.4593 129.398 27.7344L135.498 48.851H135.941L141.773 27.7421C141.849 27.4593 142.11 27.2682 142.4 27.2682H146.992C147.428 27.2682 147.742 27.6886 147.612 28.1089L139.37 55.1792C139.286 55.4543 139.033 55.6377 138.75 55.6377H132.697C132.413 55.6377 132.153 55.4467 132.077 55.1792L126.59 36.9515H126.146L120.766 55.1792C120.682 55.4543 120.429 55.6454 120.146 55.6454H114.039C113.756 55.6454 113.503 55.4543 113.419 55.1868L113.396 55.1715Z" fill="#192952"/>
<path d="M158.487 56.0733C156.558 56.0733 154.928 55.8135 153.612 55.2938C152.296 54.7741 151.301 53.9105 150.635 52.7106C149.969 51.503 149.632 49.8675 149.632 47.7887C149.632 45.6029 149.893 43.8681 150.413 42.5917C150.933 41.3154 151.821 40.3906 153.084 39.8404C154.346 39.2825 156.13 39.0073 158.433 39.0073C158.8 39.0073 159.351 39.015 160.078 39.0379C160.805 39.0532 161.64 39.0761 162.589 39.0914C163.538 39.1143 164.479 39.1296 165.428 39.1449C166.109 39.1602 166.744 39.1755 167.341 39.1984C167.716 39.2137 168.022 38.9156 168.022 38.5411V37.8915C168.022 36.447 167.93 35.3159 167.747 34.4982C167.563 33.6804 167.18 33.0766 166.606 32.6945C166.032 32.3047 165.206 32.0525 164.127 31.9455C163.048 31.8309 161.655 31.7774 159.948 31.7774C159.129 31.7774 158.173 31.808 157.079 31.8615C155.984 31.915 154.913 31.9837 153.88 32.0525C153.237 32.0984 152.686 32.1519 152.227 32.213C151.829 32.2665 151.484 31.9608 151.484 31.5634V28.2083C151.484 27.8949 151.706 27.6198 152.02 27.5587C153.398 27.3141 154.89 27.1307 156.497 27.016C158.318 26.8861 160.132 26.8173 161.953 26.8173C164.073 26.8173 165.841 26.9472 167.272 27.2071C168.703 27.4669 169.859 27.872 170.754 28.4299C171.642 28.9878 172.315 29.7062 172.759 30.6004C173.203 31.4946 173.517 32.5569 173.708 33.7951C173.892 35.0408 173.984 36.4547 173.984 38.052V54.9804C173.984 55.3397 173.693 55.6301 173.333 55.6301H169.139C168.795 55.6301 168.512 55.3626 168.489 55.0187L168.305 51.9616H167.969C167.333 53.1462 166.492 54.048 165.435 54.6595C164.379 55.2709 163.231 55.6606 162.007 55.8288C160.783 55.9969 159.612 56.081 158.494 56.081L158.487 56.0733ZM161.104 51.2891C162.03 51.2891 162.879 51.2279 163.637 51.098C164.395 50.9681 165.068 50.7464 165.642 50.4331C166.216 50.1197 166.675 49.6841 167.004 49.1262C167.341 48.4995 167.586 47.7734 167.754 46.9557C167.923 46.1379 168.007 45.1749 168.007 44.0668V43.0656H159.872C158.647 43.0656 157.706 43.1573 157.056 43.3407C156.405 43.5241 155.969 43.9139 155.747 44.51C155.525 45.1062 155.41 46.008 155.41 47.2385C155.41 48.3925 155.54 49.2485 155.801 49.8217C156.061 50.3949 156.612 50.7846 157.446 50.991C158.28 51.1973 159.497 51.2967 161.096 51.2967L161.104 51.2891Z" fill="#192952"/>
<path d="M179.555 55.0569V19.6103C179.555 19.297 179.846 19.0371 180.198 19.0371H184.805C185.164 19.0371 185.455 19.297 185.455 19.6103V55.0569C185.455 55.3702 185.164 55.6301 184.812 55.6301H180.198C179.838 55.6301 179.555 55.3779 179.555 55.0569Z" fill="#192952"/>
<path d="M192.305 55.0492V19.618C192.305 19.297 192.595 19.0371 192.963 19.0371H197.554C197.914 19.0371 198.213 19.297 198.213 19.618V55.0492C198.213 55.3702 197.922 55.6301 197.554 55.6301H192.963C192.603 55.6301 192.305 55.3702 192.305 55.0492Z" fill="#192952"/>
<path d="M216.709 56.0733C214.299 56.0733 212.286 55.9129 210.694 55.5995C209.095 55.2862 207.817 54.7665 206.853 54.0404C205.888 53.3144 205.161 52.3896 204.679 51.2585C204.197 50.1274 203.883 48.7517 203.73 47.1391C203.585 45.5265 203.508 43.6464 203.508 41.4912C203.508 38.9309 203.638 36.7298 203.899 34.8727C204.159 33.0155 204.694 31.487 205.513 30.2794C206.332 29.0719 207.603 28.193 209.332 27.6351C211.062 27.0772 213.373 26.802 216.266 26.802C218.531 26.802 220.39 26.9778 221.837 27.3294C223.283 27.6809 224.423 28.2312 225.265 28.9725C226.107 29.7139 226.712 30.6692 227.102 31.8385C227.492 33.0079 227.745 34.3988 227.852 36.0114C227.967 37.624 228.02 39.4506 228.02 41.4912V42.7217C228.02 43.0885 227.722 43.3789 227.362 43.3789H209.477C209.477 45.045 209.554 46.3901 209.699 47.4142C209.845 48.4307 210.189 49.2103 210.733 49.7529C211.268 50.2879 212.125 50.6624 213.296 50.8687C214.467 51.0751 216.051 51.1744 218.056 51.1744C218.906 51.1744 219.847 51.1591 220.873 51.1209C221.89 51.0827 222.939 51.0063 224.018 50.8993C224.798 50.8152 225.525 50.7464 226.191 50.6853C226.582 50.6471 226.911 50.9528 226.911 51.3426V54.6824C226.911 55.011 226.673 55.2862 226.352 55.332C225.656 55.4467 224.86 55.5536 223.957 55.653C222.809 55.7829 221.6 55.8823 220.337 55.9587C219.074 56.0351 217.865 56.0733 216.717 56.0733H216.709ZM222.334 39.336V39.1678C222.334 37.5017 222.235 36.1719 222.028 35.1937C221.821 34.2078 221.492 33.4664 221.026 32.9696C220.559 32.4652 219.931 32.1366 219.135 31.9685C218.339 31.8003 217.345 31.7163 216.158 31.7163C214.674 31.7163 213.495 31.8156 212.623 32.022C211.75 32.2283 211.092 32.6028 210.648 33.1607C210.204 33.7186 209.898 34.4905 209.73 35.4688C209.562 36.4547 209.477 37.7387 209.477 39.336H222.342H222.334Z" fill="#192952"/>
<path d="M242.943 26.695V19.6027C242.943 19.2893 242.691 19.0371 242.377 19.0371H237.533C237.219 19.0371 236.966 19.2893 236.966 19.6027V26.695C236.966 27.0084 236.714 27.2606 236.4 27.2606H231.785C231.472 27.2606 231.219 27.5128 231.219 27.8261V31.6398C231.219 31.9532 231.472 32.2054 231.785 32.2054H236.4C236.714 32.2054 236.966 32.4576 236.966 32.7709V55.0569C236.966 55.3702 237.219 55.6224 237.533 55.6224H242.377C242.691 55.6224 242.943 55.3702 242.943 55.0569V32.7709C242.943 32.4576 243.196 32.2054 243.51 32.2054H257.147C259.106 32.2054 260.698 30.6234 260.698 28.6592V27.8261C260.698 27.5128 260.445 27.2606 260.132 27.2606H243.51C243.196 27.2606 242.943 27.0084 242.943 26.6874V26.695Z" fill="#192952"/>
</g>
<defs>
<clipPath id="clip0_74083_138397">
<rect width="279" height="80.5512" fill="white"/>
</clipPath>
<clipPath id="clip1_74083_138397">
<rect width="70.4812" height="80.55" fill="white" transform="translate(19 -0.304688)"/>
</clipPath>
<clipPath id="clip2_74083_138397">
<rect width="121.14" height="86.1437" fill="white" transform="translate(19.2931 1.03906)"/>
</clipPath>
</defs>
</svg>
",
+ "ColorScheme": {
+ "Primary": "#192952",
+ "Secondary": "#EFE0D5",
+ "Background": "#FFF8F5",
+ "OnPrimary": "#FFF8F5",
+ "OnSecondary": "#221A14"
+ },
+ "AppleAppStore": {
+ "AppLink": "https://apps.apple.com/de/app/frosch/id6756783868"
+ },
+ "GooglePlayStore": {
+ "AppLink": "https://play.google.com/store/apps/details?id=app.frosch.prod"
+ }
+ },
+ {
+ "Id": "enmeshed",
+ "DisplayName": "enmeshed",
+ "Description": "Sie haben einen QR-Code der enmeshed-Plattform gescannt. Um fortfahren zu können, laden Sie die enmeshed-App auf Ihr Gerät.",
+ "ColorScheme": {
+ "Primary": "#192952",
+ "Secondary": "#EFE0D5",
+ "Background": "#FFF8F5",
+ "OnPrimary": "#FFF8F5",
+ "OnSecondary": "#221A14"
+ },
+ "IconUrl": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPAAAADwCAMAAAAJixmgAAAAA3NCSVQICAjb4U/gAAAATlBMVEX///8BNor49vUBAAAgICD+bQCVlZX/dgCampoXQo17fH0AH4Xm6OzS1d2/wceqrrj/x6n+18Jsf6s7XZz/nl+Jl7r/6dr6hiz/t4w6RV1ba3fKAAAFhklEQVR4nO2d65LaMAxGE283JJsbCQTY93/R2klgIYUQS526n6zzYzvT6XR8RrIsG5tNEkVRFEVRFEVRFEVRFEVRFOUppnKY0MP4J1R10+bZTN42srWrZnTNLeMP+4eVrqU61202az6S5Y1E5eqF7oQ4ZdOu2I5RrkMP8a9S5+u+TrkVFOQ34b1ShR7nX+JdOv8EWUZam/fpfBUWYbzdV0aMvXwlxHjr/L0pg1euxtPXAr06Vf6+eRt60Bz8dbELFyGhHbBJbWi+eRN64FSIAYYNMTXAsLO4pgrneeih0yDrgnYflDX4KgxZtsgly51/hB48hZbsi5nThuELWacZU9gdcIUevj+MRQlTmFGzHKGH7w9POMPrLqMT5qxKmMLRRZhVpQGFo5vDzGUJT5jVeCCuw6zWEvGsltdLI26IOQFG3B6yqhZgkWZVLcTNUsI6xAPc/yecnIbMaEadBs1oek5D1mgHMcSwAabuiWEDTAwxZJd1hVSoMUv0hPFPatA1+Ip3UkMntOXr29MXt0KPfH18fPkZhx4xj6+PX798jDPogjX5+hij3xGffK3x97bKlYE/fLj62hBXW67UwtfnH99kQweStbgN5cij7/iKZ00X/lHL0jdZe7gk4KXWE9/ETC/xlrJZJuAt3jPfEWOdb08tp+eWNfjcdbz0dRhT1U3TtK39Uct4W7rqKxBpvubUdfvLZd91p6f5KMrXdMfz7vPG7nzpltKSfLujk3zA/sWxu/83cnzNfre0vTrv9rcwy/G1us9sZ+fdfvpXYnxPxxXdUfl4Sh58sdfX/fNkXgTZSImveRfeWfksxfe8yddVLxm+a9VqqSzC14dPeN9kaz5fjdF9t9WrO87o65Gn7+5zH3rMHE6+us74FHrUDLwT2gkfQ4+aTkfwRU5qvxXpjtADp+JfscBDfKZGGDTEtBk8hrh7/7//h1BK9AxkoSaXLAdiu0XPaNCcvnCEL6FHT4CuazmHHj0BljDgJD4xMtqCt4PgCQNWLU6RhhSmNtKzMF47rcIqLEw4uqIV3bLEFMZrPKJrLePbPES3PYzuACC6Ix7GIR7opy3RHdNGdxAf30ct0X2YFt3HpfF9IB7flYfoLrX4J/Un+LWl+C6meV21FHH1MDl5xFjC5VKP68M7GdeH47sgnkT3BCCJ75FHEt0znmTlodZO5kMtR1xP8UYie2w5EdVz2k1EbQy/Om1j1dhUdTsMfd8Pg5xfqP36ay2a4ZCWZTpTpkWP/pU0Iy+6zLq3imnxgLU+gH+r1MgT4+ZQLmSvzmU64Id5aVy/0p2dwb8LL1kYm2FN11Ee0L9v6d7YhnddV0aQb8Z/VKoXQe7Ri9ds/L3FdgzyAb12jcabfYUYe/ha4wI+q99Xq0WMQ4+YSb2pXN0bD6GHzMIcfIWLEvrrLQdvXzuNgQtX7TmDJ2PgpPZPaEcJ22SSAmxD3IceOBVagHFDTAwwboh7YoBtiCELtSH7Fpg7RXJGozaY9IwGzWlqjR6FAet0xfCF7LYYUxhzErecCBdp6OH7Q9go3QvjnXxwijRkmVZhP2G8dUmF/YTxUppZpaMTxluWmtg6LV5rCXjmwdo8QJ4AsPbDeKsSb/dQhh48Bc4RD+B22MIIMGJG25wmn0sDLkoOcp2GrNEOarMF2GZNEEMMG2AbYtosRg1wkpiCEGPoOw+EtRixjb7DO6nh76b5dtSgPccPld9HTNATeKLadpV29sVdkX7wMBbha403Lk6pgHyeMP2WWp0W6PXqjuZtWqdlD74ePVL16688ykJKOt9Ye8dTpgNu//yapn/62sM9TROVzXfU7aF8kHbPD3v8XyG+RtUMVnqm6AX8wvQtVFVd15WUt7SKoiiKoiiKoiiKoiiKoijb+A3hKz2nnuI0BgAAAABJRU5ErkJggg==",
+ "BannerUrl": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjU1IiBoZWlnaHQ9Ijc0IiB2aWV3Qm94PSIwIDAgMjU1IDc0IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNNzIuNDIyNyAzOS4yNjY4SDU3LjM0MzFDNTcuNzQzNyA0Mi4zNDg4IDU5LjM3NyA0My41OTg0IDYxLjk4ODIgNDMuNTk4NEM2NC4xOTg5IDQzLjU5ODQgNjUuNDgzNyA0Mi42NTg2IDY2LjE0NDMgNDEuMDUyTDcyLjE1NzUgNDMuMDYyOUM3MC44NzI2IDQ2LjkwMSA2Ni42MjgxIDQ4Ljk1MzkgNjEuOTg4MiA0OC45NTM5QzU0LjY0ODcgNDguOTUzOSA1MC4wNTA0IDQ0LjcxMTUgNTAuMDUwNCAzNy4zNTA0QzUwLjA1MDQgMjkuOTg5MiA1NC43ODM5IDI1Ljc0NjkgNjEuNjM0NSAyNS43NDY5QzY4LjQ4NTEgMjUuNzQ2OSA3Mi41OTk2IDMwLjE2NzggNzIuNTk5NiAzNi4zMjY1QzcyLjU5OTYgMzcuNDQ0OSA3Mi41MTEyIDM4LjU1OCA3Mi40MjI3IDM5LjI3MjFWMzkuMjY2OFpNNTcuMzkgMzUuMjAyOUg2NS40MzY5QzY1LjE3MTYgMzIuNTI1MiA2My45MzM2IDMxLjA0OTggNjEuNjM0NSAzMS4wNDk4QzU5LjMzNTQgMzEuMDQ5OCA1Ny44MzIxIDMyLjM0NjcgNTcuMzkgMzUuMjAyOVoiIGZpbGw9IiMyMTIxMjEiLz4KPHBhdGggZD0iTTk2Ljc0MDUgMzMuNjQzNlY0OC41MDc2SDg5LjIyNDFWMzUuNjU0NUM4OS4yMjQxIDMyLjU3MjUgODcuOTM5MyAzMS41NDg2IDg2LjA4MjMgMzEuNTQ4NkM4My45MTMyIDMxLjU0ODYgODIuMTAzIDMyLjk3NjcgODIuMTAzIDM2LjY4MzZWNDguNTEyOUg3NC41ODY2VjI2LjE5ODRIODEuMzA3Mkw4MS41MjU2IDMwLjcwODVDODIuODUyMSAyNy40NDggODUuNTUxNyAyNS43NTIxIDg5LjA4ODggMjUuNzUyMUM5My42NDU1IDI1Ljc1MjEgOTYuNzQwNSAyOC40NzcxIDk2Ljc0MDUgMzMuNjU0MVYzMy42NDM2WiIgZmlsbD0iIzIxMjEyMSIvPgo8cGF0aCBkPSJNOTkuNzkzOSAyNi4xODc5SDEwNi41MTRMMTA2LjczMyAzMC41MTk1QzEwOC4xNDggMjcuMzk1NSAxMTAuODAxIDI1Ljc0MTYgMTE0LjE2MSAyNS43NDE2QzExNy41MjEgMjUuNzQxNiAxMTkuOTk3IDI3LjI1OSAxMjEuMTQ3IDMwLjE2MjVDMTIyLjUyIDI3LjI1OSAxMjUuMzkxIDI1Ljc0MTYgMTI4LjU3NSAyNS43NDE2QzEzMi45MDggMjUuNzQxNiAxMzYuMTc5IDI4LjQxOTMgMTM2LjEzOCAzMy42NDM2TDEzNi4wNDkgNDguNTA3NkgxMjguNjIxVjM1LjM4NjdDMTI4LjYyMSAzMi41Nzc3IDEyNy40MjUgMzEuNTQ4NiAxMjUuNjE1IDMxLjU0ODZDMTIzLjM2MyAzMS41NDg2IDEyMS43MjQgMzMuMjQ0NSAxMjEuNzI0IDM2LjU5NDNWNDguNTEyOUgxMTQuMjA4VjM1LjM5MkMxMTQuMjA4IDMyLjU4MyAxMTIuOTcgMzEuNTUzOSAxMTEuMjAxIDMxLjU1MzlDMTA5LjEyIDMxLjU1MzkgMTA3LjMxIDMzLjA3MTMgMTA3LjMxIDM2LjczMDhWNDguNTEyOUg5OS43OTM5VjI2LjE4NzlaIiBmaWxsPSIjMjEyMTIxIi8+CjxwYXRoIGQ9Ik0xNjAuNDA5IDM5LjI2NjhIMTQ1LjMyOUMxNDUuNzI0IDQyLjM0ODggMTQ3LjM2MyA0My41OTg0IDE0OS45NzQgNDMuNTk4NEMxNTIuMTg1IDQzLjU5ODQgMTUzLjQ2NSA0Mi42NTg2IDE1NC4xMyA0MS4wNTJMMTYwLjE0MyA0My4wNjI5QzE1OC44NjQgNDYuOTAxIDE1NC42MTQgNDguOTUzOSAxNDkuOTc0IDQ4Ljk1MzlDMTQyLjYzNSA0OC45NTM5IDEzOC4wMzYgNDQuNzExNSAxMzguMDM2IDM3LjM1MDRDMTM4LjAzNiAyOS45ODkyIDE0Mi43NyAyNS43NDY5IDE0OS42MjEgMjUuNzQ2OUMxNTYuNDcxIDI1Ljc0NjkgMTYwLjU4NiAzMC4xNjc4IDE2MC41ODYgMzYuMzI2NUMxNjAuNTg2IDM3LjQ0NDkgMTYwLjQ5NyAzOC41NTggMTYwLjQwOSAzOS4yNzIxVjM5LjI2NjhaTTE0NS4zNzYgMzUuMjAyOUgxNTMuNDIzQzE1My4xNTggMzIuNTI1MiAxNTEuOTIgMzEuMDQ5OCAxNDkuNjIxIDMxLjA0OThDMTQ3LjMyMSAzMS4wNDk4IDE0NS44MTggMzIuMzQ2NyAxNDUuMzc2IDM1LjIwMjlaIiBmaWxsPSIjMjEyMTIxIi8+CjxwYXRoIGQ9Ik0xNjAuOTgxIDQ0LjcxMTVMMTY0LjUxOCA0MC41MTY0QzE2NS45NzUgNDIuNDM4MSAxNjguNTQ0IDQzLjg2NjIgMTcxLjU1MSA0My44NjYyQzE3My4zNjYgNDMuODY2MiAxNzQuNjkyIDQzLjMzMDcgMTc0LjY5MiA0Mi4yMTIzQzE3NC42OTIgNDEuNDA5IDE3NC4yNSA0MC45MTU1IDE3Mi40ODIgNDAuNTU4NEwxNjkuMzg3IDM5LjkzMzZDMTYzLjgxNiAzOC43NzMzIDE2MS43MzUgMzYuNjMxMSAxNjEuNzM1IDMzLjAxMzVDMTYxLjczNSAyOS4zOTU5IDE2NS4wMDcgMjUuNzM2NCAxNzIuMTI4IDI1LjczNjRDMTc2LjYzOCAyNS43MzY0IDE4MC4wODcgMjcuMTIyNSAxODIuMTIgMjkuNTc0NEwxNzguNTM3IDMzLjY4MDNDMTc3LjEyMiAzMS44OTUyIDE3NC42NDYgMzAuODI0MSAxNzIuNDM1IDMwLjgyNDFDMTcwLjIyNCAzMC44MjQxIDE2OS4yMDUgMzEuNDQ4OSAxNjkuMjA1IDMyLjQ3OEMxNjkuMjA1IDMzLjI4MTMgMTY5LjgyNCAzMy44MTY4IDE3MS44MTYgMzQuMjIxMUwxNzUuODQyIDM1LjAyNDRDMTgwLjM5OSAzNS44Njk4IDE4Mi4yNTYgMzguMTQ4NSAxODIuMjU2IDQxLjI3MjVDMTgyLjI1NiA0NS42MDQxIDE3OC44MDcgNDguOTQ4NyAxNzEuODYzIDQ4Ljk0ODdDMTY3LjQ0MSA0OC45NDg3IDE2My41MDQgNDcuNDczMyAxNjAuOTg2IDQ0LjcwNjNMMTYwLjk4MSA0NC43MTE1WiIgZmlsbD0iIzIxMjEyMSIvPgo8cGF0aCBkPSJNMTgzLjkzMSAxNi43MjY2SDE5MS40NDdWMzAuMjUxOEMxOTIuNzczIDI3LjI1OSAxOTUuMjQ5IDI1Ljc0MTYgMTk4LjQzMyAyNS43NDE2QzIwMi45OSAyNS43NDE2IDIwNi4wODQgMjguNDY2NiAyMDYuMDg0IDMzLjY0MzZWNDguNTA3NkgxOTguNTY4VjM1Ljc0MzdDMTk4LjU2OCAzMi41NzI1IDE5Ny4yODggMzEuNTAxNCAxOTUuNDI2IDMxLjUwMTRDMTkzLjI1NyAzMS41MDE0IDE5MS40NDcgMzMuMDE4OCAxOTEuNDQ3IDM2Ljc2NzZWNDguNTA3NkgxODMuOTMxVjE2LjcyNjZaIiBmaWxsPSIjMjEyMTIxIi8+CjxwYXRoIGQ9Ik0yMzAuMzU1IDM5LjI2NjhIMjE1LjI3NkMyMTUuNjc2IDQyLjM0ODggMjE3LjMxIDQzLjU5ODQgMjE5LjkyMSA0My41OTg0QzIyMi4xMzIgNDMuNTk4NCAyMjMuNDE2IDQyLjY1ODYgMjI0LjA3NyA0MS4wNTJMMjMwLjA5IDQzLjA2MjlDMjI4LjgxMSA0Ni45MDEgMjI0LjU2MSA0OC45NTM5IDIxOS45MjEgNDguOTUzOUMyMTIuNTgxIDQ4Ljk1MzkgMjA3Ljk4MyA0NC43MTE1IDIwNy45ODMgMzcuMzUwNEMyMDcuOTgzIDI5Ljk4OTIgMjEyLjcxNyAyNS43NDY5IDIxOS41NjcgMjUuNzQ2OUMyMjYuNDE4IDI1Ljc0NjkgMjMwLjUzMiAzMC4xNjc4IDIzMC41MzIgMzYuMzI2NUMyMzAuNTMyIDM3LjQ0NDkgMjMwLjQ0NCAzOC41NTggMjMwLjM1NSAzOS4yNzIxVjM5LjI2NjhaTTIxNS4zMjMgMzUuMjAyOUgyMjMuMzdDMjIzLjEwNCAzMi41MjUyIDIyMS44NjYgMzEuMDQ5OCAyMTkuNTY3IDMxLjA0OThDMjE3LjI2OCAzMS4wNDk4IDIxNS43NjUgMzIuMzQ2NyAyMTUuMzIzIDM1LjIwMjlaIiBmaWxsPSIjMjEyMTIxIi8+CjxwYXRoIGQ9Ik0yNTQuODUgMTYuNzI2NlY0OC41MDI0SDI0OC4xMjlMMjQ3Ljg2NCA0NC4xMjg3QzI0Ni42MjYgNDcuMTIxNSAyNDQuMDE1IDQ4Ljk0ODcgMjQwLjY1NSA0OC45NDg3QzIzNS4xNzIgNDguOTQ4NyAyMzEuNTQ3IDQ0LjcwNjMgMjMxLjU0NyAzNy40MzQ0QzIzMS41NDcgMzAuMTYyNSAyMzUuMzQ5IDI1Ljc0MTYgMjQwLjgzMiAyNS43NDE2QzI0My45NzMgMjUuNzQxNiAyNDYuMTg0IDI3LjQzNzUgMjQ3LjMzNCAyOS45ODRWMTYuNzI2NkgyNTQuODVaTTI0Ny4zMzQgMzcuMjEzOUMyNDcuMzM0IDMzLjQ2NSAyNDUuODMgMzEuMzIyOSAyNDMuMzA4IDMxLjMyMjlDMjQwLjc4NSAzMS4zMjI5IDIzOS4xMDUgMzMuMTk3MyAyMzkuMTA1IDM3LjM1MDRDMjM5LjEwNSA0MS41MDM1IDI0MC42NSA0My4zNzc5IDI0My4yNjEgNDMuMzc3OUMyNDUuODcyIDQzLjM3NzkgMjQ3LjMyOCA0MS4yMzU3IDI0Ny4zMjggMzcuMjE5MUwyNDcuMzM0IDM3LjIxMzlaIiBmaWxsPSIjMjEyMTIxIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMzcuOTc0NCAxMS4xMzA2QzM4LjQ4MTkgMTEuNjM4MSAzOC40ODE5IDEyLjQ2MDkgMzcuOTc0NCAxMi45Njg0TDEzLjk0MzEgMzYuOTk5N0wzNy45NzQ0IDYxLjAzMUMzOC40ODE5IDYxLjUzODUgMzguNDgxOSA2Mi4zNjEzIDM3Ljk3NDQgNjIuODY4OEMzNy40NjY5IDYzLjM3NjMgMzYuNjQ0MSA2My4zNzYzIDM2LjEzNjcgNjIuODY4OEwxMC4yNjc2IDM2Ljk5OTdMMzYuMTM2NyAxMS4xMzA2QzM2LjY0NDEgMTAuNjIzMSAzNy40NjY5IDEwLjYyMzEgMzcuOTc0NCAxMS4xMzA2WiIgZmlsbD0iIzIxMjEyMSIvPgo8Y2lyY2xlIGN4PSIzNy4wNTU1IiBjeT0iMTIuMDQ5MSIgcj0iMTEuOTU1MyIgZmlsbD0iIzlBOUE5QSIvPgo8Y2lyY2xlIGN4PSIzNy4wNTU1IiBjeT0iNjEuOTQ5NCIgcj0iMTEuOTU1MyIgZmlsbD0iIzE3NDI4RCIvPgo8Y2lyY2xlIGN4PSIxMi4xMDUzIiBjeT0iMzYuOTk4MyIgcj0iMTEuOTU1MyIgZmlsbD0iI0ZGNzYwMCIvPgo8L3N2Zz4K",
+ "AppleAppStore": {
+ "AppLink": "https://apps.apple.com/us/app/enmeshed/id1576693742"
+ },
+ "GooglePlayStore": {
+ "AppLink": "https://play.google.com/store/apps/details?id=eu.enmeshed.app"
+ }
+ }
]
- }
- ]
- }
+ },
+ "WellKnownEndpoints": {
+ "AppleAppSiteAssociations": ["R7Y6NESEQW.eu.enmeshed.app"],
+ "AndroidAssetLinks": [
+ {
+ "PackageName": "eu.enmeshed.app",
+ "Sha256CertFingerprints": ["0F:6F:48:FF:59:E7:B4:EC:52:4A:BB:E7:45:41:E7:38:5B:13:D1:0B:14:37:CF:C3:59:08:DF:22:F3:CA:70:38"]
+ }
+ ]
+ }
}
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 68ce63dc24..745a774c55 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -58,6 +58,78 @@ services:
- SEQ_FIRSTRUN_NOAUTHENTICATION=True
restart: unless-stopped
+ prometheus:
+ image: prom/prometheus:v3.14.0
+ container_name: prometheus
+ command:
+ - --config.file=/etc/prometheus/prometheus.yml
+ - --storage.tsdb.path=/prometheus
+ - --web.enable-remote-write-receiver
+ ports:
+ - "9090:9090"
+ volumes:
+ - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro
+ - prometheus-data:/prometheus
+ restart: unless-stopped
+
+ tempo:
+ image: grafana/tempo:3.0.3
+ container_name: tempo
+ user: "0:0"
+ command:
+ - -config.file=/etc/tempo/tempo.yml
+ volumes:
+ - ./tempo/tempo.yml:/etc/tempo/tempo.yml:ro
+ - tempo-data:/tmp/tempo
+ restart: unless-stopped
+
+ loki:
+ image: grafana/loki:3.7.6
+ container_name: loki
+ command:
+ - -config.file=/etc/loki/loki.yml
+ ports:
+ - "3100:3100"
+ volumes:
+ - ./loki/loki.yml:/etc/loki/loki.yml:ro
+ - loki-data:/loki
+ restart: unless-stopped
+
+ grafana:
+ image: grafana/grafana:13.2.1
+ container_name: grafana
+ environment:
+ - GF_SECURITY_ADMIN_USER=admin
+ - GF_SECURITY_ADMIN_PASSWORD=admin
+ ports:
+ - "3000:3000"
+ depends_on:
+ - prometheus
+ - tempo
+ - loki
+ volumes:
+ - ./grafana/provisioning:/etc/grafana/provisioning:ro
+ - grafana-data:/var/lib/grafana
+ restart: unless-stopped
+
+ otel-collector:
+ image: otel/opentelemetry-collector:0.159.0
+ volumes:
+ - ./otel-collector/otel-collector-config.yml:/etc/otel/config.yaml
+ # - ./log:/log/otel
+ command: --config /etc/otel/config.yaml
+ environment:
+ TEMPO_ENDPOINT: "tempo:4317"
+ ports:
+ - "8889:8889" # Prometheus metrics exporter (scrape endpoint)
+ - "55679:55679" # ZPages extension
+ - "4317:4317" # OTLP Receiver
+ - "4318:4318" # OTLP HTTP Receiver
+ depends_on:
+ - tempo
+ - prometheus
+ - loki
+
networks:
default:
name: backbone
@@ -68,3 +140,7 @@ volumes:
postgres-volume:
azure-storage-emulator-volume:
seq-data:
+ prometheus-data:
+ tempo-data:
+ loki-data:
+ grafana-data:
diff --git a/docker-compose/grafana/provisioning/datasources/datasources.yml b/docker-compose/grafana/provisioning/datasources/datasources.yml
new file mode 100644
index 0000000000..3e32a7453f
--- /dev/null
+++ b/docker-compose/grafana/provisioning/datasources/datasources.yml
@@ -0,0 +1,32 @@
+apiVersion: 1
+
+datasources:
+ - name: Prometheus
+ uid: prometheus
+ type: prometheus
+ access: proxy
+ url: http://prometheus:9090
+ isDefault: true
+ editable: false
+
+ - name: Tempo
+ uid: tempo
+ type: tempo
+ access: proxy
+ url: http://tempo:3200
+ editable: false
+ jsonData:
+ httpMethod: GET
+ serviceMap:
+ datasourceUid: prometheus
+ nodeGraph:
+ enabled: true
+ tracesToMetrics:
+ datasourceUid: prometheus
+
+ - name: Loki
+ uid: loki
+ type: loki
+ access: proxy
+ url: http://loki:3100
+ editable: false
diff --git a/docker-compose/loki/loki.yml b/docker-compose/loki/loki.yml
new file mode 100644
index 0000000000..2ab43f81bc
--- /dev/null
+++ b/docker-compose/loki/loki.yml
@@ -0,0 +1,41 @@
+auth_enabled: false
+
+server:
+ http_listen_port: 3100
+
+common:
+ path_prefix: /loki
+ replication_factor: 1
+ ring:
+ kvstore:
+ store: inmemory
+ storage:
+ filesystem:
+ chunks_directory: /loki/chunks
+ rules_directory: /loki/rules
+
+schema_config:
+ configs:
+ - from: 2024-04-01
+ store: tsdb
+ object_store: filesystem
+ schema: v13
+ index:
+ prefix: index_
+ period: 24h
+
+limits_config:
+ allow_structured_metadata: true
+ volume_enabled: true
+ otlp_config:
+ resource_attributes:
+ ignore_defaults: true
+ attributes_config:
+ - action: index_label
+ attributes:
+ - service.name
+ - deployment.environment.name
+
+compactor:
+ working_directory: /loki/compactor
+ delete_request_store: filesystem
diff --git a/docker-compose/otel-collector/otel-collector-config.yml b/docker-compose/otel-collector/otel-collector-config.yml
new file mode 100644
index 0000000000..0b06ba2b48
--- /dev/null
+++ b/docker-compose/otel-collector/otel-collector-config.yml
@@ -0,0 +1,65 @@
+extensions:
+ health_check:
+ zpages:
+ endpoint: :55679
+
+receivers:
+ otlp:
+ protocols:
+ grpc:
+ endpoint: 0.0.0.0:4317
+ http:
+ endpoint: 0.0.0.0:4318
+
+processors:
+ memory_limiter:
+ check_interval: 1s
+ limit_percentage: 50
+ spike_limit_percentage: 30
+
+ batch:
+
+exporters:
+ debug:
+ otlp/tempo:
+ endpoint: "${TEMPO_ENDPOINT}"
+ tls:
+ insecure: true
+ prometheus:
+ endpoint: "0.0.0.0:8889"
+ otlp_http/loki:
+ endpoint: "http://loki:3100/otlp"
+
+service:
+ pipelines:
+ traces:
+ receivers:
+ - otlp
+ processors:
+ - memory_limiter
+ - batch
+ exporters:
+ - debug
+ - otlp/tempo
+ metrics:
+ receivers:
+ - otlp
+ processors:
+ - memory_limiter
+ - batch
+ exporters:
+ - debug
+ - prometheus
+ logs:
+ receivers:
+ - otlp
+ processors:
+ - memory_limiter
+ - batch
+ exporters:
+ - debug
+ - otlp_http/loki
+
+ extensions:
+ - health_check
+ - zpages
diff --git a/docker-compose/prometheus/prometheus.yml b/docker-compose/prometheus/prometheus.yml
new file mode 100644
index 0000000000..0d1851622b
--- /dev/null
+++ b/docker-compose/prometheus/prometheus.yml
@@ -0,0 +1,9 @@
+global:
+ scrape_interval: 15s
+ evaluation_interval: 15s
+
+scrape_configs:
+ - job_name: otel-collector
+ static_configs:
+ - targets:
+ - otel-collector:8889
diff --git a/docker-compose/tempo/tempo.yml b/docker-compose/tempo/tempo.yml
new file mode 100644
index 0000000000..1dcffc3f38
--- /dev/null
+++ b/docker-compose/tempo/tempo.yml
@@ -0,0 +1,40 @@
+auth_enabled: false
+
+server:
+ http_listen_port: 3200
+
+distributor:
+ receivers:
+ otlp:
+ protocols:
+ grpc:
+ endpoint: 0.0.0.0:4317
+ http:
+ endpoint: 0.0.0.0:4318
+
+metrics_generator:
+ registry:
+ collection_interval: 15s
+ storage:
+ path: /tmp/tempo/generator/wal
+ remote_write:
+ - url: http://prometheus:9090/api/v1/write
+
+storage:
+ trace:
+ backend: local
+ wal:
+ path: /tmp/tempo/wal
+ local:
+ path: /tmp/tempo/blocks
+
+overrides:
+ defaults:
+ metrics_generator:
+ processors:
+ - service-graphs
+ - span-metrics
+
+query_frontend:
+ metrics:
+ max_duration: 720h
diff --git a/helm/templates/eventhandler/deployment.yaml b/helm/templates/eventhandler/deployment.yaml
index d96128b9c6..2ded933456 100644
--- a/helm/templates/eventhandler/deployment.yaml
+++ b/helm/templates/eventhandler/deployment.yaml
@@ -50,10 +50,6 @@ spec:
{{- toYaml .Values.eventhandler.resources | nindent 12 }}
image: "{{ .Values.eventhandler.image.repository }}:{{- default .Chart.AppVersion .Values.eventhandler.image.tagOverride }}"
imagePullPolicy: {{ .Values.eventhandler.image.pullPolicy }}
- ports:
- - name: metrics
- containerPort: 9444
- protocol: TCP
volumeMounts:
- name: settings-override
mountPath: /app/appsettings.override.json
diff --git a/helm/templates/eventhandler/service.yaml b/helm/templates/eventhandler/service.yaml
deleted file mode 100644
index 40ab66e16d..0000000000
--- a/helm/templates/eventhandler/service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ .Values.eventhandler.name }}
- labels:
- {{- include "global.labels" . | nindent 4 }}
- app: {{ .Values.eventhandler.name }}
-spec:
- type: ClusterIP
- ports:
- - name: metrics
- port: 9444
- targetPort: 9444
- selector:
- app: {{ .Values.eventhandler.name }}