Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(detector-aws): remove semconv incubating import #2668

Merged
merged 9 commits into from
Jan 20, 2025
+355 −9
Merged

fix(detector-aws): remove semconv incubating import #2668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f3bdacf
fix(detector-aws): remove semconv incubating import
garysassano Jan 17, 2025
cb29d63
Merge branch 'main' into fix-import
garysassano Jan 17, 2025
9062abf
move lib dir
garysassano Jan 17, 2025
f426498
remove redundant include
garysassano Jan 17, 2025
af088df
remove dirs
garysassano Jan 17, 2025
9723b4f
fix cloud az attribute
garysassano Jan 17, 2025
fe0895f
move src/lib/semconv.ts to src/semconv.ts
trentm Jan 18, 2025
0ac7ca1
use gen-semconv-ts.js script from https://github.com/open-telemetry/o…
trentm Jan 18, 2025
25d5177
Merge branch 'main' into fix-import
pichlermarc Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsBeanstalkDetectorSync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,18 @@ import {
ResourceAttributes,
ResourceDetectionConfig,
} from '@opentelemetry/resources';
import {
ATTR_SERVICE_NAME,
ATTR_SERVICE_VERSION,
} from '@opentelemetry/semantic-conventions';
import {
ATTR_CLOUD_PROVIDER,
ATTR_CLOUD_PLATFORM,
ATTR_SERVICE_NAME,
ATTR_SERVICE_NAMESPACE,
ATTR_SERVICE_VERSION,
ATTR_SERVICE_INSTANCE_ID,
CLOUD_PROVIDER_VALUE_AWS,
CLOUD_PLATFORM_VALUE_AWS_ELASTIC_BEANSTALK,
} from '@opentelemetry/semantic-conventions/incubating';
} from '../semconv';
import * as fs from 'fs';
import * as util from 'util';

Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEc2DetectorSync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
ATTR_HOST_NAME,
CLOUD_PROVIDER_VALUE_AWS,
CLOUD_PLATFORM_VALUE_AWS_EC2,
} from '@opentelemetry/semantic-conventions/incubating';
} from '../semconv';
import * as http from 'http';

/**
Expand Down
5 changes: 2 additions & 3 deletions detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetectorSync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import {
ATTR_AWS_LOG_STREAM_ARNS,
CLOUD_PROVIDER_VALUE_AWS,
CLOUD_PLATFORM_VALUE_AWS_ECS,
} from '@opentelemetry/semantic-conventions/incubating';
} from '../semconv';
// Patch until the OpenTelemetry SDK is updated to ship this attribute
import { SemanticResourceAttributes as AdditionalSemanticResourceAttributes } from './SemanticResourceAttributes';
import * as http from 'http';
Expand Down Expand Up @@ -166,8 +166,7 @@ export class AwsEcsDetectorSync implements DetectorSync {

const accountId: string = AwsEcsDetectorSync._getAccountFromArn(taskArn);
const region: string = AwsEcsDetectorSync._getRegionFromArn(taskArn);
const availabilityZone: string | undefined =
taskMetadata?.['AvailabilityZone'];
const availabilityZone: string | undefined = taskMetadata?.AvailabilityZone;

const clusterArn = cluster.startsWith('arn:')
? cluster
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEksDetectorSync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
ATTR_CONTAINER_ID,
CLOUD_PROVIDER_VALUE_AWS,
CLOUD_PLATFORM_VALUE_AWS_EKS,
} from '@opentelemetry/semantic-conventions/incubating';
} from '../semconv';
import * as https from 'https';
import * as fs from 'fs';
import * as util from 'util';
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsLambdaDetectorSync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
ATTR_FAAS_NAME,
CLOUD_PROVIDER_VALUE_AWS,
CLOUD_PLATFORM_VALUE_AWS_LAMBDA,
} from '@opentelemetry/semantic-conventions/incubating';
} from '../semconv';

/**
* The AwsLambdaDetector can be used to detect if a process is running in AWS Lambda
Expand Down
Loading
Loading