Merge 9d7209e into 64c8ef5

Author: vreynolds

packages/opentelemetry-resource-detector-aws/src/detectors/AwsEksDetector.ts

@@ -66,7 +66,7 @@ export class AwsEksDetector implements Detector {
       await AwsEksDetector.fileAccessAsync(this.K8S_TOKEN_PATH);
       const k8scert = await AwsEksDetector.readFileAsync(this.K8S_CERT_PATH);
 
-      if (!this._isEks(k8scert)) {
+      if (!(await this._isEks(k8scert))) {
         return Resource.empty();
       }
 

packages/opentelemetry-resource-detector-aws/test/detectors/AwsEksDetector.test.ts

@@ -247,8 +247,7 @@ describe('awsEksDetector', () => {
   });
 
   describe('on unsuccesful request', () => {
-    it('should throw when receiving error response code', async () => {
-      const expectedError = new Error('EKS metadata api request timed out.');
+    it('should return an empty resource when timed out', async () => {
       fileStub = sinon
         .stub(AwsEksDetector, 'fileAccessAsync' as any)
         .resolves();
@@ -265,17 +264,14 @@ describe('awsEksDetector', () => {
         .delayConnection(2500)
         .reply(200, () => mockedAwsAuth);
 
-      try {
-        await awsEksDetector.detect();
-      } catch (err) {
-        assert.deepStrictEqual(err, expectedError);
-      }
-
+      const resource: Resource = await awsEksDetector.detect();
       scope.done();
-    });
 
-    it('should return an empty resource when timed out', async () => {
-      const expectedError = new Error('Failed to load page, status code: 404');
+      assert.ok(resource);
+      assertEmptyResource(resource);
+    }).timeout(awsEksDetector.TIMEOUT_MS + 100);
+
+    it('should return an empty resource when receiving error response code', async () => {
       fileStub = sinon
         .stub(AwsEksDetector, 'fileAccessAsync' as any)
         .resolves();
@@ -291,13 +287,11 @@ describe('awsEksDetector', () => {
         .matchHeader('Authorization', k8s_token)
         .reply(404, () => new Error());
 
-      try {
-        await awsEksDetector.detect();
-      } catch (err) {
-        assert.deepStrictEqual(err, expectedError);
-      }
-
+      const resource: Resource = await awsEksDetector.detect();
       scope.done();
+
+      assert.ok(resource);
+      assertEmptyResource(resource);
     });
   });
 });