loosen types on v2/v3 tests (mostly) to not have to have v3 redis types around to compile

Author: trentm

plugins/node/opentelemetry-instrumentation-redis/src/v2-v3/internal-types.ts

@@ -31,3 +31,6 @@ export interface RedisCommand {
   callback: (err: Error | null, reply: unknown) => void;
   call_on_write: boolean;
 }
+
+// Exported from "@types/[email protected]".
+export type Callback<T> = (err: Error | null, reply: T) => void;

plugins/node/opentelemetry-instrumentation-redis/src/v2-v3/utils.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import type * as redisTypes from 'redis';
 import { context, Span, SpanStatusCode } from '@opentelemetry/api';
 import { EventEmitter } from 'events';
 
@@ -29,14 +28,14 @@ export const endSpan = (span: Span, err?: Error | null) => {
 };
 
 export const getTracedCreateClient = (original: Function) => {
-  return function createClientTrace(this: redisTypes.RedisClient) {
-    const client: redisTypes.RedisClient = original.apply(this, arguments);
+  return function createClientTrace(this: any) {
+    const client = original.apply(this, arguments);
     return context.bind(context.active(), client);
   };
 };
 
 export const getTracedCreateStreamTrace = (original: Function) => {
-  return function create_stream_trace(this: redisTypes.RedisClient) {
+  return function create_stream_trace(this: any) {
     if (!Object.prototype.hasOwnProperty.call(this, 'stream')) {
       Object.defineProperty(this, 'stream', {
         get() {

plugins/node/opentelemetry-instrumentation-redis/test/v2-v3/redis.test.ts

@@ -43,7 +43,7 @@ const instrumentation = registerInstrumentationTesting(
   new RedisInstrumentation()
 );
 
-import * as redisTypes from 'redis';
+import type { Callback } from '../../src/v2-v3/internal-types';
 import { RedisResponseCustomAttributeFunction } from '../../src/types';
 
 const CONFIG = {
@@ -65,7 +65,7 @@ const unsetStatus: SpanStatus = {
 };
 
 describe('redis v2-v3', () => {
-  let redis: typeof redisTypes;
+  let redis: any;
   const shouldTestLocal = process.env.RUN_REDIS_TESTS_LOCAL;
   const shouldTest = process.env.RUN_REDIS_TESTS || shouldTestLocal;
   const tracer = trace.getTracer('external');
@@ -95,7 +95,7 @@ describe('redis v2-v3', () => {
   describe('#createClient()', () => {
     it('should propagate the current span to event handlers', done => {
       const span = tracer.startSpan('test span');
-      let client: redisTypes.RedisClient;
+      let client: any;
       const readyHandler = () => {
         assert.strictEqual(trace.getSpan(context.active()), span);
         client.quit(done);
@@ -114,43 +114,42 @@ describe('redis v2-v3', () => {
   });
 
   describe('#send_internal_message()', () => {
-    let client: redisTypes.RedisClient;
+    let client: any;
 
     const REDIS_OPERATIONS: Array<{
       description: string;
       command: string;
       args: string[];
       expectedDbStatement: string;
-      method: (cb: redisTypes.Callback<unknown>) => unknown;
+      method: (cb: Callback<unknown>) => unknown;
     }> = [
       {
         description: 'insert',
         command: 'hset',
         args: ['hash', 'random', 'random'],
         expectedDbStatement: 'hash random [1 other arguments]',
-        method: (cb: redisTypes.Callback<number>) =>
+        method: (cb: Callback<number>) =>
           client.hset('hash', 'random', 'random', cb),
       },
       {
         description: 'get',
         command: 'get',
         args: ['test'],
         expectedDbStatement: 'test',
-        method: (cb: redisTypes.Callback<string | null>) =>
-          client.get('test', cb),
+        method: (cb: Callback<string | null>) => client.get('test', cb),
       },
       {
         description: 'delete',
         command: 'del',
         args: ['test'],
         expectedDbStatement: 'test',
-        method: (cb: redisTypes.Callback<number>) => client.del('test', cb),
+        method: (cb: Callback<number>) => client.del('test', cb),
       },
     ];
 
     before(done => {
       client = redis.createClient(URL);
-      client.on('error', err => {
+      client.on('error', (err: any) => {
         done(err);
       });
       client.on('ready', done);