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

packages/server/modules/shared/middleware/index.ts

@@ -33,7 +33,7 @@ import { Netmask } from 'netmask'
 import { Merge } from 'type-fest'
 import { resourceAccessRuleToIdentifier } from '@/modules/core/helpers/token'
 import { delayGraphqlResponsesBy } from '@/modules/shared/helpers/envHelper'
-import { subscriptionLogger } from '@/logging/logging'
+import { subscriptionLogger } from '@/observability/logging'
 import { GetUser } from '@/modules/core/domain/users/operations'
 import { validateTokenFactory } from '@/modules/core/services/tokens'
 import {

packages/server/modules/shared/redis/redis.ts

@@ -1,4 +1,4 @@
-import { redisLogger } from '@/logging/logging'
+import { redisLogger } from '@/observability/logging'
 import Redis, { RedisOptions } from 'ioredis'
 import {
   EnvironmentResourceError,

packages/server/modules/shared/utils/mixpanel.ts

@@ -8,7 +8,7 @@ import {
 import Mixpanel from 'mixpanel'
 import type express from 'express'
 import type http from 'http'
-import { mixpanelLogger } from '@/logging/logging'
+import { mixpanelLogger } from '@/observability/logging'
 
 let client: Optional<Mixpanel.Mixpanel> = undefined
 let baseTrackingProperties: Optional<Record<string, string>> = undefined