From 077600e03774203c57ba7e8b122bd18faa3e51e6 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 15 Nov 2022 13:27:46 +0100 Subject: Upgrade server dependencies --- .../lib/opentelemetry/metric-helpers/job-queue-observers-builder.ts | 2 +- server/lib/opentelemetry/metric-helpers/lives-observers-builder.ts | 2 +- server/lib/opentelemetry/metric-helpers/nodejs-observers-builder.ts | 2 +- server/lib/opentelemetry/metric-helpers/playback-metrics.ts | 2 +- server/lib/opentelemetry/metric-helpers/stats-observers-builder.ts | 2 +- server/lib/opentelemetry/metric-helpers/viewers-observers-builder.ts | 2 +- server/lib/opentelemetry/tracing.ts | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'server/lib') 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 @@ -import { Meter } from '@opentelemetry/api-metrics' +import { Meter } from '@opentelemetry/api' import { JobQueue } from '@server/lib/job-queue' 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 @@ -import { Meter } from '@opentelemetry/api-metrics' +import { Meter } from '@opentelemetry/api' import { VideoModel } from '@server/models/video/video' 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 @@ import { readdir } from 'fs-extra' import { constants, PerformanceObserver } from 'perf_hooks' import * as process from 'process' -import { Meter, ObservableResult } from '@opentelemetry/api-metrics' +import { Meter, ObservableResult } from '@opentelemetry/api' import { ExplicitBucketHistogramAggregation } from '@opentelemetry/sdk-metrics' import { View } from '@opentelemetry/sdk-metrics/build/src/view/View' 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 @@ -import { Counter, Meter } from '@opentelemetry/api-metrics' +import { Counter, Meter } from '@opentelemetry/api' import { MVideoImmutable } from '@server/types/models' import { PlaybackMetricCreate } from '@shared/models' 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 @@ import memoizee from 'memoizee' -import { Meter } from '@opentelemetry/api-metrics' +import { Meter } from '@opentelemetry/api' import { MEMOIZE_TTL } from '@server/initializers/constants' import { buildAvailableActivities } from '@server/lib/activitypub/activity' 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 @@ -import { Meter } from '@opentelemetry/api-metrics' +import { Meter } from '@opentelemetry/api' import { VideoScope, ViewerScope } from '@server/lib/views/shared' import { VideoViewsManager } from '@server/lib/views/video-views-manager' 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' import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express' import FsInstrumentation from '@opentelemetry/instrumentation-fs' import { HttpInstrumentation } from '@opentelemetry/instrumentation-http' +import { IORedisInstrumentation } from '@opentelemetry/instrumentation-ioredis' import { PgInstrumentation } from '@opentelemetry/instrumentation-pg' -import { RedisInstrumentation } from '@opentelemetry/instrumentation-redis-4' import { Resource } from '@opentelemetry/resources' import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base' import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node' @@ -58,7 +58,7 @@ function registerOpentelemetryTracing () { new DnsInstrumentation(), new HttpInstrumentation(), new ExpressInstrumentation(), - new RedisInstrumentation({ + new IORedisInstrumentation({ dbStatementSerializer: function (cmdName, cmdArgs) { return [ cmdName, ...cmdArgs ].join(' ') } -- cgit v1.2.3