Merge branch 'main' into tekton_py_new_versions

pvital · web-flow · commit 9497b075c92d · 2025-08-20T03:54:41.000-04:00
diff --git a/src/instana/instrumentation/logging.py b/src/instana/instrumentation/logging.py
@@ -31,7 +31,7 @@ def log_with_instana(
     stacklevel_in = kwargs.pop(
         "stacklevel", 1 if get_runtime_env_info()[0] not in ["ppc64le", "s390x"] else 2
     )
-    stacklevel = stacklevel_in + 1 + (sys.version_info >= (3, 14))
+    stacklevel = stacklevel_in + 1
 
     try:
         # Only needed if we're tracing and serious log and logging spans are not disabled

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ def log_with_instana(`
`31`	`31`	`stacklevel_in = kwargs.pop(`
`32`	`32`	`"stacklevel", 1 if get_runtime_env_info()[0] not in ["ppc64le", "s390x"] else 2`
`33`	`33`	`)`
`34`		`- stacklevel = stacklevel_in + 1 + (sys.version_info >= (3, 14))`
	`34`	`+ stacklevel = stacklevel_in + 1`
`35`	`35`
`36`	`36`	`try:`
`37`	`37`	`# Only needed if we're tracing and serious log and logging spans are not disabled`