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

feat: remove unused code path #21200

Merged
merged 2 commits into from
Mar 28, 2024
Merged

feat: remove unused code path #21200

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
93545f7
feat: remove unused code path
pauldambra Mar 28, 2024
96594c5
fix
pauldambra Mar 28, 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
33 changes: 6 additions & 27 deletions plugin-server/src/main/ingestion-queues/session-recording/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,16 @@ export const parseKafkaMessage = async (

const headerResult = await readTokenFromHeaders(message.headers, getTeamFn)
const token: string | undefined = headerResult.token
let teamIdWithConfig: null | TeamIDWithConfig = headerResult.teamIdWithConfig
const teamIdWithConfig: null | TeamIDWithConfig = headerResult.teamIdWithConfig

if (!token) {
return dropMessage('no_token_in_header')
}

// NB `==` so we're comparing undefined and null
// if token was in the headers but, we could not load team config
// then, we can return early
if (!!token && (teamIdWithConfig == null || teamIdWithConfig.teamId == null)) {
if (teamIdWithConfig == null || teamIdWithConfig.teamId == null) {
return dropMessage('header_token_present_team_missing_or_disabled', {
token: token,
})
Expand All @@ -183,31 +187,6 @@ export const parseKafkaMessage = async (
return dropMessage('received_non_snapshot_message')
}

// TODO this mechanism is deprecated for blobby ingestion, we should remove it
// once we're happy that the new mechanism is working
// if there was not a token in the header then we try to load one from the message payload
if (teamIdWithConfig == null && messagePayload.team_id == null && !messagePayload.token) {
return dropMessage('no_token_in_header_or_payload')
}

if (teamIdWithConfig == null) {
const token = messagePayload.token

if (token) {
teamIdWithConfig = await getTeamFn(token)
}
}

// NB `==` so we're comparing undefined and null
if (teamIdWithConfig == null || teamIdWithConfig.teamId == null) {
return dropMessage('token_fallback_team_missing_or_disabled', {
token: messagePayload.token,
teamId: messagePayload.team_id,
payloadTeamSource: messagePayload.team_id ? 'team' : messagePayload.token ? 'token' : 'unknown',
})
}
// end of deprecated mechanism

const events: RRWebEvent[] = $snapshot_items.filter((event: any) => {
// we sometimes see events that are null
// there will always be some unexpected data but, we should try to filter out the worst of it
Expand Down
10 changes: 4 additions & 6 deletions plugin-server/tests/main/ingestion-queues/session-recording/fixtures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export function createIncomingRecordingMessage(
// that has properties, and they have $snapshot_data
// that will have data_items, which are the actual snapshots each individually compressed

const message: IncomingRecordingMessage = {
return {
team_id: 1,
distinct_id: 'distinct_id',
session_id: 'session_id_1',
Expand All @@ -33,25 +33,25 @@ export function createIncomingRecordingMessage(
lowOffset: 1,
highOffset: 1,
timestamp: 1,
rawSize: 1,
...partialIncomingMessage.metadata,
...partialMetadata,
},
}

return message
}

export function createKafkaMessage(
token: number | string,
messageOverrides: Partial<Message> = {},
eventProperties: Record<string, any> = {}
): Message {
const message: Message = {
return {
partition: 1,
topic: KAFKA_SESSION_RECORDING_SNAPSHOT_ITEM_EVENTS,
offset: 0,
timestamp: messageOverrides.timestamp ?? Date.now(),
size: 1,
headers: [{ token: token.toString() }],
...messageOverrides,

value: Buffer.from(
Expand All @@ -70,8 +70,6 @@ export function createKafkaMessage(
})
),
}

return message
}

export function createTP(partition: number, topic = KAFKA_SESSION_RECORDING_SNAPSHOT_ITEM_EVENTS) {
Expand Down
12 changes: 7 additions & 5 deletions plugin-server/tests/main/ingestion-queues/session-recording/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,15 @@ describe('session-recording utils', () => {

describe('parsing the message', () => {
it('can parse a message correctly', async () => {
const parsedMessage = await parseKafkaMessage(validMessage('my-distinct-id'), () =>
Promise.resolve({ teamId: 1, consoleLogIngestionEnabled: false })
const parsedMessage = await parseKafkaMessage(
validMessage('my-distinct-id', [{ token: 'something' }]),
() => Promise.resolve({ teamId: 1, consoleLogIngestionEnabled: false })
)
expect(parsedMessage).toMatchSnapshot()
})
it('can handle numeric distinct_ids', async () => {
const numericId = 12345
const parsedMessage = await parseKafkaMessage(validMessage(numericId), () =>
const parsedMessage = await parseKafkaMessage(validMessage(numericId, [{ token: 'something' }]), () =>
Promise.resolve({ teamId: 1, consoleLogIngestionEnabled: false })
)
expect(parsedMessage).toMatchObject({
Expand All @@ -91,6 +92,7 @@ describe('session-recording utils', () => {

const createMessage = ($snapshot_items: unknown[]) => {
return {
headers: [{ token: 'the_token' }],
value: Buffer.from(
JSON.stringify({
uuid: '018a47df-a0f6-7761-8635-439a0aa873bb',
Expand Down Expand Up @@ -191,10 +193,10 @@ describe('session-recording utils', () => {
undefined,
],
[
'calls the team id resolver twice when token is not in header, and is in body',
'does not call the team id resolver when token is not in header, but is in body',
undefined,
'the body token',
['the body token'],
undefined,
],
])('%s', async (_name, headerToken, payloadToken, expectedCalls) => {
await parseKafkaMessage(
Expand Down
Loading