diff --git a/packages/backend-defaults/report-rootLogger.api.md b/packages/backend-defaults/report-rootLogger.api.md index aa27a366e3..99dc263358 100644 --- a/packages/backend-defaults/report-rootLogger.api.md +++ b/packages/backend-defaults/report-rootLogger.api.md @@ -6,7 +6,7 @@ import { config } from 'winston'; import { Format } from 'logform'; import { JsonObject } from '@backstage/types'; -import { JsonValue } from '@backstage/types'; +import { JsonPrimitive } from '@backstage/types'; import { LoggerService } from '@backstage/backend-plugin-api'; import { RootLoggerService } from '@backstage/backend-plugin-api'; import { ServiceFactory } from '@backstage/backend-plugin-api'; @@ -55,7 +55,7 @@ export type WinstonLoggerLevelOverride = { // @public (undocumented) export type WinstonLoggerLevelOverrideMatchers = { - [key: string]: JsonValue | undefined; + [key: string]: JsonPrimitive | JsonPrimitive[] | undefined; }; // @public (undocumented) diff --git a/packages/backend-defaults/src/entrypoints/rootLogger/config.ts b/packages/backend-defaults/src/entrypoints/rootLogger/config.ts index 24660f82c8..11687d72f4 100644 --- a/packages/backend-defaults/src/entrypoints/rootLogger/config.ts +++ b/packages/backend-defaults/src/entrypoints/rootLogger/config.ts @@ -15,7 +15,11 @@ */ import { RootConfigService } from '@backstage/backend-plugin-api'; import { JsonObject } from '@backstage/types'; -import { RootLoggerConfig, winstonLevels } from './types'; +import { + RootLoggerConfig, + winstonLevels, + WinstonLoggerLevelOverrideMatchers, +} from './types'; export const getRootLoggerConfig = ( config: RootConfigService, @@ -36,7 +40,9 @@ export const getRootLoggerConfig = ( ); } - const matchers = override.getConfig('matchers').get(); + const matchers = override + .getConfig('matchers') + .get(); return { matchers, diff --git a/packages/backend-defaults/src/entrypoints/rootLogger/types.ts b/packages/backend-defaults/src/entrypoints/rootLogger/types.ts index b1f6fcc5b3..f8277d8075 100644 --- a/packages/backend-defaults/src/entrypoints/rootLogger/types.ts +++ b/packages/backend-defaults/src/entrypoints/rootLogger/types.ts @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { JsonObject, JsonValue } from '@backstage/types'; +import { JsonObject, JsonPrimitive } from '@backstage/types'; import { config as winstonConfig } from 'winston'; /** * @public */ export type WinstonLoggerLevelOverrideMatchers = { - [key: string]: JsonValue | undefined; + [key: string]: JsonPrimitive | JsonPrimitive[] | undefined; }; /**