@instana/core - npm Package Compare versions

Comparing version 2.34.0 to 2.34.1

CHANGELOG.md

		@@ -6,2 +6,14 @@ # Change Log

		## [2.34.1](https://github.com/instana/nodejs/compare/v2.34.0...v2.34.1) (2023-10-23)


		### Bug Fixes

		* rdkafka: only log warning about header format once ([#897](https://github.com/instana/nodejs/issues/897)) ([d8bf0ce](https://github.com/instana/nodejs/commit/d8bf0ce377115eeaa6c186f6447072a06f45055a))
		* reduced log warnings when there is no entry span ([#891](https://github.com/instana/nodejs/issues/891)) ([8543808](https://github.com/instana/nodejs/commit/854380826eb7f67f93009fed1ed79bccc7d69508)), closes [#885](https://github.com/instana/nodejs/issues/885)





		# [2.34.0](https://github.com/instana/nodejs/compare/v2.33.1...v2.34.0) (2023-10-10)
		@@ -8,0 +20,0 @@

package.json

		{
		"name": "@instana/core",
		"version": "2.34.0",
		"version": "2.34.1",
		"description": "Core library for Instana's Node.js packages",
		@@ -129,4 +129,4 @@ "main": "src/index.js",
		"@opentelemetry/context-async-hooks": "1.9.1",
		"@opentelemetry/instrumentation-fs": "0.7.3",
		"@opentelemetry/instrumentation-restify": "0.32.3",
		"@opentelemetry/instrumentation-fs": "0.8.1",
		"@opentelemetry/instrumentation-restify": "0.34.0",
		"@opentelemetry/instrumentation-socket.io": "0.33.3",
		@@ -144,3 +144,3 @@ "@opentelemetry/sdk-trace-base": "1.14.0",
		},
		"gitHead": "df37c59d12bc712924b53e01d2e52c1d6cc10692"
		"gitHead": "8a26a9196008221dad8ab8106abd8463faadd80c"
		}

src/tracing/cls.js

		@@ -542,4 +542,2 @@ /*
		* \| \| With this flag you can skip the default parent span check.
		* \| log \| Logger instrumentations might not want to log because they run into recursive
		* \| \| problem raising `RangeError: Maximum call stack size exceeded`.
		* \| skipIsTracing \| Instrumentation wants to handle `cls.isTracing` on it's own (e.g db2)
		@@ -555,3 +553,2 @@ *
		skipParentSpanCheck: false,
		log: true,
		skipIsTracing: false
		@@ -574,17 +571,2 @@ },
		if (!opts.skipParentSpanCheck && (!parentSpan \|\| isExitSpanResult)) {
		// NOTE: We need to check for `isActive` otherwise we flood this warning in case the collector is not
		// yet connected to the agent, but the application receives traffic already
		// The underlying problem is that all instrumentations are already "working" before the collector
		// is successfully connected with the agent, but they are skipped with the `isActive` flag.
		if (opts.log && opts.isActive) {
		logger.warn(
		// eslint-disable-next-line max-len
		`Cannot start an exit span as this requires an active entry (or intermediate) span as parent. ${
		parentSpan
		? `But the currently active span is itself an exit span: ${JSON.stringify(parentSpan)}`
		: 'Currently there is no span active at all'
		}`
		);
		}

		if (opts.extendedResponse) return { skip: true, suppressed, isExitSpan: isExitSpanResult };
		@@ -591,0 +573,0 @@ else return true;

src/tracing/instrumentation/loggers/bunyan.js

		@@ -39,3 +39,3 @@ /*

		if (cls.skipExitTracing({ isActive, log: false })) {
		if (cls.skipExitTracing({ isActive })) {
		return originalLog.apply(this, arguments);
		@@ -42,0 +42,0 @@ }

src/tracing/instrumentation/loggers/console.js

		@@ -32,3 +32,3 @@ /*

		if (cls.skipExitTracing({ isActive, log: false })) {
		if (cls.skipExitTracing({ isActive })) {
		return originalLog.apply(this, arguments);
		@@ -35,0 +35,0 @@ }

src/tracing/instrumentation/loggers/log4js.js

		@@ -37,3 +37,3 @@ /*
		return function (level) {
		if (cls.skipExitTracing({ isActive, log: false })) {
		if (cls.skipExitTracing({ isActive })) {
		return originalLog.apply(this, arguments);
		@@ -40,0 +40,0 @@ }

src/tracing/instrumentation/loggers/pino.js

		@@ -38,3 +38,3 @@ /*
		return function log(mergingObject, message) {
		if (cls.skipExitTracing({ isActive, log: false })) {
		if (cls.skipExitTracing({ isActive })) {
		return originalLoggingFunction.apply(this, arguments);
		@@ -41,0 +41,0 @@ }

src/tracing/instrumentation/loggers/winston.js

		@@ -71,3 +71,3 @@ /*
		return function (message) {
		if (cls.skipExitTracing({ isActive, log: false })) {
		if (cls.skipExitTracing({ isActive })) {
		return originalMethod.apply(this, arguments);
		@@ -138,3 +138,3 @@ }

		if (cls.skipExitTracing({ isActive, log: false }) \|\| !levelIsTraced(level)) {
		if (cls.skipExitTracing({ isActive }) \|\| !levelIsTraced(level)) {
		return originalMethod.apply(this, arguments);
		@@ -141,0 +141,0 @@ }

src/tracing/instrumentation/messaging/rdkafka.js

		@@ -16,2 +16,3 @@ /*
		let traceCorrelationEnabled = constants.kafkaTraceCorrelationDefault;
		let configHeader = null;

		@@ -31,3 +32,3 @@ let logger;
		traceCorrelationEnabled = config.tracing.kafka.traceCorrelation;
		logWarningForKafkaHeaderFormat(config.tracing.kafka.headerFormat);
		configHeader = config.tracing.kafka.headerFormat;
		};
		@@ -37,6 +38,7 @@
		traceCorrelationEnabled = config.tracing.kafka.traceCorrelation;
		logWarningForKafkaHeaderFormat(config.tracing.kafka.headerFormat);
		configHeader = config.tracing.kafka.headerFormat;
		};

		// The extraConfig is coming from the agent configs. You can set the kafka format in the agent.
		exports.activate = function activate(extraConfig) {
		let extraConfigHeader = null;
		if (extraConfig && extraConfig.tracing && extraConfig.tracing.kafka) {
		@@ -46,4 +48,5 @@ if (extraConfig.tracing.kafka.traceCorrelation != null) {
		}
		logWarningForKafkaHeaderFormat(extraConfig.tracing.kafka.headerFormat);
		extraConfigHeader = extraConfig.tracing.kafka.headerFormat;
		}
		logWarningForKafkaHeaderFormat(extraConfigHeader \|\| configHeader);
		isActive = true;
		@@ -50,0 +53,0 @@ };

src/tracing/opentelemetry-instrumentations/wrap.js

		@@ -62,3 +62,3 @@ /*

		if (kind === constants.EXIT && cls.skipExitTracing({ log: false })) {
		if (kind === constants.EXIT && cls.skipExitTracing()) {
		return;
		@@ -65,0 +65,0 @@ }

New alerts