Skip to content

Upgrade OTel dependencies, update sampler with new attributes #71

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

Merged
merged 1 commit into from
Sep 19, 2024
Merged

Upgrade OTel dependencies, update sampler with new attributes #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
134 changes: 67 additions & 67 deletions aws-distro-opentelemetry-node-autoinstrumentation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,88 +41,88 @@
"@aws-sdk/client-kinesis": "3.632.0",
"@aws-sdk/client-s3": "3.632.0",
"@aws-sdk/client-sqs": "3.632.0",
"@opentelemetry/contrib-test-utils": "^0.40.0",
"@opentelemetry/contrib-test-utils": "0.41.0",
"@types/mocha": "7.0.2",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
"expect": "29.2.0",
"mocha": "7.2.0",
"nock": "13.2.1",
"nyc": "15.1.0",
"rimraf": "5.0.5",
"sinon": "15.2.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"expect": "29.2.0",
"nock": "13.2.1"
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/api": "1.9.0",
"@opentelemetry/auto-instrumentations-node": "0.48.0",
"@opentelemetry/auto-configuration-propagators": "0.2.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.52.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.52.1",
"@opentelemetry/instrumentation": "0.52.1",
"@opentelemetry/auto-configuration-propagators": "0.3.0",
"@opentelemetry/auto-instrumentations-node": "0.50.0",
"@opentelemetry/core": "1.26.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.53.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.53.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.53.0",
"@opentelemetry/exporter-zipkin": "1.26.0",
"@opentelemetry/id-generator-aws-xray": "1.2.2",
"@opentelemetry/propagator-aws-xray": "1.25.1",
"@opentelemetry/core": "1.25.1",
"@opentelemetry/sdk-trace-base": "1.25.1",
"@opentelemetry/semantic-conventions": "1.25.1",
"@opentelemetry/resources": "1.25.1",
"@opentelemetry/resource-detector-aws": "1.5.2",
"@opentelemetry/exporter-trace-otlp-proto": "0.52.1",
"@opentelemetry/exporter-zipkin": "1.25.1",
"@opentelemetry/sdk-metrics": "1.25.1",
"@opentelemetry/sdk-node": "0.52.1",
"@opentelemetry/instrumentation-aws-sdk": "0.43.1"
"@opentelemetry/instrumentation": "0.53.0",
"@opentelemetry/instrumentation-aws-sdk": "0.44.0",
"@opentelemetry/propagator-aws-xray": "1.26.0",
"@opentelemetry/resource-detector-aws": "1.6.1",
"@opentelemetry/resources": "1.26.0",
"@opentelemetry/sdk-metrics": "1.26.0",
"@opentelemetry/sdk-node": "0.53.0",
"@opentelemetry/sdk-trace-base": "1.26.0",
"@opentelemetry/semantic-conventions": "1.27.0"
},
"overrides": {
"@opentelemetry/auto-instrumentations-node": {
"@opentelemetry/instrumentation": "0.52.1",
"@opentelemetry/instrumentation-amqplib": "0.40.0",
"@opentelemetry/instrumentation-aws-lambda": "0.43.0",
"@opentelemetry/instrumentation-aws-sdk": "0.43.1",
"@opentelemetry/instrumentation-bunyan": "0.40.0",
"@opentelemetry/instrumentation-cassandra-driver": "0.40.0",
"@opentelemetry/instrumentation-connect": "0.38.0",
"@opentelemetry/instrumentation-cucumber": "0.8.0",
"@opentelemetry/instrumentation-dataloader": "0.11.0",
"@opentelemetry/instrumentation-dns": "0.38.0",
"@opentelemetry/instrumentation-express": "0.41.1",
"@opentelemetry/instrumentation-fastify": "0.38.0",
"@opentelemetry/instrumentation-fs": "0.14.0",
"@opentelemetry/instrumentation-generic-pool": "0.38.0",
"@opentelemetry/instrumentation-graphql": "0.42.0",
"@opentelemetry/instrumentation-grpc": "0.52.1",
"@opentelemetry/instrumentation-hapi": "0.40.0",
"@opentelemetry/instrumentation-http": "0.52.1",
"@opentelemetry/instrumentation-ioredis": "0.42.0",
"@opentelemetry/instrumentation-kafkajs": "0.2.0",
"@opentelemetry/instrumentation-knex": "0.39.0",
"@opentelemetry/instrumentation-koa": "0.42.0",
"@opentelemetry/instrumentation-lru-memoizer": "0.39.0",
"@opentelemetry/instrumentation-memcached": "0.38.0",
"@opentelemetry/instrumentation-mongodb": "0.46.0",
"@opentelemetry/instrumentation-mongoose": "0.40.0",
"@opentelemetry/instrumentation-mysql": "0.40.0",
"@opentelemetry/instrumentation-mysql2": "0.40.0",
"@opentelemetry/instrumentation-nestjs-core": "0.39.0",
"@opentelemetry/instrumentation-net": "0.38.0",
"@opentelemetry/instrumentation-pg": "0.43.0",
"@opentelemetry/instrumentation-pino": "0.41.0",
"@opentelemetry/instrumentation-redis": "0.41.0",
"@opentelemetry/instrumentation-redis-4": "0.41.0",
"@opentelemetry/instrumentation-restify": "0.40.0",
"@opentelemetry/instrumentation-router": "0.39.0",
"@opentelemetry/instrumentation-socket.io": "0.41.0",
"@opentelemetry/instrumentation-tedious": "0.12.0",
"@opentelemetry/instrumentation-undici": "0.4.0",
"@opentelemetry/instrumentation-winston": "0.39.0",
"@opentelemetry/resource-detector-alibaba-cloud": "0.28.10",
"@opentelemetry/resource-detector-aws": "1.5.2",
"@opentelemetry/resource-detector-azure": "0.2.9",
"@opentelemetry/resource-detector-container": "0.3.11",
"@opentelemetry/resource-detector-gcp": "0.29.10",
"@opentelemetry/resources": "1.25.1",
"@opentelemetry/sdk-node": "0.52.1"
"@opentelemetry/instrumentation": "0.53.0",
"@opentelemetry/instrumentation-amqplib": "0.42.0",
"@opentelemetry/instrumentation-aws-lambda": "0.44.0",
"@opentelemetry/instrumentation-aws-sdk": "0.44.0",
"@opentelemetry/instrumentation-bunyan": "0.41.0",
"@opentelemetry/instrumentation-cassandra-driver": "0.41.0",
"@opentelemetry/instrumentation-connect": "0.39.0",
"@opentelemetry/instrumentation-cucumber": "0.9.0",
"@opentelemetry/instrumentation-dataloader": "0.12.0",
"@opentelemetry/instrumentation-dns": "0.39.0",
"@opentelemetry/instrumentation-express": "0.42.0",
"@opentelemetry/instrumentation-fastify": "0.39.0",
"@opentelemetry/instrumentation-fs": "0.15.0",
"@opentelemetry/instrumentation-generic-pool": "0.39.0",
"@opentelemetry/instrumentation-graphql": "0.43.0",
"@opentelemetry/instrumentation-grpc": "0.53.0",
"@opentelemetry/instrumentation-hapi": "0.41.0",
"@opentelemetry/instrumentation-http": "0.53.0",
"@opentelemetry/instrumentation-ioredis": "0.43.0",
"@opentelemetry/instrumentation-kafkajs": "0.3.0",
"@opentelemetry/instrumentation-knex": "0.40.0",
"@opentelemetry/instrumentation-koa": "0.43.0",
"@opentelemetry/instrumentation-lru-memoizer": "0.40.0",
"@opentelemetry/instrumentation-memcached": "0.39.0",
"@opentelemetry/instrumentation-mongodb": "0.47.0",
"@opentelemetry/instrumentation-mongoose": "0.42.0",
"@opentelemetry/instrumentation-mysql": "0.41.0",
"@opentelemetry/instrumentation-mysql2": "0.41.0",
"@opentelemetry/instrumentation-nestjs-core": "0.40.0",
"@opentelemetry/instrumentation-net": "0.39.0",
"@opentelemetry/instrumentation-pg": "0.44.0",
"@opentelemetry/instrumentation-pino": "0.42.0",
"@opentelemetry/instrumentation-redis": "0.42.0",
"@opentelemetry/instrumentation-redis-4": "0.42.0",
"@opentelemetry/instrumentation-restify": "0.41.0",
"@opentelemetry/instrumentation-router": "0.40.0",
"@opentelemetry/instrumentation-socket.io": "0.42.0",
"@opentelemetry/instrumentation-tedious": "0.14.0",
"@opentelemetry/instrumentation-undici": "0.6.0",
"@opentelemetry/instrumentation-winston": "0.40.0",
"@opentelemetry/resource-detector-alibaba-cloud": "0.29.1",
"@opentelemetry/resource-detector-aws": "1.6.1",
"@opentelemetry/resource-detector-azure": "0.2.11",
"@opentelemetry/resource-detector-container": "0.4.1",
"@opentelemetry/resource-detector-gcp": "0.29.11",
"@opentelemetry/resources": "1.26.0",
"@opentelemetry/sdk-node": "0.53.0"
}
},
"files": [
Expand Down
14 changes: 9 additions & 5 deletions aws-distro-opentelemetry-node-autoinstrumentation/src/sampler/sampling-rule-applier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ import {
TraceIdRatioBasedSampler,
} from '@opentelemetry/sdk-trace-base';
import {
ATTR_CLIENT_ADDRESS,
ATTR_HTTP_REQUEST_METHOD,
ATTR_SERVER_ADDRESS,
ATTR_URL_FULL,
ATTR_URL_PATH,
CLOUDPLATFORMVALUES_AWS_LAMBDA,
SEMATTRS_AWS_LAMBDA_INVOKED_ARN,
SEMATTRS_HTTP_HOST,
Expand Down Expand Up @@ -85,12 +90,11 @@ export class SamplingRuleApplier {
let httpHost: AttributeValue | undefined = undefined;
let serviceName: AttributeValue | undefined = undefined;

// Unlike in Python, `URL_PATH/URL_FULL/HTTP_REQUEST_METHOD/SERVER_ADDRESS` are not available in Semantic Attributes
if (attributes) {
httpTarget = attributes[SEMATTRS_HTTP_TARGET];
httpUrl = attributes[SEMATTRS_HTTP_URL];
httpMethod = attributes[SEMATTRS_HTTP_METHOD];
httpHost = attributes[SEMATTRS_HTTP_HOST];
httpTarget = attributes[SEMATTRS_HTTP_TARGET] ?? attributes[ATTR_URL_PATH];
httpUrl = attributes[SEMATTRS_HTTP_URL] ?? attributes[ATTR_URL_FULL];
httpMethod = attributes[SEMATTRS_HTTP_METHOD] ?? attributes[ATTR_HTTP_REQUEST_METHOD];
httpHost = attributes[SEMATTRS_HTTP_HOST] ?? attributes[ATTR_SERVER_ADDRESS] ?? attributes[ATTR_CLIENT_ADDRESS];
}

let serviceType: AttributeValue | undefined = undefined;
Expand Down
Loading
Loading