Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Otel/sessions #3366

Draft
wants to merge 2 commits into
base: otel/initial-instrumentation
Choose a base branch
from
Draft

Otel/sessions #3366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86be276
set and access session
andracc Sep 20, 2024
646244b
setting session var - draft
andracc Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Backend/Controllers/UserController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,17 @@ public class UserController : Controller
private readonly IEmailService _emailService;
private readonly IPasswordResetService _passwordResetService;
private readonly IPermissionService _permissionService;
private readonly IHttpContextAccessor _httpContextAccessor;

public UserController(IUserRepository userRepo, IPermissionService permissionService,
ICaptchaService captchaService, IEmailService emailService, IPasswordResetService passwordResetService)
ICaptchaService captchaService, IEmailService emailService, IPasswordResetService passwordResetService, IHttpContextAccessor httpContextAccessor)
{
_userRepo = userRepo;
_captchaService = captchaService;
_emailService = emailService;
_passwordResetService = passwordResetService;
_permissionService = permissionService;
_httpContextAccessor = httpContextAccessor;
}

/// <summary> Verifies a CAPTCHA token </summary>
Expand Down Expand Up @@ -128,6 +130,7 @@ public async Task<IActionResult> Authenticate([FromBody, BindRequired] Credentia
{
return Unauthorized(cred.Username);
}
_httpContextAccessor?.HttpContext?.Session.SetString("starting session", "start");
return Ok(user);
}
catch (KeyNotFoundException)
Expand Down
81 changes: 62 additions & 19 deletions Backend/Otel/OtelKernel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@

// using System;
using System.Diagnostics;
using Microsoft.AspNetCore.Http;

// using Microsoft.AspNetCore.Authentication.Cookies;

// using System.Security.Claims;
// using Microsoft.AspNetCore.Http;

// using System.Diagnostics.Metrics;
// using System.Net.Http;
// using System.Net.Http.Json;
Expand Down Expand Up @@ -53,6 +60,14 @@ public static void AddOpenTelemetryInstrumentation(this IServiceCollection servi
activity.SetTag("inbound.http.request.body.size", "no content");
}
// activity.EnrichWithUser(request.HttpContext);

// activity.SetTag("BEFORE", "before");
// var sess = request.HttpContext.Session;
// activity.SetTag("SESSION!", sess);
// activity.SetTag("AFTER", "after");
// var id = request.HttpContext.Request.Cookies[pConfig.CookieName].Value();
// var id = request.HttpContext.Session.GetString("starting session");
// activity.SetTag("TEST session values", id);
};
options.EnrichWithHttpResponse = (activity, response) =>
{
Expand All @@ -66,6 +81,12 @@ public static void AddOpenTelemetryInstrumentation(this IServiceCollection servi
activity.SetTag("inbound.http.response.body.size", "no content");
}
// activity.EnrichWithUser(response.HttpContext);
// var id = response.HttpContext.Session.GetString("starting session");
// activity.SetTag("TEST session values", id);
activity.SetTag("COOKIE-RESPONSE-before", "before");
// var id = response.HttpContext.Session.Id;
activity.SetTag("COOKIE-RESPONSE", "after");

};
})
.AddHttpClientInstrumentation(options =>
Expand All @@ -84,7 +105,7 @@ public static void AddOpenTelemetryInstrumentation(this IServiceCollection servi

if (request.RequestUri is not null)
{
activity.SetTag("url.pathHERE", request.RequestUri.AbsolutePath);
// activity.SetTag("url.pathHERE", request.RequestUri.AbsolutePath);
if (!string.IsNullOrEmpty(request.RequestUri.Query))
activity.SetTag("url.query", request.RequestUri.Query);
}
Expand Down Expand Up @@ -142,34 +163,56 @@ public static void AddOpenTelemetryInstrumentation(this IServiceCollection servi
// {
// activity.SetTag("http.abort", true);
// }
// }

private class LocationEnricher(LocationProvider locationProvider) : BaseProcessor<Activity>
{
public override async void OnEnd(Activity data)

// private class LocationEnricher(IHttpContextAccessor contextAccessor, LocationProvider locationProvider) : BaseProcessor<Activity>
// private class LocationEnricher(LocationProvider locationProvider, SessionProvider sessionProvider) : BaseProcessor<Activity>
private class LocationEnricher(LocationProvider locationProvider, IHttpContextAccessor contextAccessor) : BaseProcessor<Activity>
{
string? uriPath = (string?)data.GetTagItem("url.full");
string locationUri = LocationProvider.locationGetterUri;

if (uriPath == null || !uriPath.Contains(locationUri))
// public override void OnStart(Activity data)
// {
// // if (contextAccessor.HttpContext is { } context) data.EnrichWithUser(context);
// var existingSession = sessionProvider.GetSession();
// data?.AddTag("SESSIONONSTART", existingSession);
// }
public override async void OnEnd(Activity data)
{
LocationApi? response = await locationProvider.GetLocation();
string? uriPath = (string?)data.GetTagItem("url.full");
string locationUri = LocationProvider.locationGetterUri;

var location = new
if (uriPath == null || !uriPath.Contains(locationUri))
{
Country = response?.country,
Region = response?.regionName,
City = response?.city,
};

data?.AddTag("country", location.Country);
data?.AddTag("region", location.Region);
data?.AddTag("city", location.City);
LocationApi? response = await locationProvider.GetLocation();

var location = new
{
Country = response?.country,
Region = response?.regionName,
City = response?.city,
};

data?.AddTag("country", location.Country);
data?.AddTag("region", location.Region);
data?.AddTag("city", location.City);

if (contextAccessor.HttpContext is { } context)
{
// data?.SetTag("ONEND BEFORE", "before");
// var sess = context.Session;
// data?.SetTag("SESSION!", sess);

}


// var existingSession = sessionProvider.GetSession();
// data?.AddTag("SESSIONONSTART", existingSession);
}
}


}
}
}

}

29 changes: 29 additions & 0 deletions Backend/Otel/SessionProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using Microsoft.AspNetCore.Http;

namespace BackendFramework.Otel
{
public class SessionProvider
{
private readonly IHttpContextAccessor _contextAccessor;
public SessionProvider(IHttpContextAccessor contextAccessor)
{
_contextAccessor = contextAccessor;

}
public string GetSession()
{
// note: adding any activity tags in this function will cause overflow
// because function called on each activity in OtelKernel
if (_contextAccessor.HttpContext is { } context)
{
// context.Session.SetString("mysession", "mysessionValue");

var sessId = context.Session.Id;
// var sessId = context;

return sessId;
}
return "noSess";
}
}
}
29 changes: 29 additions & 0 deletions Backend/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,36 @@ public void ConfigureServices(IServiceCollection services)
services.AddTransient<IWordService, WordService>();

// OpenTelemetry


services.AddDistributedMemoryCache();
services.AddSession(options =>
{
options.IdleTimeout = TimeSpan.FromMinutes(10);
// options.Cookie.HttpOnly = true;
options.Cookie.IsEssential = true;
}
);
services.AddSingleton<SessionProvider>();



services.AddDistributedMemoryCache();
services.AddSession(options =>
{
options.IdleTimeout = TimeSpan.FromMinutes(10);
// options.Cookie.HttpOnly = true;
// options.Cookie.IsEssential = true;
}
);
services.AddSingleton<SessionProvider>();

services.AddMemoryCache();
services.AddHttpContextAccessor();

services.AddHttpClient();
services.AddSingleton<LocationProvider>();

services.AddOpenTelemetryInstrumentation();

}
Expand All @@ -320,14 +345,18 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IHostApp
app.UseRouting();
// Apply CORS policy to all requests.
app.UseCors(LocalhostCorsPolicy);
// app.UseSession();

app.UseForwardedHeaders(new ForwardedHeadersOptions
{
ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
});


app.UseSession();
app.UseAuthentication();
app.UseAuthorization();
app.UseSession();
app.UseEndpoints(endpoints =>
{
endpoints.MapDefaultControllerRoute();
Expand Down