diff options
Diffstat (limited to 'server')
7 files changed, 8 insertions, 8 deletions
diff --git a/server/lib/opentelemetry/metric-helpers/job-queue-observers-builder.ts b/server/lib/opentelemetry/metric-helpers/job-queue-observers-builder.ts index c81959616..56713ede8 100644 --- a/server/lib/opentelemetry/metric-helpers/job-queue-observers-builder.ts +++ b/server/lib/opentelemetry/metric-helpers/job-queue-observers-builder.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Meter } from '@opentelemetry/api-metrics' | 1 | import { Meter } from '@opentelemetry/api' |
2 | import { JobQueue } from '@server/lib/job-queue' | 2 | import { JobQueue } from '@server/lib/job-queue' |
3 | 3 | ||
4 | export class JobQueueObserversBuilder { | 4 | export class JobQueueObserversBuilder { |
diff --git a/server/lib/opentelemetry/metric-helpers/lives-observers-builder.ts b/server/lib/opentelemetry/metric-helpers/lives-observers-builder.ts index e27bd8548..5effc18e1 100644 --- a/server/lib/opentelemetry/metric-helpers/lives-observers-builder.ts +++ b/server/lib/opentelemetry/metric-helpers/lives-observers-builder.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Meter } from '@opentelemetry/api-metrics' | 1 | import { Meter } from '@opentelemetry/api' |
2 | import { VideoModel } from '@server/models/video/video' | 2 | import { VideoModel } from '@server/models/video/video' |
3 | 3 | ||
4 | export class LivesObserversBuilder { | 4 | export class LivesObserversBuilder { |
diff --git a/server/lib/opentelemetry/metric-helpers/nodejs-observers-builder.ts b/server/lib/opentelemetry/metric-helpers/nodejs-observers-builder.ts index 781722108..b66fa474c 100644 --- a/server/lib/opentelemetry/metric-helpers/nodejs-observers-builder.ts +++ b/server/lib/opentelemetry/metric-helpers/nodejs-observers-builder.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { readdir } from 'fs-extra' | 1 | import { readdir } from 'fs-extra' |
2 | import { constants, PerformanceObserver } from 'perf_hooks' | 2 | import { constants, PerformanceObserver } from 'perf_hooks' |
3 | import * as process from 'process' | 3 | import * as process from 'process' |
4 | import { Meter, ObservableResult } from '@opentelemetry/api-metrics' | 4 | import { Meter, ObservableResult } from '@opentelemetry/api' |
5 | import { ExplicitBucketHistogramAggregation } from '@opentelemetry/sdk-metrics' | 5 | import { ExplicitBucketHistogramAggregation } from '@opentelemetry/sdk-metrics' |
6 | import { View } from '@opentelemetry/sdk-metrics/build/src/view/View' | 6 | import { View } from '@opentelemetry/sdk-metrics/build/src/view/View' |
7 | import { logger } from '@server/helpers/logger' | 7 | import { logger } from '@server/helpers/logger' |
diff --git a/server/lib/opentelemetry/metric-helpers/playback-metrics.ts b/server/lib/opentelemetry/metric-helpers/playback-metrics.ts index 9dd481838..406789618 100644 --- a/server/lib/opentelemetry/metric-helpers/playback-metrics.ts +++ b/server/lib/opentelemetry/metric-helpers/playback-metrics.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Counter, Meter } from '@opentelemetry/api-metrics' | 1 | import { Counter, Meter } from '@opentelemetry/api' |
2 | import { MVideoImmutable } from '@server/types/models' | 2 | import { MVideoImmutable } from '@server/types/models' |
3 | import { PlaybackMetricCreate } from '@shared/models' | 3 | import { PlaybackMetricCreate } from '@shared/models' |
4 | 4 | ||
diff --git a/server/lib/opentelemetry/metric-helpers/stats-observers-builder.ts b/server/lib/opentelemetry/metric-helpers/stats-observers-builder.ts index 3d28ffdd8..9f5f22e1b 100644 --- a/server/lib/opentelemetry/metric-helpers/stats-observers-builder.ts +++ b/server/lib/opentelemetry/metric-helpers/stats-observers-builder.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import memoizee from 'memoizee' | 1 | import memoizee from 'memoizee' |
2 | import { Meter } from '@opentelemetry/api-metrics' | 2 | import { Meter } from '@opentelemetry/api' |
3 | import { MEMOIZE_TTL } from '@server/initializers/constants' | 3 | import { MEMOIZE_TTL } from '@server/initializers/constants' |
4 | import { buildAvailableActivities } from '@server/lib/activitypub/activity' | 4 | import { buildAvailableActivities } from '@server/lib/activitypub/activity' |
5 | import { StatsManager } from '@server/lib/stat-manager' | 5 | import { StatsManager } from '@server/lib/stat-manager' |
diff --git a/server/lib/opentelemetry/metric-helpers/viewers-observers-builder.ts b/server/lib/opentelemetry/metric-helpers/viewers-observers-builder.ts index 634e5bbc9..c65f8ddae 100644 --- a/server/lib/opentelemetry/metric-helpers/viewers-observers-builder.ts +++ b/server/lib/opentelemetry/metric-helpers/viewers-observers-builder.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Meter } from '@opentelemetry/api-metrics' | 1 | import { Meter } from '@opentelemetry/api' |
2 | import { VideoScope, ViewerScope } from '@server/lib/views/shared' | 2 | import { VideoScope, ViewerScope } from '@server/lib/views/shared' |
3 | import { VideoViewsManager } from '@server/lib/views/video-views-manager' | 3 | import { VideoViewsManager } from '@server/lib/views/video-views-manager' |
4 | 4 | ||
diff --git a/server/lib/opentelemetry/tracing.ts b/server/lib/opentelemetry/tracing.ts index b1c3bd173..9a81680b2 100644 --- a/server/lib/opentelemetry/tracing.ts +++ b/server/lib/opentelemetry/tracing.ts | |||
@@ -6,8 +6,8 @@ import { DnsInstrumentation } from '@opentelemetry/instrumentation-dns' | |||
6 | import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express' | 6 | import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express' |
7 | import FsInstrumentation from '@opentelemetry/instrumentation-fs' | 7 | import FsInstrumentation from '@opentelemetry/instrumentation-fs' |
8 | import { HttpInstrumentation } from '@opentelemetry/instrumentation-http' | 8 | import { HttpInstrumentation } from '@opentelemetry/instrumentation-http' |
9 | import { IORedisInstrumentation } from '@opentelemetry/instrumentation-ioredis' | ||
9 | import { PgInstrumentation } from '@opentelemetry/instrumentation-pg' | 10 | import { PgInstrumentation } from '@opentelemetry/instrumentation-pg' |
10 | import { RedisInstrumentation } from '@opentelemetry/instrumentation-redis-4' | ||
11 | import { Resource } from '@opentelemetry/resources' | 11 | import { Resource } from '@opentelemetry/resources' |
12 | import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base' | 12 | import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base' |
13 | import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node' | 13 | import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node' |
@@ -58,7 +58,7 @@ function registerOpentelemetryTracing () { | |||
58 | new DnsInstrumentation(), | 58 | new DnsInstrumentation(), |
59 | new HttpInstrumentation(), | 59 | new HttpInstrumentation(), |
60 | new ExpressInstrumentation(), | 60 | new ExpressInstrumentation(), |
61 | new RedisInstrumentation({ | 61 | new IORedisInstrumentation({ |
62 | dbStatementSerializer: function (cmdName, cmdArgs) { | 62 | dbStatementSerializer: function (cmdName, cmdArgs) { |
63 | return [ cmdName, ...cmdArgs ].join(' ') | 63 | return [ cmdName, ...cmdArgs ].join(' ') |
64 | } | 64 | } |