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

[Synthetics] Remove unused sync telemetry #141349

Merged
merged 4 commits into from
Oct 3, 2022
Merged

[Synthetics] Remove unused sync telemetry #141349

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b236c28
remove unused telemetry
shahzad31 Sep 22, 2022
54e16e3
Merge branch 'main' into remove-unused-telemetry
shahzad31 Sep 26, 2022
416e585
Merge branch 'main' into remove-unused-telemetry
shahzad31 Sep 29, 2022
420d917
Merge branch 'main' into remove-unused-telemetry
shahzad31 Oct 3, 2022
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
22 changes: 0 additions & 22 deletions x-pack/plugins/synthetics/server/routes/telemetry/monitor_upgrade_sender.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,8 @@ import {
MONITOR_UPDATE_CHANNEL,
MONITOR_CURRENT_CHANNEL,
MONITOR_ERROR_EVENTS_CHANNEL,
MONITOR_SYNC_STATE_CHANNEL,
MONITOR_SYNC_EVENTS_CHANNEL,
} from '../../legacy_uptime/lib/telemetry/constants';
import { MonitorErrorEvent } from '../../legacy_uptime/lib/telemetry/types';
import { MonitorSyncEvent } from '../../legacy_uptime/lib/telemetry/types';

export interface UpgradeError {
key?: string;
Expand All @@ -50,23 +47,6 @@ export function sendTelemetryEvents(
}
}

export function sendSyncTelemetryEvents(
logger: Logger,
eventsTelemetry: TelemetryEventsSender | undefined,
updateEvent: MonitorSyncEvent
) {
if (eventsTelemetry === undefined) {
return;
}

try {
eventsTelemetry.queueTelemetryEvents(MONITOR_SYNC_STATE_CHANNEL, [updateEvent]);
eventsTelemetry.queueTelemetryEvents(MONITOR_SYNC_EVENTS_CHANNEL, [updateEvent]);
} catch (exc) {
logger.error(`queuing telemetry events failed ${exc}`);
}
}

export function sendErrorTelemetryEvents(
logger: Logger,
eventsTelemetry: TelemetryEventsSender | undefined,
Expand Down Expand Up @@ -180,8 +160,6 @@ export function formatTelemetryDeleteEvent(
});
}

export function formatTelemetrySyncEvent() {}

function getScriptType(
attributes: Partial<MonitorFields>,
isInlineScript: boolean
Expand Down
71 changes: 0 additions & 71 deletions x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ import {
TaskInstance,
} from '@kbn/task-manager-plugin/server';
import { sendErrorTelemetryEvents } from '../routes/telemetry/monitor_upgrade_sender';
import { MonitorSyncEvent } from '../legacy_uptime/lib/telemetry/types';
import { sendSyncTelemetryEvents } from '../routes/telemetry/monitor_upgrade_sender';
import { UptimeServerSetup } from '../legacy_uptime/lib/adapters';
import { installSyntheticsIndexTemplates } from '../routes/synthetics_service/install_index_templates';
import { SyntheticsServiceApiKey } from '../../common/runtime_types/synthetics_service_api_key';
Expand Down Expand Up @@ -317,11 +315,6 @@ export class SyntheticsService {
return null;
}

if (!configs && monitorConfigs.length > 0) {
const telemetry = this.getSyncTelemetry(monitorConfigs);
sendSyncTelemetryEvents(this.logger, this.server.telemetry, telemetry);
}

this.apiKey = await this.getApiKey();

if (!this.apiKey) {
Expand Down Expand Up @@ -490,70 +483,6 @@ export class SyntheticsService {
formatMonitorConfig(Object.keys(config) as ConfigKey[], config as Partial<MonitorFields>)
);
}

getSyncTelemetry(monitors: SyntheticsMonitorWithId[]): MonitorSyncEvent {
let totalRuns = 0;
let browserTestRuns = 0;
let httpTestRuns = 0;
let icmpTestRuns = 0;
let tcpTestRuns = 0;

const locationRuns: Record<string, number> = {};
const locationMonitors: Record<string, number> = {};

const testRunsInDay = (schedule: string) => {
return (24 * 60) / Number(schedule);
};

const monitorsByType: Record<string, number> = {
browser: 0,
http: 0,
tcp: 0,
icmp: 0,
};

monitors.forEach((monitor) => {
if (monitor.schedule.number) {
totalRuns += testRunsInDay(monitor.schedule.number);
}
switch (monitor.type) {
case 'browser':
browserTestRuns += testRunsInDay(monitor.schedule.number);
break;
case 'http':
httpTestRuns += testRunsInDay(monitor.schedule.number);
break;
case 'icmp':
icmpTestRuns += testRunsInDay(monitor.schedule.number);
break;
case 'tcp':
tcpTestRuns += testRunsInDay(monitor.schedule.number);
break;
default:
break;
}

monitorsByType[monitor.type] = (monitorsByType[monitor.type] ?? 0) + 1;

monitor.locations.forEach(({ id }) => {
locationRuns[id + 'Tests'] =
(locationRuns[id + 'Tests'] ?? 0) + testRunsInDay(monitor.schedule.number);
locationMonitors[id + 'Monitors'] = (locationMonitors[id + 'Monitors'] ?? 0) + 1;
});
});

return {
total: monitors.length,
totalTests: totalRuns,
browserTests24h: browserTestRuns,
httpTests24h: httpTestRuns,
icmpTests24h: icmpTestRuns,
tcpTests24h: tcpTestRuns,
...locationRuns,
...locationMonitors,
...monitorsByType,
};
}
}

class IndexTemplateInstallationError extends Error {
Expand Down