diff --git a/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md b/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md index d5ba98c06ef027..be28cd76b16ee9 100644 --- a/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md +++ b/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md @@ -10,10 +10,10 @@ Set of helpers used to create `KibanaResponse` to form HTTP response on an incom ```typescript kibanaResponseFactory: { - custom: | Error | Buffer | Stream | { + custom: | Error | Buffer | { message: string | Error; attributes?: ResponseErrorAttributes | undefined; - } | undefined>(options: CustomHttpResponseOptions) => KibanaResponse; + } | Stream | undefined>(options: CustomHttpResponseOptions) => KibanaResponse; badRequest: (options?: ErrorHttpResponseOptions) => KibanaResponse; - customError: (options: CustomHttpResponseOptions) => KibanaResponse) => KibanaResponse; + } | Stream>; redirected: (options: RedirectResponseOptions) => KibanaResponse | Buffer | Stream>; ok: (options?: HttpResponseOptions) => KibanaResponse | Buffer | Stream>; accepted: (options?: HttpResponseOptions) => KibanaResponse | Buffer | Stream>; diff --git a/src/core/server/capabilities/capabilities_service.ts b/src/core/server/capabilities/capabilities_service.ts index 1166c8f6b48c4d..7788acd5cc9e86 100644 --- a/src/core/server/capabilities/capabilities_service.ts +++ b/src/core/server/capabilities/capabilities_service.ts @@ -6,9 +6,9 @@ * Side Public License, v 1. */ +import { Logger } from '@kbn/logging'; import { Capabilities, CapabilitiesProvider, CapabilitiesSwitcher } from './types'; import { CoreContext } from '../core_context'; -import { Logger } from '../logging'; import { InternalHttpServicePreboot, InternalHttpServiceSetup, KibanaRequest } from '../http'; import { mergeCapabilities } from './merge_capabilities'; import { getCapabilitiesResolver, CapabilitiesResolver } from './resolve_capabilities'; diff --git a/src/core/server/core_app/core_app.ts b/src/core/server/core_app/core_app.ts index 28c52775b2d20a..d51dfb10e57700 100644 --- a/src/core/server/core_app/core_app.ts +++ b/src/core/server/core_app/core_app.ts @@ -11,12 +11,12 @@ import { stringify } from 'querystring'; import { Env } from '@kbn/config'; import { schema } from '@kbn/config-schema'; import { fromRoot } from '@kbn/utils'; +import { Logger } from '@kbn/logging'; import { IRouter, IBasePath, IKibanaResponse, KibanaResponseFactory, KibanaRequest } from '../http'; import { HttpResources, HttpResourcesServiceToolkit } from '../http_resources'; import { InternalCorePreboot, InternalCoreSetup } from '../internal_types'; import { CoreContext } from '../core_context'; -import { Logger } from '../logging'; import { registerBundleRoutes } from './bundle_routes'; import { UiPlugins } from '../plugins'; diff --git a/src/core/server/core_context.ts b/src/core/server/core_context.ts index 36d14882ec731e..7b015d3c9fdabf 100644 --- a/src/core/server/core_context.ts +++ b/src/core/server/core_context.ts @@ -6,8 +6,8 @@ * Side Public License, v 1. */ +import { LoggerFactory } from '@kbn/logging'; import { IConfigService, Env } from './config'; -import { LoggerFactory } from './logging'; /** @internal */ export type CoreId = symbol; diff --git a/src/core/server/deprecations/deprecations_factory.test.ts b/src/core/server/deprecations/deprecations_factory.test.ts index 9a67c6dc36dd26..b05a3ea3ce4dcf 100644 --- a/src/core/server/deprecations/deprecations_factory.test.ts +++ b/src/core/server/deprecations/deprecations_factory.test.ts @@ -8,7 +8,7 @@ import type { GetDeprecationsContext } from './types'; import { DeprecationsFactory, DeprecationsFactoryConfig } from './deprecations_factory'; -import { loggerMock } from '../logging/logger.mock'; +import { loggerMock } from '@kbn/logging-mocks'; import { DeprecationsDetails } from './types'; describe('DeprecationsFactory', () => { diff --git a/src/core/server/deprecations/deprecations_factory.ts b/src/core/server/deprecations/deprecations_factory.ts index ad28af2db528e5..d36d61fa2eab20 100644 --- a/src/core/server/deprecations/deprecations_factory.ts +++ b/src/core/server/deprecations/deprecations_factory.ts @@ -7,8 +7,8 @@ */ import { i18n } from '@kbn/i18n'; +import type { Logger } from '@kbn/logging'; import { DeprecationsRegistry } from './deprecations_registry'; -import type { Logger } from '../logging'; import type { DomainDeprecationDetails, DeprecationsDetails, diff --git a/src/core/server/deprecations/deprecations_service.ts b/src/core/server/deprecations/deprecations_service.ts index 7d7af552f08df2..b93c8cda748e59 100644 --- a/src/core/server/deprecations/deprecations_service.ts +++ b/src/core/server/deprecations/deprecations_service.ts @@ -8,6 +8,7 @@ import { firstValueFrom } from 'rxjs'; +import type { Logger } from '@kbn/logging'; import { DeprecationsFactory } from './deprecations_factory'; import { DomainDeprecationDetails, RegisterDeprecationsConfig } from './types'; import { registerRoutes } from './routes'; @@ -16,7 +17,6 @@ import { CoreContext } from '../core_context'; import { IConfigService } from '../config'; import { CoreService } from '../../types'; import { InternalHttpServiceSetup } from '../http'; -import { Logger } from '../logging'; import { IScopedClusterClient } from '../elasticsearch/client'; import { SavedObjectsClientContract } from '../saved_objects/types'; diff --git a/src/core/server/elasticsearch/client/cluster_client.ts b/src/core/server/elasticsearch/client/cluster_client.ts index 038fe109b39884..5e185caa6566ec 100644 --- a/src/core/server/elasticsearch/client/cluster_client.ts +++ b/src/core/server/elasticsearch/client/cluster_client.ts @@ -7,7 +7,7 @@ */ import type { Client } from '@elastic/elasticsearch'; -import { Logger } from '../../logging'; +import type { Logger } from '@kbn/logging'; import { IAuthHeadersStorage, Headers, isKibanaRequest, isRealRequest } from '../../http'; import { ensureRawRequest, filterHeaders } from '../../http/router'; import { ScopeableRequest } from '../types'; diff --git a/src/core/server/elasticsearch/client/configure_client.ts b/src/core/server/elasticsearch/client/configure_client.ts index e1e4a1846852bd..020f3d66a42a5e 100644 --- a/src/core/server/elasticsearch/client/configure_client.ts +++ b/src/core/server/elasticsearch/client/configure_client.ts @@ -7,7 +7,7 @@ */ import { Client, HttpConnection } from '@elastic/elasticsearch'; -import { Logger } from '../../logging'; +import type { Logger } from '@kbn/logging'; import { parseClientOptions, ElasticsearchClientConfig } from './client_config'; import { instrumentEsQueryAndDeprecationLogger } from './log_query_and_deprecation'; import { createTransport } from './create_transport'; diff --git a/src/core/server/elasticsearch/client/log_query_and_deprecation.ts b/src/core/server/elasticsearch/client/log_query_and_deprecation.ts index e371f9f25ad818..578c887d804f33 100644 --- a/src/core/server/elasticsearch/client/log_query_and_deprecation.ts +++ b/src/core/server/elasticsearch/client/log_query_and_deprecation.ts @@ -10,9 +10,9 @@ import { Buffer } from 'buffer'; import { stringify } from 'querystring'; import { errors, DiagnosticResult, RequestBody, Client } from '@elastic/elasticsearch'; import numeral from '@elastic/numeral'; +import type { Logger } from '@kbn/logging'; import type { ElasticsearchErrorDetails } from './types'; import { getEcsResponseLog } from './get_ecs_response_log'; -import { Logger } from '../../logging'; const convertQueryString = (qs: string | Record | undefined): string => { if (qs === undefined || typeof qs === 'string') { diff --git a/src/core/server/elasticsearch/client/retry_call_cluster.ts b/src/core/server/elasticsearch/client/retry_call_cluster.ts index 0f90abfb04f30e..b3d5c69cec155d 100644 --- a/src/core/server/elasticsearch/client/retry_call_cluster.ts +++ b/src/core/server/elasticsearch/client/retry_call_cluster.ts @@ -8,7 +8,7 @@ import { defer, throwError, iif, timer } from 'rxjs'; import { concatMap, retryWhen } from 'rxjs/operators'; -import { Logger } from '../../logging'; +import type { Logger } from '@kbn/logging'; const retryResponseStatuses = [ 503, // ServiceUnavailable diff --git a/src/core/server/elasticsearch/elasticsearch_service.ts b/src/core/server/elasticsearch/elasticsearch_service.ts index 09e8b3172c8e75..7926b6bb8ca436 100644 --- a/src/core/server/elasticsearch/elasticsearch_service.ts +++ b/src/core/server/elasticsearch/elasticsearch_service.ts @@ -9,11 +9,11 @@ import { firstValueFrom, Observable, Subject } from 'rxjs'; import { map, shareReplay, takeUntil } from 'rxjs/operators'; +import type { Logger } from '@kbn/logging'; import { registerAnalyticsContextProvider } from './register_analytics_context_provider'; import { AnalyticsServiceSetup } from '../analytics'; import { CoreService } from '../../types'; import { CoreContext } from '../core_context'; -import { Logger } from '../logging'; import { ClusterClient, ElasticsearchClientConfig } from './client'; import { ElasticsearchConfig, ElasticsearchConfigType } from './elasticsearch_config'; diff --git a/src/core/server/elasticsearch/version_check/ensure_es_version.ts b/src/core/server/elasticsearch/version_check/ensure_es_version.ts index 5a1856b35acd62..7ef52dec337327 100644 --- a/src/core/server/elasticsearch/version_check/ensure_es_version.ts +++ b/src/core/server/elasticsearch/version_check/ensure_es_version.ts @@ -13,11 +13,11 @@ import { timer, of, from, Observable } from 'rxjs'; import { map, distinctUntilChanged, catchError, exhaustMap } from 'rxjs/operators'; +import type { Logger } from '@kbn/logging'; import { esVersionCompatibleWithKibana, esVersionEqualsKibana, } from './es_kibana_version_compatability'; -import { Logger } from '../../logging'; import type { ElasticsearchClient } from '../client'; /** @public */ diff --git a/src/core/server/environment/create_data_folder.ts b/src/core/server/environment/create_data_folder.ts index c3ba1f4e597cd4..a9b0a00e83d19b 100644 --- a/src/core/server/environment/create_data_folder.ts +++ b/src/core/server/environment/create_data_folder.ts @@ -7,8 +7,8 @@ */ import { PathConfigType } from '@kbn/utils'; +import type { Logger } from '@kbn/logging'; import { mkdir } from './fs'; -import { Logger } from '../logging'; export async function createDataFolder({ pathConfig, diff --git a/src/core/server/environment/environment_service.ts b/src/core/server/environment/environment_service.ts index 28e2da446eb958..98d01e0bcbbe38 100644 --- a/src/core/server/environment/environment_service.ts +++ b/src/core/server/environment/environment_service.ts @@ -8,9 +8,9 @@ import { firstValueFrom, of } from 'rxjs'; import { PathConfigType, config as pathConfigDef } from '@kbn/utils'; +import type { Logger } from '@kbn/logging'; import type { AnalyticsServicePreboot } from '../analytics'; import { CoreContext } from '../core_context'; -import { Logger } from '../logging'; import { IConfigService } from '../config'; import { HttpConfigType, config as httpConfigDef } from '../http'; import { PidConfigType, config as pidConfigDef } from './pid_config'; diff --git a/src/core/server/environment/resolve_uuid.ts b/src/core/server/environment/resolve_uuid.ts index c4ad3e32cfadac..bf9e15c0259e5a 100644 --- a/src/core/server/environment/resolve_uuid.ts +++ b/src/core/server/environment/resolve_uuid.ts @@ -9,9 +9,9 @@ import uuid from 'uuid'; import { join } from 'path'; import { PathConfigType } from '@kbn/utils'; +import type { Logger } from '@kbn/logging'; import { readFile, writeFile } from './fs'; import { HttpConfigType } from '../http'; -import { Logger } from '../logging'; import { uuidRegexp } from '../http/http_config'; const FILE_ENCODING = 'utf8'; diff --git a/src/core/server/environment/write_pid_file.ts b/src/core/server/environment/write_pid_file.ts index 46096ca347e8a1..f3dcb13417d240 100644 --- a/src/core/server/environment/write_pid_file.ts +++ b/src/core/server/environment/write_pid_file.ts @@ -8,7 +8,7 @@ import { unlinkSync as unlink } from 'fs'; import once from 'lodash/once'; -import { Logger } from '../logging'; +import type { Logger } from '@kbn/logging'; import { writeFile, exists } from './fs'; import { PidConfigType } from './pid_config'; diff --git a/src/core/server/execution_context/execution_context_service.ts b/src/core/server/execution_context/execution_context_service.ts index 03ae2cb36c9ec2..9e307280def9d0 100644 --- a/src/core/server/execution_context/execution_context_service.ts +++ b/src/core/server/execution_context/execution_context_service.ts @@ -10,9 +10,9 @@ import apm from 'elastic-apm-node'; import { isUndefined, omitBy } from 'lodash'; import type { Subscription } from 'rxjs'; +import type { Logger } from '@kbn/logging'; import type { CoreService, KibanaExecutionContext } from '../../types'; import type { CoreContext } from '../core_context'; -import type { Logger } from '../logging'; import type { ExecutionContextConfigType } from './execution_context_config'; import { diff --git a/src/core/server/http/http_server.ts b/src/core/server/http/http_server.ts index bc9b3f41bfe193..fe714e6c97dea3 100644 --- a/src/core/server/http/http_server.ts +++ b/src/core/server/http/http_server.ts @@ -22,7 +22,7 @@ import type { Duration } from 'moment'; import { firstValueFrom, Observable } from 'rxjs'; import { take } from 'rxjs/operators'; import apm from 'elastic-apm-node'; -import { Logger, LoggerFactory } from '../logging'; +import type { Logger, LoggerFactory } from '@kbn/logging'; import { HttpConfig } from './http_config'; import type { InternalExecutionContextSetup } from '../execution_context'; import { adoptToHapiAuthFormat, AuthenticationHandler } from './lifecycle/auth'; diff --git a/src/core/server/http/http_service.ts b/src/core/server/http/http_service.ts index 3e238755eb398c..8ed34dbbb645f6 100644 --- a/src/core/server/http/http_service.ts +++ b/src/core/server/http/http_service.ts @@ -10,10 +10,10 @@ import { Observable, Subscription, combineLatest, firstValueFrom } from 'rxjs'; import { map } from 'rxjs/operators'; import { pick } from '@kbn/std'; +import type { Logger } from '@kbn/logging'; import type { RequestHandlerContext } from '..'; import type { InternalExecutionContextSetup } from '../execution_context'; import { CoreService } from '../../types'; -import { Logger } from '../logging'; import { ContextSetup, InternalContextPreboot } from '../context'; import { Env } from '../config'; import { CoreContext } from '../core_context'; diff --git a/src/core/server/http/https_redirect_server.ts b/src/core/server/http/https_redirect_server.ts index 28909c0308c223..501c83377fe0a4 100644 --- a/src/core/server/http/https_redirect_server.ts +++ b/src/core/server/http/https_redirect_server.ts @@ -9,8 +9,8 @@ import { Request, ResponseToolkit, Server } from '@hapi/hapi'; import { format as formatUrl } from 'url'; import { createServer, getListenerOptions, getServerOptions } from '@kbn/server-http-tools'; +import type { Logger } from '@kbn/logging'; -import { Logger } from '../logging'; import { HttpConfig } from './http_config'; export class HttpsRedirectServer { diff --git a/src/core/server/http/lifecycle/auth.ts b/src/core/server/http/lifecycle/auth.ts index 167cf0747b4c12..dc220d5e4968af 100644 --- a/src/core/server/http/lifecycle/auth.ts +++ b/src/core/server/http/lifecycle/auth.ts @@ -7,7 +7,7 @@ */ import { Lifecycle, Request, ResponseToolkit } from '@hapi/hapi'; -import { Logger } from '../../logging'; +import type { Logger } from '@kbn/logging'; import { HapiResponseAdapter, KibanaRequest, diff --git a/src/core/server/http/lifecycle/on_post_auth.ts b/src/core/server/http/lifecycle/on_post_auth.ts index 22ceb8853a89f8..02c4bf74bfe3c1 100644 --- a/src/core/server/http/lifecycle/on_post_auth.ts +++ b/src/core/server/http/lifecycle/on_post_auth.ts @@ -7,7 +7,7 @@ */ import { Lifecycle, Request, ResponseToolkit as HapiResponseToolkit } from '@hapi/hapi'; -import { Logger } from '../../logging'; +import type { Logger } from '@kbn/logging'; import { HapiResponseAdapter, KibanaRequest, diff --git a/src/core/server/http/lifecycle/on_pre_auth.ts b/src/core/server/http/lifecycle/on_pre_auth.ts index d0ae40c7fb2d48..34977c90bb0745 100644 --- a/src/core/server/http/lifecycle/on_pre_auth.ts +++ b/src/core/server/http/lifecycle/on_pre_auth.ts @@ -7,7 +7,7 @@ */ import { Lifecycle, Request, ResponseToolkit as HapiResponseToolkit } from '@hapi/hapi'; -import { Logger } from '../../logging'; +import type { Logger } from '@kbn/logging'; import { HapiResponseAdapter, KibanaRequest, diff --git a/src/core/server/http/lifecycle/on_pre_response.ts b/src/core/server/http/lifecycle/on_pre_response.ts index 0892c5c061e0bb..33103bf5e05158 100644 --- a/src/core/server/http/lifecycle/on_pre_response.ts +++ b/src/core/server/http/lifecycle/on_pre_response.ts @@ -13,7 +13,7 @@ import { ResponseToolkit as HapiResponseToolkit, } from '@hapi/hapi'; import Boom from '@hapi/boom'; -import { Logger } from '../../logging'; +import type { Logger } from '@kbn/logging'; import { HapiResponseAdapter, KibanaRequest, ResponseHeaders } from '../router'; diff --git a/src/core/server/http/lifecycle/on_pre_routing.ts b/src/core/server/http/lifecycle/on_pre_routing.ts index be0af8c118627f..4a88eb01b6f28f 100644 --- a/src/core/server/http/lifecycle/on_pre_routing.ts +++ b/src/core/server/http/lifecycle/on_pre_routing.ts @@ -7,7 +7,7 @@ */ import { Lifecycle, Request, ResponseToolkit as HapiResponseToolkit } from '@hapi/hapi'; -import { Logger } from '../../logging'; +import type { Logger } from '@kbn/logging'; import { HapiResponseAdapter, KibanaRequest, diff --git a/src/core/server/http/logging/get_payload_size.test.ts b/src/core/server/http/logging/get_payload_size.test.ts index 36ef2e9c8e5a03..0b64a597ba0d99 100644 --- a/src/core/server/http/logging/get_payload_size.test.ts +++ b/src/core/server/http/logging/get_payload_size.test.ts @@ -14,7 +14,7 @@ import { createReadStream } from 'fs'; import { PassThrough } from 'stream'; import { createGunzip, createGzip } from 'zlib'; -import { loggerMock, MockedLogger } from '../../logging/logger.mock'; +import { loggerMock, MockedLogger } from '@kbn/logging-mocks'; import { getResponsePayloadBytes } from './get_payload_size'; diff --git a/src/core/server/http/logging/get_payload_size.ts b/src/core/server/http/logging/get_payload_size.ts index 2797b4ba9f490e..889f38fe84940e 100644 --- a/src/core/server/http/logging/get_payload_size.ts +++ b/src/core/server/http/logging/get_payload_size.ts @@ -11,7 +11,7 @@ import { ReadStream } from 'fs'; import { Zlib } from 'zlib'; import { isBoom } from '@hapi/boom'; import type { Request } from '@hapi/hapi'; -import { Logger } from '../../logging'; +import type { Logger } from '@kbn/logging'; type Response = Request['response']; diff --git a/src/core/server/http/logging/get_response_log.test.ts b/src/core/server/http/logging/get_response_log.test.ts index 4e749e9b6c8e0c..386bf2a263934a 100644 --- a/src/core/server/http/logging/get_response_log.test.ts +++ b/src/core/server/http/logging/get_response_log.test.ts @@ -8,7 +8,7 @@ import type { Request } from '@hapi/hapi'; import Boom from '@hapi/boom'; -import { loggerMock, MockedLogger } from '../../logging/logger.mock'; +import { loggerMock, MockedLogger } from '@kbn/logging-mocks'; import { getEcsResponseLog } from './get_response_log'; jest.mock('./get_payload_size', () => ({ diff --git a/src/core/server/http/logging/get_response_log.ts b/src/core/server/http/logging/get_response_log.ts index e65871c1b1f11c..6a0d96cb648ff7 100644 --- a/src/core/server/http/logging/get_response_log.ts +++ b/src/core/server/http/logging/get_response_log.ts @@ -10,8 +10,7 @@ import querystring from 'querystring'; import { isBoom } from '@hapi/boom'; import type { Request } from '@hapi/hapi'; import numeral from '@elastic/numeral'; -import { LogMeta } from '@kbn/logging'; -import { Logger } from '../../logging'; +import type { LogMeta, Logger } from '@kbn/logging'; import { getResponsePayloadBytes } from './get_payload_size'; import type { KibanaRequestState } from '../router'; diff --git a/src/core/server/http/router/router.ts b/src/core/server/http/router/router.ts index 26cd28bd3d536d..feca3cbebccf50 100644 --- a/src/core/server/http/router/router.ts +++ b/src/core/server/http/router/router.ts @@ -10,7 +10,7 @@ import { Request, ResponseObject, ResponseToolkit } from '@hapi/hapi'; import Boom from '@hapi/boom'; import { isConfigSchema } from '@kbn/config-schema'; -import { Logger } from '../../logging'; +import type { Logger } from '@kbn/logging'; import { isUnauthorizedError as isElasticsearchUnauthorizedError, UnauthorizedError as EsNotAuthorizedError, diff --git a/src/core/server/http_resources/http_resources_service.ts b/src/core/server/http_resources/http_resources_service.ts index 2d49cb17cf4c07..a74d19683611a6 100644 --- a/src/core/server/http_resources/http_resources_service.ts +++ b/src/core/server/http_resources/http_resources_service.ts @@ -6,6 +6,7 @@ * Side Public License, v 1. */ +import type { Logger } from '@kbn/logging'; import { RequestHandlerContext } from '..'; import { CoreContext } from '../core_context'; @@ -18,7 +19,6 @@ import { InternalHttpServicePreboot, } from '../http'; -import { Logger } from '../logging'; import { InternalRenderingServicePreboot, InternalRenderingServiceSetup } from '../rendering'; import { CoreService } from '../../types'; diff --git a/src/core/server/i18n/i18n_service.ts b/src/core/server/i18n/i18n_service.ts index b8e397dc12ab56..483281d3b7cf2d 100644 --- a/src/core/server/i18n/i18n_service.ts +++ b/src/core/server/i18n/i18n_service.ts @@ -7,7 +7,7 @@ */ import { firstValueFrom } from 'rxjs'; -import { Logger } from '../logging'; +import type { Logger } from '@kbn/logging'; import { IConfigService } from '../config'; import { CoreContext } from '../core_context'; import { InternalHttpServicePreboot, InternalHttpServiceSetup } from '../http'; diff --git a/src/core/server/index.ts b/src/core/server/index.ts index d7669b70fde934..ab5db3941615a1 100644 --- a/src/core/server/index.ts +++ b/src/core/server/index.ts @@ -242,6 +242,12 @@ export type { } from './http_resources'; export type { IRenderOptions } from './rendering'; +export type { + LoggingServiceSetup, + LoggerContextConfigInput, + LoggerConfigType, + AppenderConfigType, +} from './logging'; export type { Logger, LoggerFactory, @@ -253,11 +259,7 @@ export type { LogMeta, LogRecord, LogLevel, - LoggingServiceSetup, - LoggerContextConfigInput, - LoggerConfigType, - AppenderConfigType, -} from './logging'; +} from '@kbn/logging'; export { PluginType } from './plugins'; diff --git a/src/core/server/logging/index.ts b/src/core/server/logging/index.ts index ba6aec5f128c1f..199ddaa4b2a73e 100644 --- a/src/core/server/logging/index.ts +++ b/src/core/server/logging/index.ts @@ -5,22 +5,7 @@ * in compliance with, at your election, the Elastic License 2.0 or the Server * Side Public License, v 1. */ -export { LogLevel } from '@kbn/logging'; -export type { - DisposableAppender, - Appender, - Ecs, - EcsEventCategory, - EcsEventKind, - EcsEventOutcome, - EcsEventType, - LogRecord, - Layout, - LoggerFactory, - LogMeta, - Logger, - LogLevelId, -} from '@kbn/logging'; + export { config } from './logging_config'; export type { LoggingConfigType, diff --git a/src/core/server/logging/logger.mock.ts b/src/core/server/logging/logger.mock.ts deleted file mode 100644 index 55ce55bc035e46..00000000000000 --- a/src/core/server/logging/logger.mock.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0 and the Server Side Public License, v 1; you may not use this file except - * in compliance with, at your election, the Elastic License 2.0 or the Server - * Side Public License, v 1. - */ - -export { loggerMock } from '@kbn/logging-mocks'; -export type { MockedLogger } from '@kbn/logging-mocks'; diff --git a/src/core/server/logging/logger_adapter.test.ts b/src/core/server/logging/logger_adapter.test.ts index 1e2dce4398f727..c7be02e5c0a988 100644 --- a/src/core/server/logging/logger_adapter.test.ts +++ b/src/core/server/logging/logger_adapter.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { Logger } from '.'; +import type { Logger } from '@kbn/logging'; import { LoggerAdapter } from './logger_adapter'; test('proxies all method calls to the internal logger.', () => { diff --git a/src/core/server/logging/logging_system.mock.ts b/src/core/server/logging/logging_system.mock.ts index 1ca778afa31a5c..8c091978ae2255 100644 --- a/src/core/server/logging/logging_system.mock.ts +++ b/src/core/server/logging/logging_system.mock.ts @@ -9,7 +9,7 @@ // Test helpers to simplify mocking logs and collecting all their outputs import { LoggerFactory } from '@kbn/logging'; import { ILoggingSystem } from './logging_system'; -import { loggerMock, MockedLogger } from './logger.mock'; +import { loggerMock, MockedLogger } from '@kbn/logging-mocks'; const createLoggingSystemMock = () => { const mockLog = loggerMock.create(); diff --git a/src/core/server/metrics/metrics_service.ts b/src/core/server/metrics/metrics_service.ts index 8c33b183603e7f..4b44fa46fc8e99 100644 --- a/src/core/server/metrics/metrics_service.ts +++ b/src/core/server/metrics/metrics_service.ts @@ -7,9 +7,9 @@ */ import { firstValueFrom, ReplaySubject } from 'rxjs'; +import type { Logger } from '@kbn/logging'; import { CoreService } from '../../types'; import { CoreContext } from '../core_context'; -import { Logger } from '../logging'; import { InternalHttpServiceSetup } from '../http'; import { InternalMetricsServiceSetup, InternalMetricsServiceStart, OpsMetrics } from './types'; import { OpsMetricsCollector } from './ops_metrics_collector'; diff --git a/src/core/server/plugins/discovery/plugins_discovery.ts b/src/core/server/plugins/discovery/plugins_discovery.ts index 4df87265a00cff..89f9fd9d526487 100644 --- a/src/core/server/plugins/discovery/plugins_discovery.ts +++ b/src/core/server/plugins/discovery/plugins_discovery.ts @@ -8,8 +8,8 @@ import { from, merge } from 'rxjs'; import { catchError, filter, map, mergeMap, concatMap, shareReplay, toArray } from 'rxjs/operators'; +import type { Logger } from '@kbn/logging'; import { CoreContext } from '../../core_context'; -import { Logger } from '../../logging'; import { PluginWrapper } from '../plugin'; import { createPluginInitializerContext, InstanceInfo } from '../plugin_context'; import { PluginsConfig } from '../plugins_config'; diff --git a/src/core/server/plugins/discovery/scan_plugin_search_paths.ts b/src/core/server/plugins/discovery/scan_plugin_search_paths.ts index 7c352d0d7c47fb..a545e9a19f3c31 100644 --- a/src/core/server/plugins/discovery/scan_plugin_search_paths.ts +++ b/src/core/server/plugins/discovery/scan_plugin_search_paths.ts @@ -10,7 +10,7 @@ import { PathLike, readdir, stat, Stats } from 'fs'; import { resolve } from 'path'; import { bindNodeCallback, from, Observable } from 'rxjs'; import { catchError, mergeMap } from 'rxjs/operators'; -import { Logger } from '../../logging'; +import type { Logger } from '@kbn/logging'; import { PluginDiscoveryError } from './plugin_discovery_error'; const fsReadDir$ = bindNodeCallback<[string], [string[]]>(readdir); diff --git a/src/core/server/plugins/plugin.ts b/src/core/server/plugins/plugin.ts index 67c32526f2bf45..2dbb82accc14e6 100644 --- a/src/core/server/plugins/plugin.ts +++ b/src/core/server/plugins/plugin.ts @@ -11,8 +11,8 @@ import typeDetect from 'type-detect'; import { firstValueFrom, Subject } from 'rxjs'; import { isPromise } from '@kbn/std'; import { isConfigSchema } from '@kbn/config-schema'; +import type { Logger } from '@kbn/logging'; -import { Logger } from '../logging'; import { AsyncPlugin, Plugin, diff --git a/src/core/server/plugins/plugins_service.ts b/src/core/server/plugins/plugins_service.ts index 43e10fbe59b6a5..73708d44a5a5d6 100644 --- a/src/core/server/plugins/plugins_service.ts +++ b/src/core/server/plugins/plugins_service.ts @@ -11,9 +11,9 @@ import { firstValueFrom, Observable } from 'rxjs'; import { filter, map, tap, toArray } from 'rxjs/operators'; import { getFlattenedObject } from '@kbn/std'; +import type { Logger } from '@kbn/logging'; import { CoreService } from '../../types'; import { CoreContext } from '../core_context'; -import { Logger } from '../logging'; import { discover, PluginDiscoveryError, PluginDiscoveryErrorType } from './discovery'; import { PluginWrapper } from './plugin'; import { diff --git a/src/core/server/plugins/plugins_system.test.ts b/src/core/server/plugins/plugins_system.test.ts index 3d8a47005b362e..7dbbcbba02c201 100644 --- a/src/core/server/plugins/plugins_system.test.ts +++ b/src/core/server/plugins/plugins_system.test.ts @@ -15,6 +15,7 @@ import { import { BehaviorSubject } from 'rxjs'; import { REPO_ROOT } from '@kbn/utils'; +import type { Logger } from '@kbn/logging'; import { Env } from '../config'; import { configServiceMock, getEnvOptions } from '../config/mocks'; import { CoreContext } from '../core_context'; @@ -24,7 +25,6 @@ import { PluginWrapper } from './plugin'; import { PluginName, PluginType } from './types'; import { PluginsSystem } from './plugins_system'; import { coreMock } from '../mocks'; -import { Logger } from '../logging'; function createPlugin( id: string, diff --git a/src/core/server/plugins/plugins_system.ts b/src/core/server/plugins/plugins_system.ts index f56e824e100ef6..98d04478ea00f1 100644 --- a/src/core/server/plugins/plugins_system.ts +++ b/src/core/server/plugins/plugins_system.ts @@ -7,8 +7,8 @@ */ import { withTimeout, isPromise } from '@kbn/std'; +import type { Logger } from '@kbn/logging'; import { CoreContext } from '../core_context'; -import { Logger } from '../logging'; import { PluginWrapper } from './plugin'; import { DiscoveredPlugin, PluginDependencies, PluginName, PluginType } from './types'; import { diff --git a/src/core/server/plugins/types.ts b/src/core/server/plugins/types.ts index 99ec5d458bcb35..3a6856ddaf08d8 100644 --- a/src/core/server/plugins/types.ts +++ b/src/core/server/plugins/types.ts @@ -10,9 +10,9 @@ import { Observable } from 'rxjs'; import { Type } from '@kbn/config-schema'; import { RecursiveReadonly } from '@kbn/utility-types'; import { PathConfigType } from '@kbn/utils'; +import { LoggerFactory } from '@kbn/logging'; import { ConfigPath, EnvironmentMode, PackageInfo, ConfigDeprecationProvider } from '../config'; -import { LoggerFactory } from '../logging'; import { ElasticsearchConfigType } from '../elasticsearch/elasticsearch_config'; import { SavedObjectsConfigType } from '../saved_objects/saved_objects_config'; import { CorePreboot, CoreSetup, CoreStart } from '..'; diff --git a/src/core/server/root/index.ts b/src/core/server/root/index.ts index 7f92a076073326..8804a31977aab9 100644 --- a/src/core/server/root/index.ts +++ b/src/core/server/root/index.ts @@ -8,9 +8,9 @@ import { ConnectableObservable, Subscription } from 'rxjs'; import { first, publishReplay, switchMap, concatMap, tap } from 'rxjs/operators'; - +import type { Logger, LoggerFactory } from '@kbn/logging'; import { Env, RawConfigurationProvider } from '../config'; -import { Logger, LoggerFactory, LoggingConfigType, LoggingSystem } from '../logging'; +import { LoggingConfigType, LoggingSystem } from '../logging'; import { Server } from '../server'; /** diff --git a/src/core/server/saved_objects/export/collect_exported_objects.test.ts b/src/core/server/saved_objects/export/collect_exported_objects.test.ts index aab9f9134ee2c1..fbb6c1a9f786ec 100644 --- a/src/core/server/saved_objects/export/collect_exported_objects.test.ts +++ b/src/core/server/saved_objects/export/collect_exported_objects.test.ts @@ -9,7 +9,7 @@ import { applyExportTransformsMock } from './collect_exported_objects.test.mocks'; import { savedObjectsClientMock } from '../../mocks'; import { httpServerMock } from '../../http/http_server.mocks'; -import { loggerMock } from '../../logging/logger.mock'; +import { loggerMock } from '@kbn/logging-mocks'; import { SavedObject, SavedObjectError } from '../../../types'; import { SavedObjectTypeRegistry } from '../saved_objects_type_registry'; import type { SavedObjectsExportTransform } from './types'; diff --git a/src/core/server/saved_objects/export/collect_exported_objects.ts b/src/core/server/saved_objects/export/collect_exported_objects.ts index 4789fd3bff67fe..4d36cb428994a4 100644 --- a/src/core/server/saved_objects/export/collect_exported_objects.ts +++ b/src/core/server/saved_objects/export/collect_exported_objects.ts @@ -6,9 +6,9 @@ * Side Public License, v 1. */ +import type { Logger } from '@kbn/logging'; import type { SavedObject } from '../../../types'; import type { KibanaRequest } from '../../http'; -import type { Logger } from '../../logging'; import { SavedObjectsClientContract, SavedObjectsExportablePredicate } from '../types'; import { ISavedObjectTypeRegistry } from '../saved_objects_type_registry'; import type { SavedObjectsExportTransform } from './types'; diff --git a/src/core/server/saved_objects/export/saved_objects_exporter.test.ts b/src/core/server/saved_objects/export/saved_objects_exporter.test.ts index 5968c8dabe8a85..21c7eaa08090bb 100644 --- a/src/core/server/saved_objects/export/saved_objects_exporter.test.ts +++ b/src/core/server/saved_objects/export/saved_objects_exporter.test.ts @@ -11,7 +11,7 @@ import { SavedObjectsExporter } from './saved_objects_exporter'; import { savedObjectsClientMock } from '../service/saved_objects_client.mock'; import { SavedObjectTypeRegistry } from '../saved_objects_type_registry'; import { httpServerMock } from '../../http/http_server.mocks'; -import { loggerMock, MockedLogger } from '../../logging/logger.mock'; +import { loggerMock, MockedLogger } from '@kbn/logging-mocks'; import { Readable } from 'stream'; import { createPromiseFromStreams, createConcatStream } from '@kbn/utils'; diff --git a/src/core/server/saved_objects/migrations/core/document_migrator.ts b/src/core/server/saved_objects/migrations/core/document_migrator.ts index a5c185044ac3df..8f122c7adef0fa 100644 --- a/src/core/server/saved_objects/migrations/core/document_migrator.ts +++ b/src/core/server/saved_objects/migrations/core/document_migrator.ts @@ -46,7 +46,7 @@ import uuidv5 from 'uuid/v5'; import { set } from '@elastic/safer-lodash-set'; import _ from 'lodash'; import Semver from 'semver'; -import { Logger } from '../../../logging'; +import type { Logger } from '@kbn/logging'; import { SavedObjectUnsanitizedDoc } from '../../serialization'; import { SavedObjectsMigrationVersion, diff --git a/src/core/server/saved_objects/migrations/core/migration_logger.ts b/src/core/server/saved_objects/migrations/core/migration_logger.ts index 25ba405b92842f..e9bd91e01dfb83 100644 --- a/src/core/server/saved_objects/migrations/core/migration_logger.ts +++ b/src/core/server/saved_objects/migrations/core/migration_logger.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { Logger, LogMeta } from '../../../logging'; +import type { Logger, LogMeta } from '@kbn/logging'; /* * This file provides a helper class for ensuring that all logging diff --git a/src/core/server/saved_objects/migrations/kibana_migrator.ts b/src/core/server/saved_objects/migrations/kibana_migrator.ts index 31b9c89f4176fc..54feeccb9573f1 100644 --- a/src/core/server/saved_objects/migrations/kibana_migrator.ts +++ b/src/core/server/saved_objects/migrations/kibana_migrator.ts @@ -13,8 +13,8 @@ import { BehaviorSubject } from 'rxjs'; import Semver from 'semver'; +import type { Logger } from '@kbn/logging'; import { ElasticsearchClient } from '../../elasticsearch'; -import { Logger } from '../../logging'; import { IndexMapping, SavedObjectsTypeMappingDefinitions } from '../mappings'; import { SavedObjectUnsanitizedDoc, diff --git a/src/core/server/saved_objects/migrations/migrations_state_action_machine.ts b/src/core/server/saved_objects/migrations/migrations_state_action_machine.ts index 87b78102371d36..8eaae216914f7a 100644 --- a/src/core/server/saved_objects/migrations/migrations_state_action_machine.ts +++ b/src/core/server/saved_objects/migrations/migrations_state_action_machine.ts @@ -8,7 +8,7 @@ import { errors as EsErrors } from '@elastic/elasticsearch'; import * as Option from 'fp-ts/lib/Option'; -import { Logger, LogMeta } from '../../logging'; +import type { Logger, LogMeta } from '@kbn/logging'; import type { ElasticsearchClient } from '../../elasticsearch'; import { getErrorMessage, getRequestDebugMeta } from '../../elasticsearch'; import { Model, Next, stateActionMachine } from './state_action_machine'; diff --git a/src/core/server/saved_objects/migrations/run_resilient_migrator.ts b/src/core/server/saved_objects/migrations/run_resilient_migrator.ts index dce9227719389e..6e5766c9f5dcf7 100644 --- a/src/core/server/saved_objects/migrations/run_resilient_migrator.ts +++ b/src/core/server/saved_objects/migrations/run_resilient_migrator.ts @@ -6,9 +6,9 @@ * Side Public License, v 1. */ +import type { Logger } from '@kbn/logging'; import { ElasticsearchClient } from '../../elasticsearch'; import { IndexMapping } from '../mappings'; -import { Logger } from '../../logging'; import type { SavedObjectsMigrationVersion } from '../types'; import type { TransformRawDocs } from './types'; import { MigrationResult } from './core'; diff --git a/src/core/server/saved_objects/routes/index.ts b/src/core/server/saved_objects/routes/index.ts index 41ad9ff24c30c0..f76f802928190f 100644 --- a/src/core/server/saved_objects/routes/index.ts +++ b/src/core/server/saved_objects/routes/index.ts @@ -6,9 +6,9 @@ * Side Public License, v 1. */ +import type { Logger } from '@kbn/logging'; import { InternalHttpServiceSetup } from '../../http'; import { InternalCoreUsageDataSetup } from '../../core_usage_data'; -import { Logger } from '../../logging'; import { SavedObjectConfig } from '../saved_objects_config'; import { IKibanaMigrator } from '../migrations'; import { registerGetRoute } from './get'; diff --git a/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/export.test.ts b/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/export.test.ts index b9752b39f8e782..6ae4a74aee0145 100644 --- a/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/export.test.ts +++ b/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/export.test.ts @@ -37,7 +37,7 @@ import { coreUsageStatsClientMock } from '../../../../core_usage_data/core_usage import { coreUsageDataServiceMock } from '../../../../core_usage_data/core_usage_data_service.mock'; import { registerLegacyExportRoute } from '../export'; import { setupServer } from '../../test_utils'; -import { loggerMock } from '../../../../logging/logger.mock'; +import { loggerMock } from '@kbn/logging-mocks'; type SetupServerReturn = Awaited>; let coreUsageStatsClient: jest.Mocked; diff --git a/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/import.test.ts b/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/import.test.ts index 8a414094fde996..13d5638440547a 100644 --- a/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/import.test.ts +++ b/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/import.test.ts @@ -37,7 +37,7 @@ import { coreUsageStatsClientMock } from '../../../../core_usage_data/core_usage import { coreUsageDataServiceMock } from '../../../../core_usage_data/core_usage_data_service.mock'; import { registerLegacyImportRoute } from '../import'; import { setupServer } from '../../test_utils'; -import { loggerMock } from '../../../../logging/logger.mock'; +import { loggerMock } from '@kbn/logging-mocks'; type SetupServerReturn = Awaited>; let coreUsageStatsClient: jest.Mocked; diff --git a/src/core/server/saved_objects/saved_objects_service.ts b/src/core/server/saved_objects/saved_objects_service.ts index 1598d2b1d27647..c56a53b05a4ce4 100644 --- a/src/core/server/saved_objects/saved_objects_service.ts +++ b/src/core/server/saved_objects/saved_objects_service.ts @@ -8,6 +8,7 @@ import { Subject, Observable, firstValueFrom } from 'rxjs'; import { filter, take, switchMap } from 'rxjs/operators'; +import type { Logger } from '@kbn/logging'; import { CoreService } from '../../types'; import { SavedObjectsClient, @@ -40,7 +41,6 @@ import { SavedObjectsClientFactoryProvider, SavedObjectsClientWrapperFactory, } from './service/lib/scoped_client_provider'; -import { Logger } from '../logging'; import { SavedObjectTypeRegistry, ISavedObjectTypeRegistry } from './saved_objects_type_registry'; import { SavedObjectsSerializer } from './serialization'; import { SavedObjectsExporter, ISavedObjectsExporter } from './export'; diff --git a/src/core/server/saved_objects/service/lib/point_in_time_finder.mock.ts b/src/core/server/saved_objects/service/lib/point_in_time_finder.mock.ts index c689eb319898b1..c5ea141486c76d 100644 --- a/src/core/server/saved_objects/service/lib/point_in_time_finder.mock.ts +++ b/src/core/server/saved_objects/service/lib/point_in_time_finder.mock.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { loggerMock, MockedLogger } from '../../../logging/logger.mock'; +import { loggerMock, MockedLogger } from '@kbn/logging-mocks'; import type { SavedObjectsClientContract } from '../../types'; import type { ISavedObjectsRepository } from './repository'; import { PointInTimeFinder } from './point_in_time_finder'; diff --git a/src/core/server/saved_objects/service/lib/point_in_time_finder.test.ts b/src/core/server/saved_objects/service/lib/point_in_time_finder.test.ts index e4045f53eadad7..f9d5098b5d8961 100644 --- a/src/core/server/saved_objects/service/lib/point_in_time_finder.test.ts +++ b/src/core/server/saved_objects/service/lib/point_in_time_finder.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { loggerMock, MockedLogger } from '../../../logging/logger.mock'; +import { loggerMock, MockedLogger } from '@kbn/logging-mocks'; import type { SavedObjectsFindResult } from '..'; import { savedObjectsRepositoryMock } from './repository.mock'; diff --git a/src/core/server/saved_objects/service/lib/point_in_time_finder.ts b/src/core/server/saved_objects/service/lib/point_in_time_finder.ts index 54cc527f280589..b00bfde8d08aa4 100644 --- a/src/core/server/saved_objects/service/lib/point_in_time_finder.ts +++ b/src/core/server/saved_objects/service/lib/point_in_time_finder.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey'; -import type { Logger } from '../../../logging'; +import type { Logger } from '@kbn/logging'; import type { SavedObjectsFindOptions, SavedObjectsClientContract } from '../../types'; import type { SavedObjectsFindResponse } from '..'; diff --git a/src/core/server/saved_objects/service/lib/repository.test.ts b/src/core/server/saved_objects/service/lib/repository.test.ts index 313ca2bd07e735..d9fa313ca7c0ca 100644 --- a/src/core/server/saved_objects/service/lib/repository.test.ts +++ b/src/core/server/saved_objects/service/lib/repository.test.ts @@ -44,7 +44,7 @@ import { SavedObjectsCreatePointInTimeFinderOptions, } from './point_in_time_finder'; import { ALL_NAMESPACES_STRING } from './utils'; -import { loggerMock } from '../../../logging/logger.mock'; +import { loggerMock } from '@kbn/logging-mocks'; import { SavedObjectsRawDocSource, SavedObjectsSerializer, diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts index 287c78d3b26189..2827b7f5ffea6e 100644 --- a/src/core/server/saved_objects/service/lib/repository.ts +++ b/src/core/server/saved_objects/service/lib/repository.ts @@ -9,9 +9,9 @@ import { omit, isObject } from 'lodash'; import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey'; import * as esKuery from '@kbn/es-query'; +import type { Logger } from '@kbn/logging'; import type { ElasticsearchClient } from '../../../elasticsearch'; import { isSupportedEsServer, isNotFoundFromUnsupportedServer } from '../../../elasticsearch'; -import type { Logger } from '../../../logging'; import { getRootPropertiesObjects, IndexMapping } from '../../mappings'; import { ISavedObjectsPointInTimeFinder, diff --git a/src/core/server/saved_objects/service/lib/repository_create_repository.test.ts b/src/core/server/saved_objects/service/lib/repository_create_repository.test.ts index 2d03fff29df104..b1033012a4beb3 100644 --- a/src/core/server/saved_objects/service/lib/repository_create_repository.test.ts +++ b/src/core/server/saved_objects/service/lib/repository_create_repository.test.ts @@ -10,7 +10,7 @@ import { SavedObjectsRepository } from './repository'; import { mockKibanaMigrator } from '../../migrations/kibana_migrator.mock'; import { KibanaMigrator } from '../../migrations'; import { SavedObjectTypeRegistry } from '../../saved_objects_type_registry'; -import { loggerMock, MockedLogger } from '../../../logging/logger.mock'; +import { loggerMock, MockedLogger } from '@kbn/logging-mocks'; jest.mock('./repository'); diff --git a/src/core/server/saved_objects/service/lib/update_objects_spaces.test.ts b/src/core/server/saved_objects/service/lib/update_objects_spaces.test.ts index 43a9d44d9fd602..5a600128a38ecd 100644 --- a/src/core/server/saved_objects/service/lib/update_objects_spaces.test.ts +++ b/src/core/server/saved_objects/service/lib/update_objects_spaces.test.ts @@ -15,7 +15,7 @@ import { import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks'; -import { loggerMock } from '../../../logging/logger.mock'; +import { loggerMock } from '@kbn/logging-mocks'; import { typeRegistryMock } from '../../saved_objects_type_registry.mock'; import { SavedObjectsSerializer } from '../../serialization'; import type { diff --git a/src/core/server/saved_objects/service/lib/update_objects_spaces.ts b/src/core/server/saved_objects/service/lib/update_objects_spaces.ts index 26da4909df247f..9a1ca70b83fc74 100644 --- a/src/core/server/saved_objects/service/lib/update_objects_spaces.ts +++ b/src/core/server/saved_objects/service/lib/update_objects_spaces.ts @@ -10,7 +10,7 @@ import pMap from 'p-map'; import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey'; import intersection from 'lodash/intersection'; -import type { Logger } from '../../../logging'; +import type { Logger } from '@kbn/logging'; import { isNotFoundFromUnsupportedServer } from '../../../elasticsearch'; import type { IndexMapping } from '../../mappings'; import type { ISavedObjectTypeRegistry } from '../../saved_objects_type_registry'; diff --git a/src/core/server/saved_objects/validation/validator.test.ts b/src/core/server/saved_objects/validation/validator.test.ts index 0b461679984fd3..18dae84164ae93 100644 --- a/src/core/server/saved_objects/validation/validator.test.ts +++ b/src/core/server/saved_objects/validation/validator.test.ts @@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema'; import { SavedObjectsTypeValidator, SavedObjectsValidationMap } from '.'; import { SavedObjectSanitizedDoc } from '../serialization'; -import { loggerMock, MockedLogger } from '../../logging/logger.mock'; +import { loggerMock, MockedLogger } from '@kbn/logging-mocks'; describe('Saved Objects type validator', () => { let validator: SavedObjectsTypeValidator; diff --git a/src/core/server/saved_objects/validation/validator.ts b/src/core/server/saved_objects/validation/validator.ts index e358a435dc0271..0eb4c13f9fb03e 100644 --- a/src/core/server/saved_objects/validation/validator.ts +++ b/src/core/server/saved_objects/validation/validator.ts @@ -6,10 +6,10 @@ * Side Public License, v 1. */ +import type { Logger } from '@kbn/logging'; import { createSavedObjectSanitizedDocSchema } from './schema'; import { SavedObjectsValidationMap } from './types'; import { SavedObjectSanitizedDoc } from '../serialization'; -import { Logger } from '../../logging'; /** * Helper class that takes a {@link SavedObjectsValidationMap} and runs validations for a diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md index 993a5f7aa46e93..bfada11a34bf2c 100644 --- a/src/core/server/server.api.md +++ b/src/core/server/server.api.md @@ -1475,10 +1475,10 @@ export type KibanaResponseFactory = typeof kibanaResponseFactory; // @public export const kibanaResponseFactory: { - custom: | Error | Buffer | Stream | { + custom: | Error | Buffer | { message: string | Error; attributes?: ResponseErrorAttributes | undefined; - } | undefined>(options: CustomHttpResponseOptions) => KibanaResponse; + } | Stream | undefined>(options: CustomHttpResponseOptions) => KibanaResponse; badRequest: (options?: ErrorHttpResponseOptions) => KibanaResponse; - customError: (options: CustomHttpResponseOptions) => KibanaResponse) => KibanaResponse; + } | Stream>; redirected: (options: RedirectResponseOptions) => KibanaResponse | Buffer | Stream>; ok: (options?: HttpResponseOptions) => KibanaResponse | Buffer | Stream>; accepted: (options?: HttpResponseOptions) => KibanaResponse | Buffer | Stream>; diff --git a/src/core/server/server.ts b/src/core/server/server.ts index 234630734d437b..b83970b2da87c8 100644 --- a/src/core/server/server.ts +++ b/src/core/server/server.ts @@ -8,6 +8,7 @@ import apm from 'elastic-apm-node'; import { config as pathConfig } from '@kbn/utils'; +import type { Logger, LoggerFactory } from '@kbn/logging'; import { ConfigService, Env, @@ -21,7 +22,7 @@ import { ElasticsearchService } from './elasticsearch'; import { HttpService } from './http'; import { HttpResourcesService } from './http_resources'; import { RenderingService } from './rendering'; -import { Logger, LoggerFactory, LoggingService, ILoggingSystem } from './logging'; +import { LoggingService, ILoggingSystem } from './logging'; import { UiSettingsService } from './ui_settings'; import { PluginsService, config as pluginsConfig } from './plugins'; import { SavedObjectsService, SavedObjectsServiceStart } from './saved_objects'; diff --git a/src/core/server/status/status_service.ts b/src/core/server/status/status_service.ts index a3dc0335c88af4..2350068d50266e 100644 --- a/src/core/server/status/status_service.ts +++ b/src/core/server/status/status_service.ts @@ -19,11 +19,11 @@ import { map, distinctUntilChanged, shareReplay, debounceTime, takeUntil } from import { isDeepStrictEqual } from 'util'; import type { RootSchema } from '@kbn/analytics-client'; +import type { Logger, LogMeta } from '@kbn/logging'; import { AnalyticsServiceSetup } from '../analytics'; import { CoreService } from '../../types'; import { CoreContext } from '../core_context'; -import { Logger, LogMeta } from '../logging'; import { InternalElasticsearchServiceSetup } from '../elasticsearch'; import { InternalHttpServiceSetup } from '../http'; import { InternalSavedObjectsServiceSetup } from '../saved_objects'; diff --git a/src/core/server/ui_settings/base_ui_settings_client.ts b/src/core/server/ui_settings/base_ui_settings_client.ts index d16524ef4e3431..be50c923bea0eb 100644 --- a/src/core/server/ui_settings/base_ui_settings_client.ts +++ b/src/core/server/ui_settings/base_ui_settings_client.ts @@ -8,13 +8,13 @@ import { omit } from 'lodash'; +import type { Logger } from '@kbn/logging'; import { IUiSettingsClient, UiSettingsParams, PublicUiSettingsParams, UserProvidedValues, } from './types'; -import { Logger } from '../logging'; export interface BaseUiSettingsDefaultsClientOptions { overrides?: Record; diff --git a/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts b/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts index 402405e1adb396..d55a6537957cbd 100644 --- a/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts +++ b/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts @@ -8,9 +8,9 @@ import { defaults } from 'lodash'; +import type { Logger, LogMeta } from '@kbn/logging'; import { SavedObjectsClientContract } from '../../saved_objects/types'; import { SavedObjectsErrorHelpers } from '../../saved_objects'; -import { Logger, LogMeta } from '../../logging'; import { getUpgradeableConfig } from './get_upgradeable_config'; diff --git a/src/core/server/ui_settings/ui_settings_client.ts b/src/core/server/ui_settings/ui_settings_client.ts index 53ed41a3e12be5..c6881d28174045 100644 --- a/src/core/server/ui_settings/ui_settings_client.ts +++ b/src/core/server/ui_settings/ui_settings_client.ts @@ -6,9 +6,9 @@ * Side Public License, v 1. */ +import type { Logger } from '@kbn/logging'; import { SavedObjectsErrorHelpers } from '../saved_objects'; import { SavedObjectsClientContract } from '../saved_objects/types'; -import { Logger } from '../logging'; import { createOrUpgradeSavedConfig } from './create_or_upgrade_saved_config'; import { UiSettingsParams } from './types'; import { CannotOverrideError } from './ui_settings_errors'; diff --git a/src/core/server/ui_settings/ui_settings_defaults_client.ts b/src/core/server/ui_settings/ui_settings_defaults_client.ts index fad90b9b0eaeed..1865065adcea58 100644 --- a/src/core/server/ui_settings/ui_settings_defaults_client.ts +++ b/src/core/server/ui_settings/ui_settings_defaults_client.ts @@ -6,8 +6,8 @@ * Side Public License, v 1. */ +import type { Logger } from '@kbn/logging'; import { UiSettingsParams, UserProvidedValues } from './types'; -import { Logger } from '../logging'; import { BaseUiSettingsClient } from './base_ui_settings_client'; export interface UiSettingsDefaultsClientOptions { diff --git a/src/core/server/ui_settings/ui_settings_service.ts b/src/core/server/ui_settings/ui_settings_service.ts index 64765ec7d6c74b..3e37ec1e5ffef7 100644 --- a/src/core/server/ui_settings/ui_settings_service.ts +++ b/src/core/server/ui_settings/ui_settings_service.ts @@ -9,9 +9,9 @@ import { firstValueFrom, Observable } from 'rxjs'; import { mapToObject } from '@kbn/std'; +import type { Logger } from '@kbn/logging'; import { CoreService } from '../../types'; import { CoreContext } from '../core_context'; -import { Logger } from '../logging'; import { SavedObjectsClientContract } from '../saved_objects/types'; import { InternalSavedObjectsServiceSetup } from '../saved_objects'; import { InternalHttpServiceSetup } from '../http'; diff --git a/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.test.ts b/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.test.ts index 6f8aa3a521f3c7..853b6d2c4cec00 100644 --- a/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.test.ts +++ b/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.test.ts @@ -8,8 +8,7 @@ jest.mock('axios', () => jest.fn()); import { SyntheticsService, SyntheticsConfig } from './synthetics_service'; -// eslint-disable-next-line @kbn/eslint/no-restricted-paths -import { loggerMock } from '@kbn/core/server/logging/logger.mock'; +import { loggerMock } from '@kbn/logging-mocks'; import { UptimeServerSetup } from '../legacy_uptime/lib/adapters'; import axios, { AxiosResponse } from 'axios'; import times from 'lodash/times';