Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
mmanciop committed Feb 14, 2024
1 parent a4f4488 commit 79c1e24
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@ import {
CloudPlatformValues,
SemanticResourceAttributes,
} from '@opentelemetry/semantic-conventions';
// Patch until the OpenTelemetry SDK is updated to ship this attribute
import {
SemanticResourceAttributes as AdditionalSemanticResourceAttributes
} from './SemanticResourceAttributes';
// Patch until the OpenTelemetry SDK is updated to ship this attribute
import { SemanticResourceAttributes as AdditionalSemanticResourceAttributes } from './SemanticResourceAttributes';
import * as http from 'http';
import * as util from 'util';
import * as fs from 'fs';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
/**
* Temporary addition to incomplete `SemanticResourceAttributes`
* in the OpenTelemetry SDK.
*
* See https://github.com/open-telemetry/opentelemetry-js/issues/4483
/*
* Copyright The OpenTelemetry Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
export const SemanticResourceAttributes = {
/**
* Cloud provider-specific native identifier of the monitored cloud resource
* (e.g. an ARN on AWS, a fully qualified resource ID on Azure, a full resource
* name on GCP)
*/
CLOUD_RESOURCE_ID: 'cloud.resource_id',
}
/**
* Cloud provider-specific native identifier of the monitored cloud resource
* (e.g. an ARN on AWS, a fully qualified resource ID on Azure, a full resource
* name on GCP)
*/
CLOUD_RESOURCE_ID: 'cloud.resource_id',
};
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,8 @@ import {
CloudPlatformValues,
SemanticResourceAttributes,
} from '@opentelemetry/semantic-conventions';
// Patch until the OpenTelemetry SDK is updated to ship this attribute
import {
SemanticResourceAttributes as AdditionalSemanticResourceAttributes
} from '../../src/detectors/SemanticResourceAttributes';
// Patch until the OpenTelemetry SDK is updated to ship this attribute
import { SemanticResourceAttributes as AdditionalSemanticResourceAttributes } from '../../src/detectors/SemanticResourceAttributes';
import { readFileSync } from 'fs';
import * as os from 'os';
import { join } from 'path';
Expand Down Expand Up @@ -75,10 +73,10 @@ const assertEcsResource = (
resource.attributes[SemanticResourceAttributes.AWS_ECS_CONTAINER_ARN],
validations.containerArn
);
assert.strictEqual(
resource.attributes[AdditionalSemanticResourceAttributes.CLOUD_RESOURCE_ID],
validations.containerArn
);
assert.strictEqual(
resource.attributes[AdditionalSemanticResourceAttributes.CLOUD_RESOURCE_ID],
validations.containerArn
);
if (validations.clusterArn)
assert.strictEqual(
resource.attributes[SemanticResourceAttributes.AWS_ECS_CLUSTER_ARN],
Expand Down Expand Up @@ -210,7 +208,7 @@ describe('AwsEcsResourceDetector', () => {
describe('when succesfully retrieving the data', () => {
function generateLaunchTypeTests(
resourceAttributes: EcsResourceAttributes,
suffix: String = ''
suffix = ''
) {
let nockScope: nock.Scope;

Expand Down

0 comments on commit 79c1e24

Please sign in to comment.