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.

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

Chore/trace user #435

Merged
merged 1 commit into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion backend/LexBoxApi/Otel/OtelKernel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using LexBoxApi.Services;
using LexCore.Auth;
using Npgsql;
using OpenTelemetry;
using OpenTelemetry.Metrics;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace;
Expand All @@ -28,6 +29,7 @@ public static void AddOpenTelemetryInstrumentation(this IServiceCollection servi
configuration.Bind("Otel", options);
})
.AddSource(ServiceName)
.AddProcessor<UserEnricher>()
.SetResourceBuilder(appResourceBuilder)
// could potentially add baggage to the trace as done in
// https://github.com/honeycombio/honeycomb-opentelemetry-dotnet/blob/main/src/Honeycomb.OpenTelemetry.Instrumentation.AspNetCore/TracerProviderBuilderExtensions.cs
Expand Down Expand Up @@ -109,6 +111,15 @@ private static void EnrichWithUser(this Activity activity, HttpContext httpConte
{
activity.SetTag("app.user.role", userRole);
}
activity.SetTag("http.abort", httpContext.RequestAborted.IsCancellationRequested);
if (httpContext.RequestAborted.IsCancellationRequested)
activity.SetTag("http.abort", true);
}

private class UserEnricher(IHttpContextAccessor contextAccessor) : BaseProcessor<Activity>
{
public override void OnStart(Activity data)
{
if (contextAccessor.HttpContext is {} context) data.EnrichWithUser(context);
}
}
}
10 changes: 9 additions & 1 deletion frontend/src/lib/otel/otel.client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { BatchSpanProcessor, WebTracerProvider } from '@opentelemetry/sdk-trace-
import { APP_VERSION } from '$lib/util/version';
import { OTLPTraceExporterBrowserWithXhrRetry } from './trace-exporter-browser-with-xhr-retry';
import { Resource } from '@opentelemetry/resources'
import { SERVICE_NAME } from '.'
import {SERVICE_NAME, traceUserAttributes} from '.';
import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'
import { ZoneContextManager } from '@opentelemetry/context-zone'
import { getWebAutoInstrumentations } from '@opentelemetry/auto-instrumentations-web'
Expand All @@ -27,6 +27,14 @@ const resource = Resource.default().merge(
const provider = new WebTracerProvider({
resource: resource,
});
provider.addSpanProcessor({
forceFlush: () => Promise.resolve(),
onStart: (span) => {
traceUserAttributes(span);
},
onEnd: () => {},
shutdown: () => Promise.resolve(),
});
const exporter = new OTLPTraceExporterBrowserWithXhrRetry({
url: '/v1/traces'
});
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/lib/otel/otel.shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ function getUser(event?: RequestEvent | NavigationEvent | Event): LexAuthUser |
}
}
}
function traceUserAttributes(span: Span, event?: RequestEvent | NavigationEvent | Event): void {
export function traceUserAttributes(span: Span, event?: RequestEvent | NavigationEvent | Event): void {
const user = getUser(event);
if (user) {
span.setAttribute('app.user.id', user.id);
Expand Down
Loading