Skip to content

TEST- DO NOT MERGE #20230

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

Closed
wants to merge 2 commits into from
+5 −2
Closed

TEST- DO NOT MERGE #20230

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9cd4b2
TEST- DO NOT MERGE
Siddhant-K-code Sep 18, 2024
c009383
trigger ci
Siddhant-K-code Sep 18, 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
7 changes: 5 additions & 2 deletions components/server/src/analytics-controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class AnalyticsController {
}
const clientHeaderFields = toClientHeaderFields(req);
const event = req.body as RemoteTrackMessage;
this.trackEvent(req.user?.id, event, clientHeaderFields);
this.trackEvent(req.user?.id, event, clientHeaderFields, req, res);
res.sendStatus(200);
} catch (e) {
console.error("failed to track event", e);
Expand Down Expand Up @@ -84,6 +84,8 @@ export class AnalyticsController {
userId: string | undefined,
event: RemoteTrackMessage,
clientHeaderFields: ClientHeaderFields,
req: express.Request,
res: express.Response,
): void {
// Beware: DO NOT just event... the message, but consume it individually as the message is coming from
// the wire and we have no idea what's in it. Even passing the context and properties directly
Expand All @@ -106,6 +108,7 @@ export class AnalyticsController {
anonymousId: anonymousId,
...msg,
});
this.setHashedUserIdCookie(userId, req, res);
} else if (anonymousId) {
this.analytics.track({
anonymousId: anonymousId as string | number,
Expand Down Expand Up @@ -203,7 +206,7 @@ export class AnalyticsController {
res.cookie("gitpod_hashed_user_id", hashedUserId, {
domain: domain,
maxAge: oneYearInSeconds * 1000, // Convert to milliseconds
httpOnly: true,
httpOnly: false,
secure: true,
sameSite: "lax",
});
Expand Down
Loading