Merge branch 'main' into iain/ratelimiter-should-respect-configuration

packages/server/modules/core/domain/objects/operations.ts

@@ -1,4 +1,4 @@
-import { Logger } from '@/logging/logging'
+import type { Logger } from '@/observability/logging'
 import {
   InsertableSpeckleObject,
   RawSpeckleObject,

packages/server/modules/core/graph/plugins/logging.ts

@@ -1,12 +1,12 @@
 /* eslint-disable camelcase */
 import { type Registry, Counter } from 'prom-client'
-import { graphqlLogger } from '@/logging/logging'
-import { redactSensitiveVariables } from '@/logging/loggingHelper'
+import { graphqlLogger } from '@/observability/logging'
+import { redactSensitiveVariables } from '@/observability/utils/redact'
 import { FieldNode, SelectionNode } from 'graphql'
 import { ApolloServerPlugin } from '@apollo/server'
 import { GraphQLContext } from '@/modules/shared/helpers/typeHelper'
-import { shouldLogAsInfoLevel } from '@/logging/graphqlError'
-import { getRequestContext } from '@/logging/requestContext'
+import { shouldLogAsInfoLevel } from '@/observability/utils/logLevels'
+import { getRequestContext } from '@/observability/components/express/requestContext'
 
 type ApolloLoggingPluginTransaction = {
   start: number

packages/server/modules/core/graph/resolvers/users.ts

@@ -35,7 +35,7 @@ import {
   deleteStreamFactory,
   getUserDeletableStreamsFactory
 } from '@/modules/core/repositories/streams'
-import { dbLogger } from '@/logging/logging'
+import { dbLogger } from '@/observability/logging'
 import { getAdminUsersListCollectionFactory } from '@/modules/core/services/users/legacyAdminUsersList'
 import { Resolvers } from '@/modules/core/graph/generated/graphql'
 import { getServerInfoFactory } from '@/modules/core/repositories/server'

packages/server/modules/core/index.ts

@@ -1,4 +1,4 @@
-import { moduleLogger } from '@/logging/logging'
+import { moduleLogger } from '@/observability/logging'
 import {
   setupResultListener,
   shutdownResultListener

packages/server/modules/core/logger.ts

@@ -1,3 +1,3 @@
-import { extendLoggerComponent, moduleLogger } from '@/logging/logging'
+import { extendLoggerComponent, moduleLogger } from '@/observability/logging'
 
 export const coreLogger = extendLoggerComponent(moduleLogger, 'core')

packages/server/modules/core/rest/defaultErrorHandler.ts

@@ -5,7 +5,7 @@ import { Optional, ensureError } from '@speckle/shared'
 import { ErrorRequestHandler } from 'express'
 import { get, isNumber } from 'lodash'
 import { VError } from 'verror'
-import { logger as defaultLogger } from '@/logging/logging'
+import { logger as defaultLogger } from '@/observability/logging'
 
 export const resolveStatusCode = (e: Error): number => {
   if (e instanceof BaseError) {

packages/server/modules/core/rest/download.ts

@@ -3,7 +3,6 @@ import { corsMiddlewareFactory } from '@/modules/core/configs/cors'
 
 import { SpeckleObjectsStream } from '@/modules/core/rest/speckleObjectsStream'
 import { pipeline, PassThrough } from 'stream'
-import { logger } from '@/logging/logging'
 import {
   getFormattedObjectFactory,
   getObjectChildrenStreamFactory
@@ -25,7 +24,7 @@ export default (app: express.Express) => {
   app.options('/objects/:streamId/:objectId', corsMiddlewareFactory())
 
   app.get('/objects/:streamId/:objectId', corsMiddlewareFactory(), async (req, res) => {
-    const boundLogger = (req.log || logger).child({
+    const boundLogger = req.log.child({
       requestId: req.id,
       userId: req.context.userId || '-',
       streamId: req.params.streamId,
@@ -112,7 +111,7 @@ export default (app: express.Express) => {
     '/objects/:streamId/:objectId/single',
     corsMiddlewareFactory(),
     async (req, res) => {
-      const boundLogger = (req.log || logger).child({
+      const boundLogger = req.log.child({
         requestId: req.id,
         userId: req.context.userId || '-',
         streamId: req.params.streamId,

packages/server/modules/core/services/objects/management.ts

@@ -9,7 +9,7 @@ import {
   estimateStringMegabyteSize
 } from '@/modules/core/utils/chunking'
 import { ObjectHandlingError } from '@/modules/core/errors/object'
-import { servicesLogger } from '@/logging/logging'
+import { servicesLogger } from '@/observability/logging'
 import {
   CreateObject,
   CreateObjects,

packages/server/modules/core/services/taskScheduler.ts

@@ -1,6 +1,6 @@
 import cron from 'node-cron'
 import { InvalidArgumentError } from '@/modules/shared/errors'
-import { logger } from '@/logging/logging'
+import { taskSchedulerLogger as logger } from '@/observability/logging'
 import {
   AcquireTaskLock,
   ReleaseTaskLock,

packages/server/modules/core/services/users/management.ts

@@ -48,7 +48,7 @@ import {
   DeleteStreamRecord,
   GetUserDeletableStreams
 } from '@/modules/core/domain/streams/operations'
-import { Logger } from '@/logging/logging'
+import type { Logger } from '@/observability/logging'
 import { DeleteAllUserInvites } from '@/modules/serverinvites/domain/operations'
 import { GetServerInfo } from '@/modules/core/domain/server/operations'
 import { EventBusEmit } from '@/modules/shared/services/eventBus'

packages/server/modules/core/tests/users.spec.ts

@@ -96,7 +96,7 @@ import {
 } from '@/modules/core/services/users/management'
 import { validateAndCreateUserEmailFactory } from '@/modules/core/services/userEmails'
 import { finalizeInvitedServerRegistrationFactory } from '@/modules/serverinvites/services/processing'
-import { dbLogger } from '@/logging/logging'
+import { dbLogger } from '@/observability/logging'
 import {
   storeApiTokenFactory,
   storeTokenScopesFactory,

packages/server/modules/core/tests/usersAdmin.spec.ts

@@ -40,7 +40,7 @@ import {
   deleteStreamFactory,
   getUserDeletableStreamsFactory
 } from '@/modules/core/repositories/streams'
-import { dbLogger } from '@/logging/logging'
+import { dbLogger } from '@/observability/logging'
 import { getServerInfoFactory } from '@/modules/core/repositories/server'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 import { expect } from 'chai'

packages/server/modules/core/utils/dbNotificationListener.ts

@@ -1,5 +1,5 @@
 import { MaybeAsync, Optional, md5, wait } from '@speckle/shared'
-import { dbNotificationLogger } from '@/logging/logging'
+import { dbNotificationLogger } from '@/observability/logging'
 import { knex } from '@/modules/core/dbSchema'
 import * as Knex from 'knex'
 import * as pg from 'pg'

packages/server/modules/core/utils/ratelimiter.ts

@@ -7,7 +7,7 @@ import {
   RateLimiterRes
 } from 'rate-limiter-flexible'
 import { Nullable, TIME } from '@speckle/shared'
-import { rateLimiterLogger } from '@/logging/logging'
+import { rateLimiterLogger } from '@/observability/logging'
 import { createRedisClient } from '@/modules/shared/redis/redis'
 import { RateLimitError } from '@/modules/core/errors/ratelimit'