fix(plugin-ioredis): end span on response from the server and set span status according to response

plugins/node/opentelemetry-plugin-ioredis/src/utils.ts

@@ -29,8 +29,13 @@ import {
 
 const endSpan = (span: Span, err: NodeJS.ErrnoException | null | undefined) => {
   if (err) {
+    let code = CanonicalCode.UNKNOWN;
+    if (err.message.startsWith('NOSCRIPT')) {
+      code = CanonicalCode.NOT_FOUND;
+    }
+
     span.setStatus({
-      code: CanonicalCode.UNKNOWN,
+      code,
       message: err.message,
     });
   } else {
@@ -111,7 +116,20 @@ export const traceSendCommand = (
 
     try {
       const result = original.apply(this, arguments);
-      endSpan(span, null);
+
+      const origResolve = cmd.resolve;
+      /* eslint-disable @typescript-eslint/no-explicit-any */
+      cmd.resolve = (result: any) => {
+        endSpan(span, null);
+        origResolve(result);
+      };
+
+      const origReject = cmd.reject;
+      cmd.reject = (err: Error) => {
+        endSpan(span, err);
+        origReject(err);
+      };
+
       return result;
     } catch (error) {
       endSpan(span, error);

plugins/node/opentelemetry-plugin-ioredis/test/ioredis.test.ts

@@ -127,9 +127,11 @@ describe('ioredis', () => {
         assert.strictEqual(endedSpans.length, 3);
         assert.strictEqual(endedSpans[2].name, 'test span');
 
-        client.quit(done);
-        assert.strictEqual(endedSpans.length, 4);
-        assert.strictEqual(endedSpans[3].name, 'quit');
+        client.quit(() => {
+          assert.strictEqual(endedSpans.length, 4);
+          assert.strictEqual(endedSpans[3].name, 'quit');
+          done();
+        });
       };
       const errorHandler = (err: Error) => {
         assert.ifError(err);
@@ -253,6 +255,23 @@ describe('ioredis', () => {
         });
       });
 
+      it('should set span with error when redis return reject', async () => {
+        const span = provider.getTracer('ioredis-test').startSpan('test span');
+        await provider.getTracer('ioredis-test').withSpan(span, async () => {
+          await client.set('non-int-key', 'no-int-value');
+          try {
+            // should throw 'ReplyError: ERR value is not an integer or out of range'
+            // because the value im the key is not numeric and we try to increment it
+            await client.incr('non-int-key');
+          } catch (ex) {
+            const endedSpans = memoryExporter.getFinishedSpans();
+            assert.strictEqual(endedSpans.length, 2);
+            // redis 'incr' operation failed with exception, so span should indicate it
+            assert.notStrictEqual(endedSpans[1].status.code, CanonicalCode.OK);
+          }
+        });
+      });
+
       it('should create a child span for streamify scanning', done => {
         const attributes = {
           ...DEFAULT_ATTRIBUTES,
@@ -312,10 +331,10 @@ describe('ioredis', () => {
             const spanNames = [
               'connect',
               'connect',
-              'subscribe',
               'info',
               'info',
               'subscribe',
+              'subscribe',
               'publish',
               'publish',
               'unsubscribe',
@@ -378,7 +397,9 @@ describe('ioredis', () => {
               SpanKind.CLIENT,
               attributes,
               [],
-              okStatus
+              {
+                code: CanonicalCode.NOT_FOUND,
+              }
             );
             testUtils.assertPropagation(endedSpans[0], span);
             done();