diff --git a/plugins/node/opentelemetry-plugin-redis/src/redis.ts b/plugins/node/opentelemetry-plugin-redis/src/redis.ts index c0458c6861..a6a908746e 100644 --- a/plugins/node/opentelemetry-plugin-redis/src/redis.ts +++ b/plugins/node/opentelemetry-plugin-redis/src/redis.ts @@ -15,7 +15,7 @@ */ import { BasePlugin } from '@opentelemetry/core'; -import * as redisTypes from 'redis'; +import type * as redisTypes from 'redis'; import * as shimmer from 'shimmer'; import { getTracedCreateClient, diff --git a/plugins/node/opentelemetry-plugin-redis/src/types.ts b/plugins/node/opentelemetry-plugin-redis/src/types.ts index 4d9daafe98..2c3be48ba4 100644 --- a/plugins/node/opentelemetry-plugin-redis/src/types.ts +++ b/plugins/node/opentelemetry-plugin-redis/src/types.ts @@ -14,8 +14,7 @@ * limitations under the License. */ -import * as redisTypes from 'redis'; -import { EventEmitter } from 'events'; +import type * as redisTypes from 'redis'; // exported from // https://github.com/NodeRedis/node_redis/blob/master/lib/command.js @@ -35,7 +34,3 @@ export interface RedisPluginClientTypes { address?: string; } - -export interface RedisPluginStreamTypes { - stream?: { get(): EventEmitter; set(val: EventEmitter): void }; -} diff --git a/plugins/node/opentelemetry-plugin-redis/src/utils.ts b/plugins/node/opentelemetry-plugin-redis/src/utils.ts index 6d486d5324..bee33d287b 100644 --- a/plugins/node/opentelemetry-plugin-redis/src/utils.ts +++ b/plugins/node/opentelemetry-plugin-redis/src/utils.ts @@ -14,13 +14,9 @@ * limitations under the License. */ -import * as redisTypes from 'redis'; +import type * as redisTypes from 'redis'; import { Tracer, SpanKind, Span, CanonicalCode } from '@opentelemetry/api'; -import { - RedisPluginStreamTypes, - RedisPluginClientTypes, - RedisCommand, -} from './types'; +import { RedisCommand, RedisPluginClientTypes } from './types'; import { EventEmitter } from 'events'; import { RedisPlugin } from './redis'; import { @@ -51,7 +47,7 @@ export const getTracedCreateStreamTrace = ( tracer: Tracer, original: Function ) => { - return function create_stream_trace(this: RedisPluginStreamTypes) { + return function create_stream_trace(this: redisTypes.RedisClient) { if (!this.stream) { Object.defineProperty(this, 'stream', { get() { @@ -72,7 +68,7 @@ export const getTracedInternalSendCommand = ( original: Function ) => { return function internal_send_command_trace( - this: redisTypes.RedisClient & RedisPluginClientTypes, + this: RedisPluginClientTypes, cmd?: RedisCommand ) { // New versions of redis (2.4+) use a single options object