Skip to content

Commit 5470bf5

Browse files
garysassanogarysassano
committed
up
1 parent 5f214eb commit 5470bf5

File tree

3 files changed

+152
-147
lines changed

3 files changed

+152
-147
lines changed

‎detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetector.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616

1717
import { Detector, IResource } from '@opentelemetry/resources';
18-
1918
import { awsEcsDetectorSync } from './AwsEcsDetectorSync';
2019

2120
/**

‎detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetector.test.ts‎

Lines changed: 76 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,28 @@ import * as sinon from 'sinon';
2020
import { awsEcsDetector, AwsEcsDetectorSync } from '../../src';
2121
import {
2222
assertEmptyResource,
23-
assertCloudResource,
2423
assertContainerResource,
2524
} from '@opentelemetry/contrib-test-utils';
2625
import { Resource } from '@opentelemetry/resources';
2726
import {
28-
SEMRESATTRS_CLOUD_PLATFORM,
29-
SEMRESATTRS_AWS_ECS_CONTAINER_ARN,
30-
SEMRESATTRS_AWS_ECS_CLUSTER_ARN,
31-
SEMRESATTRS_AWS_ECS_LAUNCHTYPE,
32-
SEMRESATTRS_AWS_ECS_TASK_ARN,
33-
SEMRESATTRS_AWS_ECS_TASK_REVISION,
34-
SEMRESATTRS_AWS_ECS_TASK_FAMILY,
35-
SEMRESATTRS_AWS_LOG_GROUP_NAMES,
36-
SEMRESATTRS_AWS_LOG_GROUP_ARNS,
37-
SEMRESATTRS_AWS_LOG_STREAM_NAMES,
38-
SEMRESATTRS_AWS_LOG_STREAM_ARNS,
39-
CLOUDPROVIDERVALUES_AWS,
40-
CLOUDPLATFORMVALUES_AWS_ECS,
41-
} from '@opentelemetry/semantic-conventions';
27+
ATTR_AWS_ECS_CLUSTER_ARN,
28+
ATTR_AWS_ECS_CONTAINER_ARN,
29+
ATTR_AWS_ECS_LAUNCHTYPE,
30+
ATTR_AWS_ECS_TASK_ARN,
31+
ATTR_AWS_ECS_TASK_FAMILY,
32+
ATTR_AWS_ECS_TASK_REVISION,
33+
ATTR_AWS_LOG_GROUP_ARNS,
34+
ATTR_AWS_LOG_GROUP_NAMES,
35+
ATTR_AWS_LOG_STREAM_ARNS,
36+
ATTR_AWS_LOG_STREAM_NAMES,
37+
ATTR_CLOUD_ACCOUNT_ID,
38+
ATTR_CLOUD_AVAILABILITY_ZONE,
39+
ATTR_CLOUD_PLATFORM,
40+
ATTR_CLOUD_PROVIDER,
41+
ATTR_CLOUD_REGION,
42+
CLOUD_PLATFORM_VALUE_AWS_ECS,
43+
CLOUD_PROVIDER_VALUE_AWS,
44+
} from '../../src/semconv';
4245
// Patch until the OpenTelemetry SDK is updated to ship this attribute
4346
import { SemanticResourceAttributes as AdditionalSemanticResourceAttributes } from '../../src/detectors/SemanticResourceAttributes';
4447
import { readFileSync } from 'fs';
@@ -65,70 +68,70 @@ const assertEcsResource = (
6568
resource: Resource,
6669
validations: EcsResourceAttributes
6770
) => {
68-
assertCloudResource(resource, {
69-
provider: CLOUDPROVIDERVALUES_AWS,
70-
accountId: validations.accountId,
71-
region: validations.region,
72-
zone: validations.zone,
73-
});
7471
assert.strictEqual(
75-
resource.attributes[SEMRESATTRS_CLOUD_PLATFORM],
76-
CLOUDPLATFORMVALUES_AWS_ECS
72+
resource.attributes[ATTR_CLOUD_PROVIDER],
73+
CLOUD_PROVIDER_VALUE_AWS
74+
);
75+
assert.strictEqual(
76+
resource.attributes[ATTR_CLOUD_ACCOUNT_ID],
77+
validations.accountId
78+
);
79+
assert.strictEqual(
80+
resource.attributes[ATTR_CLOUD_REGION],
81+
validations.region
82+
);
83+
assert.strictEqual(
84+
resource.attributes[ATTR_CLOUD_AVAILABILITY_ZONE],
85+
validations.zone
86+
);
87+
assert.strictEqual(
88+
resource.attributes[ATTR_CLOUD_PLATFORM],
89+
CLOUD_PLATFORM_VALUE_AWS_ECS
90+
);
91+
assert.strictEqual(
92+
resource.attributes[ATTR_AWS_ECS_CONTAINER_ARN],
93+
validations.containerArn
7794
);
78-
if (validations.containerArn)
79-
assert.strictEqual(
80-
resource.attributes[SEMRESATTRS_AWS_ECS_CONTAINER_ARN],
81-
validations.containerArn
82-
);
8395
assert.strictEqual(
8496
resource.attributes[AdditionalSemanticResourceAttributes.CLOUD_RESOURCE_ID],
8597
validations.containerArn
8698
);
87-
if (validations.clusterArn)
88-
assert.strictEqual(
89-
resource.attributes[SEMRESATTRS_AWS_ECS_CLUSTER_ARN],
90-
validations.clusterArn
91-
);
92-
if (validations.launchType)
93-
assert.strictEqual(
94-
resource.attributes[SEMRESATTRS_AWS_ECS_LAUNCHTYPE],
95-
validations.launchType
96-
);
97-
if (validations.taskArn)
98-
assert.strictEqual(
99-
resource.attributes[SEMRESATTRS_AWS_ECS_TASK_ARN],
100-
validations.taskArn
101-
);
102-
if (validations.taskFamily)
103-
assert.strictEqual(
104-
resource.attributes[SEMRESATTRS_AWS_ECS_TASK_FAMILY],
105-
validations.taskFamily
106-
);
107-
if (validations.taskRevision)
108-
assert.strictEqual(
109-
resource.attributes[SEMRESATTRS_AWS_ECS_TASK_REVISION],
110-
validations.taskRevision
111-
);
112-
if (validations.logGroupNames)
113-
assert.deepEqual(
114-
resource.attributes[SEMRESATTRS_AWS_LOG_GROUP_NAMES],
115-
validations.logGroupNames
116-
);
117-
if (validations.logGroupArns)
118-
assert.deepEqual(
119-
resource.attributes[SEMRESATTRS_AWS_LOG_GROUP_ARNS],
120-
validations.logGroupArns
121-
);
122-
if (validations.logStreamNames)
123-
assert.deepEqual(
124-
resource.attributes[SEMRESATTRS_AWS_LOG_STREAM_NAMES],
125-
validations.logStreamNames
126-
);
127-
if (validations.logStreamArns)
128-
assert.deepEqual(
129-
resource.attributes[SEMRESATTRS_AWS_LOG_STREAM_ARNS],
130-
validations.logStreamArns
131-
);
99+
assert.strictEqual(
100+
resource.attributes[ATTR_AWS_ECS_CLUSTER_ARN],
101+
validations.clusterArn
102+
);
103+
assert.strictEqual(
104+
resource.attributes[ATTR_AWS_ECS_LAUNCHTYPE],
105+
validations.launchType
106+
);
107+
assert.strictEqual(
108+
resource.attributes[ATTR_AWS_ECS_TASK_ARN],
109+
validations.taskArn
110+
);
111+
assert.strictEqual(
112+
resource.attributes[ATTR_AWS_ECS_TASK_FAMILY],
113+
validations.taskFamily
114+
);
115+
assert.strictEqual(
116+
resource.attributes[ATTR_AWS_ECS_TASK_REVISION],
117+
validations.taskRevision
118+
);
119+
assert.deepEqual(
120+
resource.attributes[ATTR_AWS_LOG_GROUP_NAMES],
121+
validations.logGroupNames
122+
);
123+
assert.deepEqual(
124+
resource.attributes[ATTR_AWS_LOG_GROUP_ARNS],
125+
validations.logGroupArns
126+
);
127+
assert.deepEqual(
128+
resource.attributes[ATTR_AWS_LOG_STREAM_NAMES],
129+
validations.logStreamNames
130+
);
131+
assert.deepEqual(
132+
resource.attributes[ATTR_AWS_LOG_STREAM_ARNS],
133+
validations.logStreamArns
134+
);
132135
};
133136

134137
describe('AwsEcsResourceDetector', () => {

‎detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetectorSync.test.ts‎

Lines changed: 76 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,28 @@ import * as sinon from 'sinon';
2020
import { awsEcsDetectorSync, AwsEcsDetectorSync } from '../../src';
2121
import {
2222
assertEmptyResource,
23-
assertCloudResource,
2423
assertContainerResource,
2524
} from '@opentelemetry/contrib-test-utils';
2625
import { Resource } from '@opentelemetry/resources';
2726
import {
28-
SEMRESATTRS_CLOUD_PLATFORM,
29-
SEMRESATTRS_AWS_ECS_CONTAINER_ARN,
30-
SEMRESATTRS_AWS_ECS_CLUSTER_ARN,
31-
SEMRESATTRS_AWS_ECS_LAUNCHTYPE,
32-
SEMRESATTRS_AWS_ECS_TASK_ARN,
33-
SEMRESATTRS_AWS_ECS_TASK_REVISION,
34-
SEMRESATTRS_AWS_ECS_TASK_FAMILY,
35-
SEMRESATTRS_AWS_LOG_GROUP_NAMES,
36-
SEMRESATTRS_AWS_LOG_GROUP_ARNS,
37-
SEMRESATTRS_AWS_LOG_STREAM_NAMES,
38-
SEMRESATTRS_AWS_LOG_STREAM_ARNS,
39-
CLOUDPROVIDERVALUES_AWS,
40-
CLOUDPLATFORMVALUES_AWS_ECS,
41-
} from '@opentelemetry/semantic-conventions';
27+
ATTR_AWS_ECS_CLUSTER_ARN,
28+
ATTR_AWS_ECS_CONTAINER_ARN,
29+
ATTR_AWS_ECS_LAUNCHTYPE,
30+
ATTR_AWS_ECS_TASK_ARN,
31+
ATTR_AWS_ECS_TASK_FAMILY,
32+
ATTR_AWS_ECS_TASK_REVISION,
33+
ATTR_AWS_LOG_GROUP_ARNS,
34+
ATTR_AWS_LOG_GROUP_NAMES,
35+
ATTR_AWS_LOG_STREAM_ARNS,
36+
ATTR_AWS_LOG_STREAM_NAMES,
37+
ATTR_CLOUD_ACCOUNT_ID,
38+
ATTR_CLOUD_AVAILABILITY_ZONE,
39+
ATTR_CLOUD_PLATFORM,
40+
ATTR_CLOUD_PROVIDER,
41+
ATTR_CLOUD_REGION,
42+
CLOUD_PLATFORM_VALUE_AWS_ECS,
43+
CLOUD_PROVIDER_VALUE_AWS,
44+
} from '../../src/semconv';
4245
// Patch until the OpenTelemetry SDK is updated to ship this attribute
4346
import { SemanticResourceAttributes as AdditionalSemanticResourceAttributes } from '../../src/detectors/SemanticResourceAttributes';
4447
import { readFileSync } from 'fs';
@@ -65,70 +68,70 @@ const assertEcsResource = (
6568
resource: Resource,
6669
validations: EcsResourceAttributes
6770
) => {
68-
assertCloudResource(resource, {
69-
provider: CLOUDPROVIDERVALUES_AWS,
70-
accountId: validations.accountId,
71-
region: validations.region,
72-
zone: validations.zone,
73-
});
7471
assert.strictEqual(
75-
resource.attributes[SEMRESATTRS_CLOUD_PLATFORM],
76-
CLOUDPLATFORMVALUES_AWS_ECS
72+
resource.attributes[ATTR_CLOUD_PROVIDER],
73+
CLOUD_PROVIDER_VALUE_AWS
74+
);
75+
assert.strictEqual(
76+
resource.attributes[ATTR_CLOUD_ACCOUNT_ID],
77+
validations.accountId
78+
);
79+
assert.strictEqual(
80+
resource.attributes[ATTR_CLOUD_REGION],
81+
validations.region
82+
);
83+
assert.strictEqual(
84+
resource.attributes[ATTR_CLOUD_AVAILABILITY_ZONE],
85+
validations.zone
86+
);
87+
assert.strictEqual(
88+
resource.attributes[ATTR_CLOUD_PLATFORM],
89+
CLOUD_PLATFORM_VALUE_AWS_ECS
90+
);
91+
assert.strictEqual(
92+
resource.attributes[ATTR_AWS_ECS_CONTAINER_ARN],
93+
validations.containerArn
7794
);
78-
if (validations.containerArn)
79-
assert.strictEqual(
80-
resource.attributes[SEMRESATTRS_AWS_ECS_CONTAINER_ARN],
81-
validations.containerArn
82-
);
8395
assert.strictEqual(
8496
resource.attributes[AdditionalSemanticResourceAttributes.CLOUD_RESOURCE_ID],
8597
validations.containerArn
8698
);
87-
if (validations.clusterArn)
88-
assert.strictEqual(
89-
resource.attributes[SEMRESATTRS_AWS_ECS_CLUSTER_ARN],
90-
validations.clusterArn
91-
);
92-
if (validations.launchType)
93-
assert.strictEqual(
94-
resource.attributes[SEMRESATTRS_AWS_ECS_LAUNCHTYPE],
95-
validations.launchType
96-
);
97-
if (validations.taskArn)
98-
assert.strictEqual(
99-
resource.attributes[SEMRESATTRS_AWS_ECS_TASK_ARN],
100-
validations.taskArn
101-
);
102-
if (validations.taskFamily)
103-
assert.strictEqual(
104-
resource.attributes[SEMRESATTRS_AWS_ECS_TASK_FAMILY],
105-
validations.taskFamily
106-
);
107-
if (validations.taskRevision)
108-
assert.strictEqual(
109-
resource.attributes[SEMRESATTRS_AWS_ECS_TASK_REVISION],
110-
validations.taskRevision
111-
);
112-
if (validations.logGroupNames)
113-
assert.deepEqual(
114-
resource.attributes[SEMRESATTRS_AWS_LOG_GROUP_NAMES],
115-
validations.logGroupNames
116-
);
117-
if (validations.logGroupArns)
118-
assert.deepEqual(
119-
resource.attributes[SEMRESATTRS_AWS_LOG_GROUP_ARNS],
120-
validations.logGroupArns
121-
);
122-
if (validations.logStreamNames)
123-
assert.deepEqual(
124-
resource.attributes[SEMRESATTRS_AWS_LOG_STREAM_NAMES],
125-
validations.logStreamNames
126-
);
127-
if (validations.logStreamArns)
128-
assert.deepEqual(
129-
resource.attributes[SEMRESATTRS_AWS_LOG_STREAM_ARNS],
130-
validations.logStreamArns
131-
);
99+
assert.strictEqual(
100+
resource.attributes[ATTR_AWS_ECS_CLUSTER_ARN],
101+
validations.clusterArn
102+
);
103+
assert.strictEqual(
104+
resource.attributes[ATTR_AWS_ECS_LAUNCHTYPE],
105+
validations.launchType
106+
);
107+
assert.strictEqual(
108+
resource.attributes[ATTR_AWS_ECS_TASK_ARN],
109+
validations.taskArn
110+
);
111+
assert.strictEqual(
112+
resource.attributes[ATTR_AWS_ECS_TASK_FAMILY],
113+
validations.taskFamily
114+
);
115+
assert.strictEqual(
116+
resource.attributes[ATTR_AWS_ECS_TASK_REVISION],
117+
validations.taskRevision
118+
);
119+
assert.deepEqual(
120+
resource.attributes[ATTR_AWS_LOG_GROUP_NAMES],
121+
validations.logGroupNames
122+
);
123+
assert.deepEqual(
124+
resource.attributes[ATTR_AWS_LOG_GROUP_ARNS],
125+
validations.logGroupArns
126+
);
127+
assert.deepEqual(
128+
resource.attributes[ATTR_AWS_LOG_STREAM_NAMES],
129+
validations.logStreamNames
130+
);
131+
assert.deepEqual(
132+
resource.attributes[ATTR_AWS_LOG_STREAM_ARNS],
133+
validations.logStreamArns
134+
);
132135
};
133136

134137
describe('AwsEcsResourceDetectorSync', () => {

0 commit comments

Comments
 (0)