Skip to content

Commit

Permalink
[APM] Convert all apm files to follow snake convention (#123648)
Browse files Browse the repository at this point in the history
* [APM] Convert all apm files to follow snake convention

* Fix uppecase filename

* Fix broken paths in api integration tests

* Fix uppercase filenames

* Disable import/no-extraneous-dependencies eslint error
  • Loading branch information
kpatticha committed Jan 28, 2022
1 parent 624a50a commit 69c5cfe
Show file tree
Hide file tree
Showing 244 changed files with 307 additions and 247 deletions.
3 changes: 0 additions & 3 deletions src/dev/precommit_hook/casing_check_config.js
Expand Up @@ -58,9 +58,6 @@ export const IGNORE_FILE_GLOBS = [
// filename must match upstream filenames from lodash
'packages/elastic-safer-lodash-set/**/*',

// TODO fix file names in APM to remove these
'x-pack/plugins/apm/public/**/*',

'x-pack/plugins/maps/server/fonts/**/*',

// Bazel default files
Expand Down
Expand Up @@ -7,7 +7,7 @@
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { FETCH_STATUS } from '../../public/hooks/use_fetcher';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import type { APIReturnType } from '../../public/services/rest/createCallApmApi';
import type { APIReturnType } from '../../public/services/rest/create_call_apm_api';
import { ENVIRONMENT_ALL } from '../environment_filter_values';

export enum AnomalyDetectionSetupState {
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/apm/public/application/application.test.tsx
Expand Up @@ -13,10 +13,10 @@ import { createMemoryHistory } from 'history';
import { Observable } from 'rxjs';
import { AppMountParameters, DocLinksStart, HttpStart } from 'src/core/public';
import { mockApmPluginContextValue } from '../context/apm_plugin/mock_apm_plugin_context';
import { createCallApmApi } from '../services/rest/createCallApmApi';
import { createCallApmApi } from '../services/rest/create_call_apm_api';
import { renderApp as renderApmApp } from './';
import { UXAppRoot } from './uxApp';
import { disableConsoleWarning } from '../utils/testHelpers';
import { UXAppRoot } from './ux_app';
import { disableConsoleWarning } from '../utils/test_helpers';
import { dataPluginMock } from 'src/plugins/data/public/mocks';
import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
import { ApmPluginSetupDeps, ApmPluginStartDeps } from '../plugin';
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/apm/public/application/index.tsx
Expand Up @@ -16,10 +16,10 @@ import {
APP_WRAPPER_CLASS,
} from '../../../../../src/core/public';
import { ApmPluginSetupDeps, ApmPluginStartDeps } from '../plugin';
import { createCallApmApi } from '../services/rest/createCallApmApi';
import { createCallApmApi } from '../services/rest/create_call_apm_api';
import { createStaticDataView } from '../services/rest/data_view';
import { setHelpExtension } from '../setHelpExtension';
import { setReadonlyBadge } from '../updateBadge';
import { setHelpExtension } from '../set_help_extension';
import { setReadonlyBadge } from '../update_badge';
import { ApmAppRoot } from '../components/routing/app_root';
import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';

Expand Down
Expand Up @@ -21,7 +21,7 @@ import {
useUiSetting$,
} from '../../../../../src/plugins/kibana_react/public';
import { APMRouteDefinition } from '../application/routes';
import { ScrollToTopOnPathChange } from '../components/app/main/ScrollToTopOnPathChange';
import { ScrollToTopOnPathChange } from '../components/app/main/scroll_to_top_on_path_change';
import {
RumHome,
DASHBOARD_LABEL,
Expand All @@ -30,7 +30,7 @@ import { ApmPluginContext } from '../context/apm_plugin/apm_plugin_context';
import { UrlParamsProvider } from '../context/url_params_context/url_params_context';
import { ConfigSchema } from '../index';
import { ApmPluginSetupDeps, ApmPluginStartDeps } from '../plugin';
import { createCallApmApi } from '../services/rest/createCallApmApi';
import { createCallApmApi } from '../services/rest/create_call_apm_api';
import { createStaticDataView } from '../services/rest/data_view';
import { UXActionMenu } from '../components/app/rum_dashboard/action_menu';
import { redirectTo } from '../components/routing/redirect_to';
Expand Down
Expand Up @@ -11,7 +11,7 @@ import { RuleParams, ErrorCountAlertTrigger } from '.';
import { CoreStart } from '../../../../../../../src/core/public';
import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
import { createCallApmApi } from '../../../services/rest/createCallApmApi';
import { createCallApmApi } from '../../../services/rest/create_call_apm_api';

import { AlertMetadata } from '../helper';

Expand Down
Expand Up @@ -14,7 +14,7 @@ import { ForLastExpression } from '../../../../../triggers_actions_ui/public';
import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
import { asInteger } from '../../../../common/utils/formatters';
import { useFetcher } from '../../../hooks/use_fetcher';
import { createCallApmApi } from '../../../services/rest/createCallApmApi';
import { createCallApmApi } from '../../../services/rest/create_call_apm_api';
import { ChartPreview } from '../chart_preview';
import { EnvironmentField, IsAboveField, ServiceField } from '../fields';
import { AlertMetadata, getIntervalAndTimeRange, TimeUnit } from '../helper';
Expand Down
Expand Up @@ -8,7 +8,7 @@
import React from 'react';
import { ServiceField, TransactionTypeField } from './fields';
import { render } from '@testing-library/react';
import { expectTextsInDocument } from '../../utils/testHelpers';
import { expectTextsInDocument } from '../../utils/test_helpers';

describe('alerting fields', () => {
describe('Service Field', () => {
Expand Down
Expand Up @@ -15,7 +15,7 @@ import { ForLastExpression } from '../../../../../triggers_actions_ui/public';
import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
import { getDurationFormatter } from '../../../../common/utils/formatters';
import { useFetcher } from '../../../hooks/use_fetcher';
import { createCallApmApi } from '../../../services/rest/createCallApmApi';
import { createCallApmApi } from '../../../services/rest/create_call_apm_api';
import {
getMaxY,
getResponseTimeTickFormatter,
Expand Down
Expand Up @@ -12,7 +12,7 @@ import { CoreStart } from '../../../../../../../src/core/public';
import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
import { ANOMALY_SEVERITY } from '../../../../common/ml_constants';
import { createCallApmApi } from '../../../services/rest/createCallApmApi';
import { createCallApmApi } from '../../../services/rest/create_call_apm_api';
import {
EnvironmentField,
ServiceField,
Expand Down
Expand Up @@ -13,7 +13,7 @@ import { ForLastExpression } from '../../../../../triggers_actions_ui/public';
import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
import { asPercent } from '../../../../common/utils/formatters';
import { useFetcher } from '../../../hooks/use_fetcher';
import { createCallApmApi } from '../../../services/rest/createCallApmApi';
import { createCallApmApi } from '../../../services/rest/create_call_apm_api';
import { ChartPreview } from '../chart_preview';
import {
EnvironmentField,
Expand Down
Expand Up @@ -34,7 +34,7 @@ import { FailedTransactionsCorrelation } from '../../../../common/correlations/f
import { FieldStats } from '../../../../common/correlations/field_stats_types';

import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
import { useLocalStorage } from '../../../hooks/useLocalStorage';
import { useLocalStorage } from '../../../hooks/use_local_storage';
import { FETCH_STATUS } from '../../../hooks/use_fetcher';
import { useTheme } from '../../../hooks/use_theme';

Expand Down
Expand Up @@ -15,7 +15,7 @@ import {
mockApmPluginContextValue,
MockApmPluginContextWrapper,
} from '../../../context/apm_plugin/mock_apm_plugin_context';
import { delay } from '../../../utils/testHelpers';
import { delay } from '../../../utils/test_helpers';

import { fromQuery } from '../../shared/links/url_helpers';

Expand Down
Expand Up @@ -21,7 +21,7 @@ import type {
FailedTransactionsCorrelationsResponse,
} from '../../../../common/correlations/failed_transactions_correlations/types';

import { callApmApi } from '../../../services/rest/createCallApmApi';
import { callApmApi } from '../../../services/rest/create_call_apm_api';

import {
getInitialResponse,
Expand Down
Expand Up @@ -15,7 +15,7 @@ import {
mockApmPluginContextValue,
MockApmPluginContextWrapper,
} from '../../../context/apm_plugin/mock_apm_plugin_context';
import { delay } from '../../../utils/testHelpers';
import { delay } from '../../../utils/test_helpers';

import { fromQuery } from '../../shared/links/url_helpers';

Expand Down
Expand Up @@ -21,7 +21,7 @@ import type {
LatencyCorrelationsResponse,
} from '../../../../common/correlations/latency_correlations/types';

import { callApmApi } from '../../../services/rest/createCallApmApi';
import { callApmApi } from '../../../services/rest/create_call_apm_api';

import {
getInitialResponse,
Expand Down
Expand Up @@ -7,7 +7,7 @@

import { shallow } from 'enzyme';
import React from 'react';
import { mockMoment } from '../../../../utils/testHelpers';
import { mockMoment } from '../../../../utils/test_helpers';
import { DetailView } from './index';

describe('DetailView', () => {
Expand Down
Expand Up @@ -20,7 +20,7 @@ import { first } from 'lodash';
import React from 'react';
import { useHistory } from 'react-router-dom';
import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
import type { APIReturnType } from '../../../../services/rest/createCallApmApi';
import type { APIReturnType } from '../../../../services/rest/create_call_apm_api';
import type { APMError } from '../../../../../typings/es_schemas/ui/apm_error';
import type { ApmUrlParams } from '../../../../context/url_params_context/types';
import { TransactionDetailLink } from '../../../shared/links/apm/transaction_detail_link';
Expand All @@ -37,7 +37,7 @@ import {
exceptionStacktraceTab,
getTabs,
logStacktraceTab,
} from './ErrorTabs';
} from './error_tabs';
import { ExceptionStacktrace } from './exception_stacktrace';

const HeaderContainer = euiStyled.div`
Expand Down
Expand Up @@ -15,7 +15,7 @@ import { ErrorDistribution } from './';
import { FETCH_STATUS } from '../../../../hooks/use_fetcher';

export default {
title: 'app/ErrorGroupDetails/Distribution',
title: 'app/ErrorGroupDetails/distribution',
component: ErrorDistribution,
decorators: [
(Story: ComponentType) => {
Expand Down
Expand Up @@ -19,7 +19,7 @@ import React, { Suspense, useState } from 'react';
import { ALERT_RULE_TYPE_ID } from '@kbn/rule-data-utils';
import { i18n } from '@kbn/i18n';
import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context';
import { APIReturnType } from '../../../../services/rest/createCallApmApi';
import { APIReturnType } from '../../../../services/rest/create_call_apm_api';
import { useTheme } from '../../../../hooks/use_theme';
import { FETCH_STATUS } from '../../../../hooks/use_fetcher';
import { AlertType } from '../../../../../common/alert_types';
Expand Down
Expand Up @@ -26,9 +26,9 @@ import { useApmRouter } from '../../../hooks/use_apm_router';
import { useErrorGroupDistributionFetcher } from '../../../hooks/use_error_group_distribution_fetcher';
import { useFetcher } from '../../../hooks/use_fetcher';
import { useTimeRange } from '../../../hooks/use_time_range';
import type { APIReturnType } from '../../../services/rest/createCallApmApi';
import type { APIReturnType } from '../../../services/rest/create_call_apm_api';
import { DetailView } from './detail_view';
import { ErrorDistribution } from './Distribution';
import { ErrorDistribution } from './distribution';

const Titles = euiStyled.div`
margin-bottom: ${({ theme }) => theme.eui.euiSizeL};
Expand Down
Expand Up @@ -17,7 +17,7 @@ import { asInteger } from '../../../../../common/utils/formatters';
import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
import { NOT_AVAILABLE_LABEL } from '../../../../../common/i18n';
import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
import { APIReturnType } from '../../../../services/rest/createCallApmApi';
import { APIReturnType } from '../../../../services/rest/create_call_apm_api';
import { truncate, unit } from '../../../../utils/style';
import { ErrorDetailLink } from '../../../shared/links/apm/error_detail_link';
import { ErrorOverviewLink } from '../../../shared/links/apm/error_overview_link';
Expand Down
Expand Up @@ -21,10 +21,10 @@ import { useApmParams } from '../../../hooks/use_apm_params';
import { useErrorGroupDistributionFetcher } from '../../../hooks/use_error_group_distribution_fetcher';
import { useFetcher } from '../../../hooks/use_fetcher';
import { useTimeRange } from '../../../hooks/use_time_range';
import { APIReturnType } from '../../../services/rest/createCallApmApi';
import { APIReturnType } from '../../../services/rest/create_call_apm_api';
import { FailedTransactionRateChart } from '../../shared/charts/failed_transaction_rate_chart';
import { getTimeRangeComparison } from '../../shared/time_comparison/get_time_range_comparison';
import { ErrorDistribution } from '../error_group_details/Distribution';
import { ErrorDistribution } from '../error_group_details/distribution';
import { ErrorGroupList } from './error_group_list';

type ErrorGroupMainStatistics =
Expand Down
Expand Up @@ -6,7 +6,7 @@
*/

import { useMemo } from 'react';
import { callApi } from '../../../../services/rest/callApi';
import { callApi } from '../../../../services/rest/call_api';
import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
import { FetchOptions } from '../../../../../common/fetch_options';

Expand Down
Expand Up @@ -11,9 +11,9 @@ import {
UxFetchDataResponse,
UXHasDataResponse,
} from '../../../../../observability/public/';
import { callApmApi } from '../../../services/rest/createCallApmApi';
import { callApmApi } from '../../../services/rest/create_call_apm_api';

export { createCallApmApi } from '../../../services/rest/createCallApmApi';
export { createCallApmApi } from '../../../services/rest/create_call_apm_api';

export const fetchUxOverviewDate = async ({
absoluteTime,
Expand Down
Expand Up @@ -18,7 +18,7 @@ import { toMountPoint } from '../../../../../../../src/plugins/kibana_react/publ
import { useAnomalyDetectionJobsContext } from '../../../context/anomaly_detection_jobs/use_anomaly_detection_jobs_context';
import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
import { useLegacyUrlParams } from '../../../context/url_params_context/use_url_params';
import { useLocalStorage } from '../../../hooks/useLocalStorage';
import { useLocalStorage } from '../../../hooks/use_local_storage';
import { useAnyOfApmParams } from '../../../hooks/use_apm_params';
import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
import { useTimeRange } from '../../../hooks/use_time_range';
Expand Down
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { APIReturnType } from '../../../../../services/rest/createCallApmApi';
import { APIReturnType } from '../../../../../services/rest/create_call_apm_api';

type ServiceListAPIResponse = APIReturnType<'GET /internal/apm/services'>;

Expand Down
Expand Up @@ -32,7 +32,7 @@ import {
import { useApmParams } from '../../../../hooks/use_apm_params';
import { Breakpoints, useBreakpoints } from '../../../../hooks/use_breakpoints';
import { useFallbackToTransactionsFetcher } from '../../../../hooks/use_fallback_to_transactions_fetcher';
import { APIReturnType } from '../../../../services/rest/createCallApmApi';
import { APIReturnType } from '../../../../services/rest/create_call_apm_api';
import { unit } from '../../../../utils/style';
import { ApmRoutes } from '../../../routing/apm_route_config';
import { AggregatedTransactionsBadge } from '../../../shared/aggregated_transactions_badge';
Expand All @@ -41,11 +41,11 @@ import { ListMetric } from '../../../shared/list_metric';
import { ITableColumn, ManagedTable } from '../../../shared/managed_table';
import { ServiceLink } from '../../../shared/service_link';
import { TruncateWithTooltip } from '../../../shared/truncate_with_tooltip';
import { HealthBadge } from './HealthBadge';
import {
ChartType,
getTimeSeriesColor,
} from '../../../shared/charts/helper/get_timeseries_color';
import { HealthBadge } from './health_badge';

type ServiceListAPIResponse = APIReturnType<'GET /internal/apm/services'>;
type Items = ServiceListAPIResponse['items'];
Expand Down
Expand Up @@ -13,7 +13,7 @@ import moment from 'moment';
import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
import { LogStream } from '../../../../../infra/public';
import { APIReturnType } from '../../../services/rest/createCallApmApi';
import { APIReturnType } from '../../../services/rest/create_call_apm_api';

import {
CONTAINER_ID,
Expand Down
Expand Up @@ -6,7 +6,7 @@
*/

import { useContext, useEffect } from 'react';
import { CytoscapeContext } from '../Cytoscape';
import { CytoscapeContext } from '../cytoscape';

// Component to center map on load
export function Centerer() {
Expand Down
Expand Up @@ -7,11 +7,11 @@

import cytoscape from 'cytoscape';
import React from 'react';
import { Cytoscape } from '../Cytoscape';
import { Cytoscape } from '../cytoscape';
import { Centerer } from './centerer';

export default {
title: 'app/ServiceMap/Cytoscape',
title: 'app/ServiceMap/cytoscape',
component: Cytoscape,
};

Expand Down
Expand Up @@ -22,7 +22,7 @@ import {
CodeEditor,
createKibanaReactContext,
} from '../../../../../../../../src/plugins/kibana_react/public';
import { Cytoscape } from '../Cytoscape';
import { Cytoscape } from '../cytoscape';
import { Centerer } from './centerer';
import exampleResponseHipsterStore from './example_response_hipster_store.json';
import exampleResponseOpbeansBeats from './example_response_opbeans_beats.json';
Expand Down
Expand Up @@ -12,8 +12,8 @@ import React, { ReactNode } from 'react';
import { MemoryRouter } from 'react-router-dom';
import { ThemeContext } from 'styled-components';
import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
import { Controls } from './Controls';
import { CytoscapeContext } from './Cytoscape';
import { Controls } from './controls';
import { CytoscapeContext } from './cytoscape';

const cy = cytoscape({
elements: [{ classes: 'primary', data: { id: 'test node' } }],
Expand Down
Expand Up @@ -14,7 +14,7 @@ import { useTheme } from '../../../hooks/use_theme';
import { getLegacyApmHref } from '../../shared/links/apm/apm_link';
import { useLegacyUrlParams } from '../../../context/url_params_context/use_url_params';
import { APMQueryParams } from '../../shared/links/url_helpers';
import { CytoscapeContext } from './Cytoscape';
import { CytoscapeContext } from './cytoscape';
import { getAnimationOptions, getNodeHeight } from './cytoscape_options';
import { useAnyOfApmParams } from '../../../hooks/use_apm_params';

Expand Down
Expand Up @@ -10,9 +10,9 @@ import cytoscape from 'cytoscape';
import React, { ReactNode } from 'react';
import { MemoryRouter } from 'react-router-dom';
import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
import { renderWithTheme } from '../../../utils/testHelpers';
import { CytoscapeContext } from './Cytoscape';
import { EmptyBanner } from './EmptyBanner';
import { renderWithTheme } from '../../../utils/test_helpers';
import { CytoscapeContext } from './cytoscape';
import { EmptyBanner } from './empty_banner';

const cy = cytoscape({});

Expand Down
Expand Up @@ -9,7 +9,7 @@ import React, { useContext, useEffect, useState } from 'react';
import { EuiCallOut, EuiLink } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
import { CytoscapeContext } from './Cytoscape';
import { CytoscapeContext } from './cytoscape';
import { useTheme } from '../../../hooks/use_theme';
import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';

Expand Down

0 comments on commit 69c5cfe

Please sign in to comment.