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

packages/server/modules/auth/index.ts

@@ -1,7 +1,7 @@
 import { SpeckleModule } from '@/modules/shared/helpers/typeHelper'
 
 import { registerOrUpdateScopeFactory } from '@/modules/shared/repositories/scopes'
-import { authLogger, moduleLogger } from '@/logging/logging'
+import { authLogger, moduleLogger } from '@/observability/logging'
 import db from '@/db/knex'
 import { initializeDefaultAppsFactory } from '@/modules/auth/services/serverApps'
 import {

packages/server/modules/auth/repositories/apps.ts

@@ -1,4 +1,4 @@
-import { logger, moduleLogger } from '@/logging/logging'
+import { logger, moduleLogger } from '@/observability/logging'
 import { getDefaultApp } from '@/modules/auth/defaultApps'
 import {
   CreateApp,

packages/server/modules/auth/services/postAuth.ts

@@ -1,5 +1,5 @@
-import { authLogger, type Logger } from '@/logging/logging'
-import { maybeLoggerWithContext } from '@/logging/requestContext'
+import { authLogger, type Logger } from '@/observability/logging'
+import { maybeLoggerWithContext } from '@/observability/components/express/requestContext'
 import {
   addToMailchimpAudience,
   triggerMailchimpCustomerJourney

packages/server/modules/auth/tests/auth.spec.ts

@@ -56,7 +56,8 @@ import { RateLimiterMemory } from 'rate-limiter-flexible'
 import { TIME } from '@speckle/shared'
 import type { Application } from 'express'
 import { passportAuthenticationCallbackFactory } from '@/modules/auth/services/passportService'
-import { testLogger as logger } from '@/logging/logging'
+import { testLogger as logger } from '@/observability/logging'
+import { Application } from 'express'
 
 const getServerInfo = getServerInfoFactory({ db })
 const getUser = getUserFactory({ db })