remove tests for end-of-life aws-sdk v2, fix kinesis test latency

Author: jj22ee

package-lock.json

@@ -58,6 +58,7 @@
     "@aws-sdk/client-sns": "3.85.0",
     "@aws-sdk/client-sqs": "3.85.0",
     "@aws-sdk/types": "3.78.0",
+    "@smithy/node-http-handler": "2.4.0",
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/contrib-test-utils": "^0.41.0",
     "@opentelemetry/sdk-trace-base": "^1.8.0",

plugins/node/opentelemetry-instrumentation-aws-sdk/package.json

@@ -23,8 +23,8 @@ import { AttributeNames } from '../src/enums';
 registerInstrumentationTesting(new AwsInstrumentation());
 
 import { DescribeStreamCommand, KinesisClient } from '@aws-sdk/client-kinesis';
-import * as AWS from 'aws-sdk';
-import { AWSError } from 'aws-sdk';
+import { NodeHttpHandler } from '@smithy/node-http-handler';
+import * as fs from 'fs';
 import * as nock from 'nock';
 
 import { SpanKind } from '@opentelemetry/api';
@@ -33,66 +33,31 @@ import { expect } from 'expect';
 
 const region = 'us-east-1';
 
-describe('Kinesis - v2', () => {
-  let kinesis: AWS.Kinesis;
-  beforeEach(() => {
-    AWS.config.credentials = {
-      accessKeyId: 'test key id',
-      expired: false,
-      expireTime: new Date(),
-      secretAccessKey: 'test acc key',
-      sessionToken: 'test token',
-    };
-  });
-
-  describe('DescribeStream', () => {
-    it('adds Stream Name', async () => {
-      kinesis = new AWS.Kinesis({ region: region });
-      const dummyStreamName = 'dummy-stream-name';
-
-      nock(`https://kinesis.${region}.amazonaws.com`)
-        .get('/')
-        .reply(200, 'null');
-
-      await kinesis
-        .describeStream(
-          {
-            StreamName: dummyStreamName,
-          },
-          (err: AWSError) => {
-            expect(err).toBeFalsy();
-          }
-        )
-        .promise();
-
-      const testSpans = getTestSpans();
-      const describeSpans = testSpans.filter((s: ReadableSpan) => {
-        return s.name === 'Kinesis.DescribeStream';
-      });
-      expect(describeSpans.length).toBe(1);
-      const describeSpan = describeSpans[0];
-      expect(
-        describeSpan.attributes[AttributeNames.AWS_KINESIS_STREAM_NAME]
-      ).toBe(dummyStreamName);
-      expect(describeSpan.kind).toBe(SpanKind.CLIENT);
-    });
-  });
-});
-
 describe('Kinesis - v3', () => {
   describe('DescribeStream', () => {
-    it('adds Stream Name', async () => {
+    it('Request span attributes - adds Stream Name', async () => {
       const dummyStreamName = 'dummy-stream-name';
 
-      nock(`https://kinesis.${region}.amazonaws.com/`)
+      nock(`https://kinesis.${region}.amazonaws.com`)
         .post('/')
-        .reply(200, 'null');
+        .reply(
+          200,
+          fs.readFileSync(
+            './test/mock-responses/kinesis-describe-stream.json',
+            'utf8'
+          )
+        );
 
       const params = {
         StreamName: dummyStreamName,
       };
-      const client = new KinesisClient({ region });
-      await client.send(new DescribeStreamCommand(params)).catch(() => {});
+
+      // Use NodeHttpHandler to use HTTP instead of HTTP2 because nock does not support HTTP2
+      const client = new KinesisClient({
+        region: region,
+        requestHandler: new NodeHttpHandler(),
+      });
+      await client.send(new DescribeStreamCommand(params));
 
       const testSpans: ReadableSpan[] = getTestSpans();
       const describeSpans: ReadableSpan[] = testSpans.filter(

plugins/node/opentelemetry-instrumentation-aws-sdk/test/kinesis.test.ts

@@ -0,0 +1 @@
+{"StreamDescription":{"EncryptionType":"NONE","EnhancedMonitoring":[{"ShardLevelMetrics":[]}],"HasMoreShards":false,"RetentionPeriodHours":24,"Shards":[{"HashKeyRange":{"EndingHashKey":"113238940823489329203432849230874303284","StartingHashKey":"0"},"SequenceNumberRange":{"StartingSequenceNumber":"43987583475293457385930053489574375382543783454534789435"},"ShardId":"shardId-000000000000"},{"HashKeyRange":{"EndingHashKey":"226854911280625642308916401214512140969","StartingHashKey":"113427455579312821154458202477256070485"},"SequenceNumberRange":{"StartingSequenceNumber":"49654869303348141538950437146463849462533012903803486226"},"ShardId":"shardId-000000000001"},{"HashKeyRange":{"EndingHashKey":"340282366920284953463374607431768211455","StartingHashKey":"226854911280625642308916382954512140970"},"SequenceNumberRange":{"StartingSequenceNumber":"49654869303370442228501967769610713180805661265309466658"},"ShardId":"shardId-000000000002"}],"StreamARN":"arn:aws:kinesis:us-east-1:123456789012:stream/dummy-stream-name","StreamCreationTimestamp":1.723630733E9,"StreamModeDetails":{"StreamMode":"PROVISIONED"},"StreamName":"dummy-stream-name","StreamStatus":"ACTIVE"}}

plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/kinesis-describe-stream.json

@@ -23,8 +23,6 @@ import { AttributeNames } from '../src/enums';
 registerInstrumentationTesting(new AwsInstrumentation());
 
 import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
-import * as AWS from 'aws-sdk';
-import { AWSError } from 'aws-sdk';
 import * as fs from 'fs';
 import * as nock from 'nock';
 
@@ -34,53 +32,9 @@ import { expect } from 'expect';
 
 const region = 'us-east-1';
 
-describe('S3 - v2', () => {
-  let s3: AWS.S3;
-  beforeEach(() => {
-    AWS.config.credentials = {
-      accessKeyId: 'test key id',
-      expired: false,
-      expireTime: new Date(),
-      secretAccessKey: 'test acc key',
-      sessionToken: 'test token',
-    };
-  });
-
-  describe('ListObjects', () => {
-    it('adds bucket Name', async () => {
-      s3 = new AWS.S3({ region: region });
-      const dummyBucketName = 'dummy-bucket-name';
-
-      nock(`https://s3.${region}.amazonaws.com`).get('/').reply(200, 'null');
-
-      await s3
-        .listObjects(
-          {
-            Bucket: dummyBucketName,
-          },
-          (err: AWSError) => {
-            expect(err).toBeFalsy();
-          }
-        )
-        .promise();
-
-      const testSpans = getTestSpans();
-      const listObjectsSpans = testSpans.filter((s: ReadableSpan) => {
-        return s.name === 'S3.ListObjects';
-      });
-      expect(listObjectsSpans.length).toBe(1);
-      const listObjectsSpan = listObjectsSpans[0];
-      expect(listObjectsSpan.attributes[AttributeNames.AWS_S3_BUCKET]).toBe(
-        dummyBucketName
-      );
-      expect(listObjectsSpan.kind).toBe(SpanKind.CLIENT);
-    });
-  });
-});
-
 describe('S3 - v3', () => {
   describe('PutObject', () => {
-    it('adds bucket Name', async () => {
+    it('Request span attributes - adds bucket Name', async () => {
       const dummyBucketName = 'ot-demo-test';
 
       nock(`https://${dummyBucketName}.s3.${region}.amazonaws.com/`)