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

feat(cdp): Mini purge of old ingesters #29341

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,14 @@ test.concurrent(`liveness check endpoint works`, async () => {
const body = await response.json()
expect(body).toEqual(
expect.objectContaining({
checks: expect.objectContaining({ 'analytics-ingestion': 'ok' }),
checks: expect.objectContaining({
'ingestion-consumer-client_iwarnings_ingestion': 'ok',
'ingestion-consumer-events_plugin_ingestion': 'ok',
'ingestion-consumer-events_plugin_ingestion_historical': 'ok',
'ingestion-consumer-events_plugin_ingestion_overflow': 'ok',
'ingestion-consumer-exceptions_ingestion': 'ok',
'ingestion-consumer-heatmaps_ingestion': 'ok',
}),
})
)
})
Expand Down Expand Up @@ -523,7 +530,7 @@ test.concurrent('consumer updates timestamp exported to prometheus', async () =>
const metricBefore = await getMetric({
name: 'latest_processed_timestamp_ms',
type: 'GAUGE',
labels: { topic: 'events_plugin_ingestion', partition: '0', groupId: 'ingestion' },
labels: { topic: 'events_plugin_ingestion', partition: '0', groupId: 'clickhouse-ingestion' },
})

await capture({ teamId, distinctId, uuid: new UUIDT().toString(), event: 'custom event', properties: {} })
Expand All @@ -532,7 +539,7 @@ test.concurrent('consumer updates timestamp exported to prometheus', async () =>
const metricAfter = await getMetric({
name: 'latest_processed_timestamp_ms',
type: 'GAUGE',
labels: { topic: 'events_plugin_ingestion', partition: '0', groupId: 'ingestion' },
labels: { topic: 'events_plugin_ingestion', partition: '0', groupId: 'clickhouse-ingestion' },
})
expect(metricAfter).toBeGreaterThan(metricBefore)
expect(metricAfter).toBeLessThan(Date.now()) // Make sure, e.g. we're not setting micro seconds
Expand Down
273 changes: 0 additions & 273 deletions plugin-server/functional_tests/session-recordings.test.ts

This file was deleted.

36 changes: 1 addition & 35 deletions plugin-server/src/capabilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,38 +39,6 @@ export function getPluginServerCapabilities(config: PluginsServerConfig): Plugin
ingestionV2: true,
...sharedCapabilities,
}
case PluginServerMode.ingestion:
// NOTE: this mode will be removed in the future and replaced with
// `analytics-ingestion` and `recordings-ingestion` modes.
return {
mmdb: true,
ingestion: true,
...sharedCapabilities,
}
case PluginServerMode.ingestion_overflow:
return {
mmdb: true,
ingestionOverflow: true,
...sharedCapabilities,
}
case PluginServerMode.ingestion_historical:
return {
mmdb: true,
ingestionHistorical: true,
...sharedCapabilities,
}
case PluginServerMode.events_ingestion:
return {
mmdb: true,
eventsIngestionPipelines: true,
...sharedCapabilities,
}
case PluginServerMode.analytics_ingestion:
return {
mmdb: true,
ingestion: true,
...sharedCapabilities,
}
case PluginServerMode.recordings_blob_ingestion:
return {
sessionRecordingBlobIngestion: true,
Expand Down Expand Up @@ -147,9 +115,7 @@ export function getPluginServerCapabilities(config: PluginsServerConfig): Plugin
case PluginServerMode.functional_tests:
return {
mmdb: true,
ingestion: true,
ingestionHistorical: true,
eventsIngestionPipelines: true,
ingestionV2Combined: true,
pluginScheduledTasks: true,
processPluginJobs: true,
processAsyncOnEventHandlers: true,
Expand Down
Loading