Skip to content

Commit 3a3e419

Browse files
iblancasaiblancasa
committed
Bump all dependencies to latest version
Signed-off-by: Israel Blancas <iblancasa@gmail.com>
1 parent 731cf7a commit 3a3e419

File tree

7 files changed

+971
-2241
lines changed

7 files changed

+971
-2241
lines changed

‎nodejs/packages/cx-wrapper/common.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import { getEnv } from '@opentelemetry/core';
2-
3-
export const logLevel = getEnv().OTEL_LOG_LEVEL;
1+
export const logLevel = process.env.OTEL_LOG_LEVEL;
42

53
export const OtelAttributes = {
64
RPC_REQUEST_PAYLOAD: 'rpc.request.payload',

‎nodejs/packages/cx-wrapper/index.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
import { diag, DiagConsoleLogger } from '@opentelemetry/api';
2-
import { getEnv } from '@opentelemetry/core';
1+
import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api';
32

43
// configure lambda logging (before we load libraries that might log)
5-
diag.setLogger(new DiagConsoleLogger(), getEnv().OTEL_LOG_LEVEL);
4+
const envLogLevel = process.env.OTEL_LOG_LEVEL?.toUpperCase();
5+
const diagLogLevel =
6+
envLogLevel && envLogLevel in DiagLogLevel
7+
? (DiagLogLevel[envLogLevel as keyof typeof DiagLogLevel] as DiagLogLevel)
8+
: undefined;
9+
diag.setLogger(new DiagConsoleLogger(), diagLogLevel);
610

711
import { Callback, Context } from 'aws-lambda';
812
import { Handler } from 'aws-lambda/handler.js';

‎nodejs/packages/cx-wrapper/package-lock.json‎

Lines changed: 432 additions & 1064 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎nodejs/packages/cx-wrapper/package.json‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,34 +32,34 @@
3232
"dependencies": {
3333
"@opentelemetry/api": "1.9.0",
3434
"@opentelemetry/auto-configuration-propagators": "0.3.3",
35-
"@opentelemetry/core": "1.30.1",
36-
"@opentelemetry/exporter-metrics-otlp-proto": "0.57.2",
37-
"@opentelemetry/exporter-trace-otlp-proto": "0.57.2",
38-
"@opentelemetry/instrumentation": "file:../../../opentelemetry-js/experimental/packages/opentelemetry-instrumentation/opentelemetry-instrumentation-0.208.0.tgz",
39-
"@opentelemetry/instrumentation-aws-lambda": "file:../../../opentelemetry-js-contrib-cx/packages/instrumentation-aws-lambda/opentelemetry-instrumentation-aws-lambda-0.61.0.tgz",
40-
"@opentelemetry/instrumentation-aws-sdk": "file:../../../opentelemetry-js-contrib-cx/packages/instrumentation-aws-sdk/opentelemetry-instrumentation-aws-sdk-0.64.0.tgz",
41-
"@opentelemetry/instrumentation-dns": "0.43.1",
42-
"@opentelemetry/instrumentation-express": "0.47.1",
43-
"@opentelemetry/instrumentation-graphql": "0.47.1",
44-
"@opentelemetry/instrumentation-grpc": "0.57.2",
45-
"@opentelemetry/instrumentation-hapi": "0.45.1",
46-
"@opentelemetry/instrumentation-http": "0.57.2",
47-
"@opentelemetry/instrumentation-ioredis": "0.47.1",
48-
"@opentelemetry/instrumentation-koa": "0.47.1",
49-
"@opentelemetry/instrumentation-mongodb": "file:../../../opentelemetry-js-contrib-cx/packages/instrumentation-mongodb/opentelemetry-instrumentation-mongodb-0.61.0.tgz",
50-
"@opentelemetry/instrumentation-mysql": "0.45.1",
51-
"@opentelemetry/instrumentation-net": "0.43.1",
52-
"@opentelemetry/instrumentation-pg": "0.51.1",
53-
"@opentelemetry/instrumentation-redis": "0.46.1",
54-
"@opentelemetry/propagator-aws-xray": "1.26.2",
55-
"@opentelemetry/propagator-b3": "1.30.1",
56-
"@opentelemetry/propagator-jaeger": "1.30.1",
57-
"@opentelemetry/resource-detector-aws": "1.12.0",
58-
"@opentelemetry/resources": "1.30.1",
59-
"@opentelemetry/sdk-metrics": "1.30.1",
60-
"@opentelemetry/sdk-trace-base": "1.30.1",
61-
"@opentelemetry/sdk-trace-node": "1.30.1",
62-
"@opentelemetry/semantic-conventions": "1.28.0",
63-
"import-in-the-middle": "2.0.5"
35+
"@opentelemetry/core": "2.6.0",
36+
"@opentelemetry/exporter-metrics-otlp-proto": "0.213.0",
37+
"@opentelemetry/exporter-trace-otlp-proto": "0.213.0",
38+
"@opentelemetry/instrumentation": "file:../../../opentelemetry-js/experimental/packages/opentelemetry-instrumentation/opentelemetry-instrumentation-0.213.0.tgz",
39+
"@opentelemetry/instrumentation-aws-lambda": "file:../../../opentelemetry-js-contrib-cx/packages/instrumentation-aws-lambda/opentelemetry-instrumentation-aws-lambda-0.65.0.tgz",
40+
"@opentelemetry/instrumentation-aws-sdk": "file:../../../opentelemetry-js-contrib-cx/packages/instrumentation-aws-sdk/opentelemetry-instrumentation-aws-sdk-0.68.0.tgz",
41+
"@opentelemetry/instrumentation-dns": "0.56.0",
42+
"@opentelemetry/instrumentation-express": "0.61.0",
43+
"@opentelemetry/instrumentation-graphql": "0.61.0",
44+
"@opentelemetry/instrumentation-grpc": "0.213.0",
45+
"@opentelemetry/instrumentation-hapi": "0.59.0",
46+
"@opentelemetry/instrumentation-http": "0.213.0",
47+
"@opentelemetry/instrumentation-ioredis": "0.61.0",
48+
"@opentelemetry/instrumentation-koa": "0.61.0",
49+
"@opentelemetry/instrumentation-mongodb": "file:../../../opentelemetry-js-contrib-cx/packages/instrumentation-mongodb/opentelemetry-instrumentation-mongodb-0.66.0.tgz",
50+
"@opentelemetry/instrumentation-mysql": "0.59.0",
51+
"@opentelemetry/instrumentation-net": "0.57.0",
52+
"@opentelemetry/instrumentation-pg": "0.65.0",
53+
"@opentelemetry/instrumentation-redis": "0.61.0",
54+
"@opentelemetry/propagator-aws-xray": "2.2.0",
55+
"@opentelemetry/propagator-b3": "2.6.0",
56+
"@opentelemetry/propagator-jaeger": "2.6.0",
57+
"@opentelemetry/resource-detector-aws": "2.13.0",
58+
"@opentelemetry/resources": "2.6.0",
59+
"@opentelemetry/sdk-metrics": "2.6.0",
60+
"@opentelemetry/sdk-trace-base": "2.6.0",
61+
"@opentelemetry/sdk-trace-node": "2.6.0",
62+
"@opentelemetry/semantic-conventions": "1.40.0",
63+
"import-in-the-middle": "3.0.0"
6464
}
6565
}

‎nodejs/packages/cx-wrapper/provider-init.ts‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
33
import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-proto';
44
import { registerInstrumentations } from '@opentelemetry/instrumentation';
55
import { awsLambdaDetector } from '@opentelemetry/resource-detector-aws';
6-
import { detectResourcesSync, envDetector, processDetector } from '@opentelemetry/resources';
6+
import { detectResources, envDetector, processDetector } from '@opentelemetry/resources';
77
import { MeterProvider, MeterProviderOptions, PeriodicExportingMetricReader, AggregationTemporality } from '@opentelemetry/sdk-metrics';
8-
import { BatchSpanProcessor, ConsoleSpanExporter, SDKRegistrationConfig, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
8+
import { BatchSpanProcessor, ConsoleSpanExporter, SDKRegistrationConfig, SimpleSpanProcessor, SpanProcessor } from '@opentelemetry/sdk-trace-base';
99
import { NodeTracerConfig, NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
1010
import { parseBooleanEnvvar, parseIntEnvvar } from './common';
1111

@@ -27,7 +27,7 @@ export function initializeProvider(instrumentations: any[]): NodeTracerProvider
2727

2828
const export_timeout = parseIntEnvvar("OTEL_EXPORT_TIMEOUT") ?? DEFAULT_OTEL_EXPORT_TIMEOUT;
2929

30-
const resource = detectResourcesSync({
30+
const resource = detectResources({
3131
detectors: [awsLambdaDetector, envDetector, processDetector],
3232
});
3333

@@ -43,33 +43,26 @@ export function initializeProvider(instrumentations: any[]): NodeTracerProvider
4343
process.env.OTEL_TRACES_EXPORTER = 'none';
4444
process.env.OTEL_EXPORTER_OTLP_COMPRESSION = 'none';
4545

46-
const tracerProvider = new NodeTracerProvider(config);
47-
/*
48-
if (typeof configureTracerProvider === 'function') {
49-
configureTracerProvider(tracerProvider)
50-
} else {
51-
// defaults
52-
*/
53-
tracerProvider.addSpanProcessor(
46+
const spanProcessors: SpanProcessor[] = [
5447
new BatchSpanProcessor(
5548
new OTLPTraceExporter({
5649
timeoutMillis: export_timeout,
5750
}),
5851
{
5952
scheduledDelayMillis: 2147483647, // 24 days should be enough to outlive a lambda instance
6053
}
61-
)
62-
);
63-
/*
64-
}
65-
*/
54+
),
55+
];
6656

6757
if (parseBooleanEnvvar("OTEL_CONSOLE_SPAN_EXPORTER_ENABLED") ?? false) {
68-
tracerProvider.addSpanProcessor(
69-
new SimpleSpanProcessor(new ConsoleSpanExporter())
70-
);
58+
spanProcessors.push(new SimpleSpanProcessor(new ConsoleSpanExporter()));
7159
}
7260

61+
const tracerProvider = new NodeTracerProvider({
62+
...config,
63+
spanProcessors,
64+
});
65+
7366
let sdkRegistrationConfig: SDKRegistrationConfig = {};
7467
if (typeof configureSdkRegistration === 'function') {
7568
sdkRegistrationConfig = configureSdkRegistration(sdkRegistrationConfig);

0 commit comments

Comments
 (0)