diff --git a/IdentityServer/v7/Diagnostics/Otel/src/HostingExtensions.cs b/IdentityServer/v7/Diagnostics/Otel/src/HostingExtensions.cs
index 2e27a776..646f74e2 100644
--- a/IdentityServer/v7/Diagnostics/Otel/src/HostingExtensions.cs
+++ b/IdentityServer/v7/Diagnostics/Otel/src/HostingExtensions.cs
@@ -50,21 +50,24 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
};
});
- builder.Services.AddOpenTelemetryTracing(builder =>
+ builder.Services.AddOpenTelemetry()
+ .ConfigureResource(resource => resource
+ .AddService("IdentityServerHost.Sample"))
+ .WithTracing(tracing =>
{
- builder
+ tracing
.AddConsoleExporter()
+ // This configuration will only show the information in the console
+ // Optional: export Otlp: tracing.AddOtlpExporter();
- // all avavilabe sources
+ // all available sources
.AddSource(IdentityServerConstants.Tracing.Basic)
.AddSource(IdentityServerConstants.Tracing.Cache)
.AddSource(IdentityServerConstants.Tracing.Services)
.AddSource(IdentityServerConstants.Tracing.Stores)
.AddSource(IdentityServerConstants.Tracing.Validation)
- .SetResourceBuilder(
- ResourceBuilder.CreateDefault()
- .AddService("IdentityServerHost.Sample"))
+
.AddHttpClientInstrumentation()
.AddAspNetCoreInstrumentation()
.AddSqlClientInstrumentation();
diff --git a/IdentityServer/v7/Diagnostics/Otel/src/Otel.csproj b/IdentityServer/v7/Diagnostics/Otel/src/Otel.csproj
index 94a7fbe2..ebc184a2 100644
--- a/IdentityServer/v7/Diagnostics/Otel/src/Otel.csproj
+++ b/IdentityServer/v7/Diagnostics/Otel/src/Otel.csproj
@@ -1,24 +1,24 @@
- net6.0
+ net10.0
enable
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
diff --git a/IdentityServer/v7/Diagnostics/Otel/src/Pages/Account/Logout/Index.cshtml.cs b/IdentityServer/v7/Diagnostics/Otel/src/Pages/Account/Logout/Index.cshtml.cs
index c9a31994..23e12bad 100644
--- a/IdentityServer/v7/Diagnostics/Otel/src/Pages/Account/Logout/Index.cshtml.cs
+++ b/IdentityServer/v7/Diagnostics/Otel/src/Pages/Account/Logout/Index.cshtml.cs
@@ -4,7 +4,7 @@
using Duende.IdentityServer.Events;
using Duende.IdentityServer.Extensions;
using Duende.IdentityServer.Services;
-using IdentityModel;
+using Duende.IdentityModel;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
diff --git a/IdentityServer/v7/Diagnostics/Otel/src/Pages/Consent/Index.cshtml.cs b/IdentityServer/v7/Diagnostics/Otel/src/Pages/Consent/Index.cshtml.cs
index cb7b914c..ca772640 100644
--- a/IdentityServer/v7/Diagnostics/Otel/src/Pages/Consent/Index.cshtml.cs
+++ b/IdentityServer/v7/Diagnostics/Otel/src/Pages/Consent/Index.cshtml.cs
@@ -6,7 +6,7 @@
using Duende.IdentityServer.Models;
using Duende.IdentityServer.Services;
using Duende.IdentityServer.Validation;
-using IdentityModel;
+using Duende.IdentityModel;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
diff --git a/IdentityServer/v7/Diagnostics/Otel/src/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/Diagnostics/Otel/src/Pages/Diagnostics/ViewModel.cs
index 93915f19..97bd933c 100644
--- a/IdentityServer/v7/Diagnostics/Otel/src/Pages/Diagnostics/ViewModel.cs
+++ b/IdentityServer/v7/Diagnostics/Otel/src/Pages/Diagnostics/ViewModel.cs
@@ -2,9 +2,9 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.
+using System.Buffers.Text;
using System.Text;
using System.Text.Json;
-using IdentityModel;
using Microsoft.AspNetCore.Authentication;
namespace Otel.Pages.Diagnostics;
@@ -18,7 +18,7 @@ public ViewModel(AuthenticateResult result)
if (result.Properties.Items.ContainsKey("client_list"))
{
var encoded = result.Properties.Items["client_list"];
- var bytes = Base64Url.Decode(encoded);
+ var bytes = Base64Url.DecodeFromChars(encoded);
var value = Encoding.UTF8.GetString(bytes);
Clients = JsonSerializer.Deserialize(value);
diff --git a/IdentityServer/v7/Diagnostics/Otel/src/Pages/ExternalLogin/Callback.cshtml.cs b/IdentityServer/v7/Diagnostics/Otel/src/Pages/ExternalLogin/Callback.cshtml.cs
index e76cffd4..02802942 100644
--- a/IdentityServer/v7/Diagnostics/Otel/src/Pages/ExternalLogin/Callback.cshtml.cs
+++ b/IdentityServer/v7/Diagnostics/Otel/src/Pages/ExternalLogin/Callback.cshtml.cs
@@ -6,7 +6,7 @@
using Duende.IdentityServer.Events;
using Duende.IdentityServer.Services;
using Duende.IdentityServer.Test;
-using IdentityModel;
+using Duende.IdentityModel;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
diff --git a/IdentityServer/v7/Diagnostics/Otel/src/Pages/TestUsers.cs b/IdentityServer/v7/Diagnostics/Otel/src/Pages/TestUsers.cs
index 7729e217..f049c5e8 100644
--- a/IdentityServer/v7/Diagnostics/Otel/src/Pages/TestUsers.cs
+++ b/IdentityServer/v7/Diagnostics/Otel/src/Pages/TestUsers.cs
@@ -6,7 +6,7 @@
using System.Text.Json;
using Duende.IdentityServer;
using Duende.IdentityServer.Test;
-using IdentityModel;
+using Duende.IdentityModel;
namespace Otel;