Improve NodeJS Lambda Layer cold start time #163
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,9 +3,16 @@ | |
| // Modifications Copyright The OpenTelemetry Authors. Licensed under the Apache License 2.0 License. | ||
|
|
||
| import { TextMapPropagator, diag } from '@opentelemetry/api'; | ||
| import { getResourceDetectors as getResourceDetectorsFromEnv } from '@opentelemetry/auto-instrumentations-node'; | ||
| import { | ||
| CompositePropagator, | ||
| ENVIRONMENT, | ||
| TracesSamplerValues, | ||
| getEnv, | ||
| getEnvWithoutDefaults, | ||
| W3CBaggagePropagator, | ||
| W3CTraceContextPropagator, | ||
| } from '@opentelemetry/core'; | ||
| import { OTLPMetricExporter as OTLPGrpcOTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-grpc'; | ||
| import { | ||
| AggregationTemporalityPreference, | ||
|
|
@@ -17,6 +24,8 @@ import { OTLPTraceExporter as OTLPProtoTraceExporter } from '@opentelemetry/expo | |
| import { ZipkinExporter } from '@opentelemetry/exporter-zipkin'; | ||
| import { AWSXRayIdGenerator } from '@opentelemetry/id-generator-aws-xray'; | ||
| import { Instrumentation } from '@opentelemetry/instrumentation'; | ||
| import { AWSXRayPropagator } from '@opentelemetry/propagator-aws-xray'; | ||
| import { AWSXRayLambdaPropagator } from '@opentelemetry/propagator-aws-xray-lambda'; | ||
| import { awsEc2DetectorSync, awsEcsDetectorSync, awsEksDetectorSync } from '@opentelemetry/resource-detector-aws'; | ||
| import { | ||
| Detector, | ||
|
|
@@ -75,6 +84,13 @@ const FORMAT_OTEL_UNSAMPLED_TRACES_BINARY_PREFIX = 'T1U'; | |
| // Follow Python SDK Impl to set the max span batch size | ||
| // which will reduce the chance of UDP package size is larger than 64KB | ||
| const LAMBDA_SPAN_EXPORT_BATCH_SIZE = 10; | ||
|
|
||
| const propagatorMap = new Map<string, () => TextMapPropagator>([ | ||
| ['tracecontext', () => new W3CTraceContextPropagator()], | ||
| ['baggage', () => new W3CBaggagePropagator()], | ||
| ['xray', () => new AWSXRayPropagator()], | ||
| ['xray-lambda', () => new AWSXRayLambdaPropagator()], | ||
| ]); | ||
| /** | ||
| * Aws Application Signals Config Provider creates a configuration object that can be provided to | ||
| * the OTel NodeJS SDK for Auto Instrumentation with Application Signals Functionality. | ||
|
|
@@ -163,7 +179,7 @@ export class AwsOpentelemetryConfigurator { | |
| this.resource = autoResource; | ||
|
|
||
| this.instrumentations = instrumentations; | ||
| this.propagator = this.getPropagator(); | ||
|
|
||
| // TODO: Consider removing AWSXRayIdGenerator as it is not needed | ||
| // Similarly to Java, always use AWS X-Ray Id Generator | ||
|
|
@@ -190,6 +206,32 @@ export class AwsOpentelemetryConfigurator { | |
| return autoResource; | ||
| } | ||
|
|
||
| private getPropagator(): TextMapPropagator { | ||
|
Contributor
There was a problem hiding this comment. nit: This can be a regular function outside of this class. |
||
| if (process.env.OTEL_PROPAGATORS == null || process.env.OTEL_PROPAGATORS.trim() === '') { | ||
| return new CompositePropagator({ | ||
|
Comment on lines
+209
to
+211
Member
There was a problem hiding this comment. is there a better option to not rewrite this function by copying it from upstream? can we just patch
Contributor
Author
There was a problem hiding this comment. See #171, we revert to using the upstream dependency |
||
| propagators: [new W3CTraceContextPropagator(), new W3CBaggagePropagator()], | ||
| }); | ||
| } | ||
| const propagatorsFromEnv = Array.from( | ||
| new Set(process.env.OTEL_PROPAGATORS?.split(',').map(value => value.toLowerCase().trim())) | ||
| ); | ||
| const propagators = propagatorsFromEnv.flatMap(propagatorName => { | ||
| if (propagatorName === 'none') { | ||
| diag.info( | ||
| 'Not selecting any propagator for value "none" specified in the environment variable OTEL_PROPAGATORS' | ||
| ); | ||
| return []; | ||
| } | ||
| const propagatorFactoryFunction = propagatorMap.get(propagatorName); | ||
| if (propagatorFactoryFunction == null) { | ||
| diag.warn(`Invalid propagator "${propagatorName}" specified in the environment variable OTEL_PROPAGATORS`); | ||
| return []; | ||
| } | ||
| return propagatorFactoryFunction(); | ||
| }); | ||
| return new CompositePropagator({ propagators }); | ||
| } | ||
|
|
||
| public configure(): Partial<NodeSDKConfiguration> { | ||
| // config.autoDetectResources is set to False, as the resources are detected and added to the | ||
| // resource ahead of time. The resource is needed to be populated ahead of time instead of letting | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "extends": "./tsconfig.json", | ||
| "compilerOptions": { | ||
| "module": "es2020", | ||
| "target": "es2020", | ||
| "moduleResolution": "node", | ||
| }, | ||
|
Comment on lines
+4
to
+7
Member
There was a problem hiding this comment. is this the same target being used by otel lambda upstream? |
||
| "exclude": [ | ||
| "node_modules", | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| const path = require('path'); | ||
|
|
||
| module.exports = { | ||
| entry: './src/register.ts', | ||
| target: 'node', | ||
| mode: 'production', | ||
| externalsPresets: { node: true }, | ||
| output: { | ||
| path: path.resolve('./build/src'), | ||
| filename: 'register.js', | ||
| library: { | ||
| type: 'commonjs2', | ||
| } | ||
| }, | ||
| resolve: { | ||
| extensions: ['.ts', '.js'], | ||
| modules: [ | ||
| path.resolve('./src'), | ||
| 'node_modules', | ||
| ], | ||
| }, | ||
| module: { | ||
| rules: [ | ||
| { | ||
| test: /\.ts$/, | ||
| use: [ | ||
| { | ||
| loader: 'ts-loader', | ||
| options: { | ||
| configFile: 'tsconfig.webpack.json' | ||
| }, | ||
| } | ||
| ], | ||
| exclude: /node_modules/, | ||
| }, | ||
| ], | ||
| }, | ||
| optimization: { | ||
| minimize: true, | ||
| providedExports: true, | ||
| usedExports: true, | ||
| }, | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
who will run "compile:tsc" if we shift "compile" to "compile:webpack" as code compiling entry point?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It probably won't be run unless someone wanted to see the previous package structure.