Skip to content

[WIP] Updating OTel package dependencies #164

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

Closed
wants to merge 3 commits into from
Closed

[WIP] Updating OTel package dependencies #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6adca12
updating package dependencies
liustve Mar 7, 2025
79cfe3c
compiler fix
liustve Mar 8, 2025
fa1d4ef
adding package-lock.json
liustve Mar 8, 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
18 changes: 9 additions & 9 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 @@ -76,14 +76,14 @@
"@aws-sdk/client-kinesis": "3.632.0",
"@aws-sdk/client-lambda": "^3.632.0",
"@aws-sdk/client-s3": "3.632.0",
"@aws-sdk/client-secrets-manager": "^3.632.0",
"@aws-sdk/client-sfn": "^3.632.0",
"@aws-sdk/client-sns": "^3.632.0",
"@opentelemetry/contrib-test-utils": "0.41.0",
"@aws-sdk/client-secrets-manager": "3.632.0",
"@aws-sdk/client-sfn": "3.632.0",
"@aws-sdk/client-sns": "3.632.0",
"@opentelemetry/contrib-test-utils": "0.45.0",
"@smithy/protocol-http": "^5.0.1",
"@smithy/signature-v4": "^5.0.1",
"@types/mocha": "7.0.2",
"@types/node": "18.6.5",
"@types/node": "20.10.0",
"@types/proxyquire": "^1.3.31",
"@types/sinon": "10.0.18",
"expect": "29.2.0",
Expand All @@ -99,22 +99,22 @@
"dependencies": {
"@opentelemetry/api": "1.9.0",
"@opentelemetry/auto-configuration-propagators": "0.3.0",
"@opentelemetry/auto-instrumentations-node": "0.50.0",
"@opentelemetry/auto-instrumentations-node": "0.56.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/instrumentation": "0.53.0",
"@opentelemetry/instrumentation-aws-sdk": "0.44.0",
"@opentelemetry/instrumentation-aws-sdk": "0.49.1",
"@opentelemetry/otlp-transformer": "0.53.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/sdk-node": "0.57.2",
"@opentelemetry/sdk-trace-base": "1.30.1",
"@opentelemetry/semantic-conventions": "1.27.0"
},
"files": [
Expand Down
1 change: 0 additions & 1 deletion aws-distro-opentelemetry-node-autoinstrumentation/src/patches/instrumentation-patch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ export function applyInstrumentationPatches(
diag.debug('Overriding aws lambda instrumentation');
const lambdaInstrumentation = new AwsLambdaInstrumentationPatch({
eventContextExtractor: customExtractor,
disableAwsContextPropagation: true,
});
instrumentations[index] = lambdaInstrumentation;
}
Expand Down
4 changes: 2 additions & 2 deletions aws-distro-opentelemetry-node-autoinstrumentation/src/sampler/aws-xray-remote-sampler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,12 @@ export class _AwsXRayRemoteSampler implements Sampler {
responseObject.LastRuleModification
);
this.targetPollingInterval = nextPollingInterval;
clearInterval(this.targetPoller);
clearInterval(this.targetPoller as NodeJS.Timeout);
this.startSamplingTargetsPoller();

if (refreshSamplingRules) {
this.samplerDiag.debug('Performing out-of-band sampling rule polling to fetch updated rules.');
clearInterval(this.rulePoller);
clearInterval(this.rulePoller as NodeJS.Timeout);
this.startSamplingRulesPoller();
}
} catch (error: unknown) {
Expand Down
6 changes: 2 additions & 4 deletions aws-distro-opentelemetry-node-autoinstrumentation/test/patches/instrumentation-patch.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ describe('InstrumentationPatchTest', () => {
expect(services.has('SQS')).toBeTruthy();
expect(services.has('SNS')).toBeTruthy();
expect(services.has('Lambda')).toBeTruthy();
expect(services.has('S3')).toBeTruthy();
expect(services.has('Kinesis')).toBeTruthy();

expect(services.has('DynamoDB')).toBeTruthy();
// From patching but shouldn't be applied
expect(services.get('SecretsManager')).toBeFalsy();
expect(services.get('SFN')).toBeFalsy();
expect(services.has('S3')).toBeFalsy();
expect(services.has('Kinesis')).toBeFalsy();
expect(services.get('SNS')._requestPreSpanHook).toBeFalsy();
expect(services.get('SNS').requestPreSpanHook).toBeTruthy();
expect(services.get('Lambda')._requestPreSpanHook).toBeFalsy();
Expand Down Expand Up @@ -124,7 +124,6 @@ describe('InstrumentationPatchTest', () => {
// Check that the original AWS SDK Instrumentation is replaced with the extended version
expect(awsSdkInstrumentation).toBeInstanceOf(AwsSdkInstrumentationExtended);
});

it('S3 without patching', () => {
const unpatchedAwsSdkInstrumentation: AwsInstrumentation = extractAwsSdkInstrumentation(UNPATCHED_INSTRUMENTATIONS);
const services: Map<string, any> = extractServicesFromAwsSdkInstrumentation(unpatchedAwsSdkInstrumentation);
Expand All @@ -136,7 +135,6 @@ describe('InstrumentationPatchTest', () => {
const services: Map<string, any> = extractServicesFromAwsSdkInstrumentation(unpatchedAwsSdkInstrumentation);
expect(() => doExtractKinesisAttributes(services)).toThrow();
});

it('SQS without patching', () => {
const unpatchedAwsSdkInstrumentation: AwsInstrumentation = extractAwsSdkInstrumentation(UNPATCHED_INSTRUMENTATIONS);
const services: Map<string, any> = extractServicesFromAwsSdkInstrumentation(unpatchedAwsSdkInstrumentation);
Expand Down
2 changes: 1 addition & 1 deletion contract-tests/images/applications/mysql2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"license": "ISC",
"description": "",
"dependencies": {
"mysql2": "3.11.4"
"mysql2": "^3.11.5"
}
}
Loading
Loading