Fix for #322

Author: HardNorth

.gitignore

@@ -72,8 +72,8 @@ target/
 .python-version
 
 # virtualenv
-venv/
-.venv/
+venv*/
+?venv*/
 
 # pycharm
 .idea/

reportportal_client/logs/__init__.py

@@ -35,7 +35,7 @@ def __init__(self, name, level=0):
         super(RPLogger, self).__init__(name, level=level)
 
     def _log(self, level, msg, args,
-             exc_info=None, extra=None, stack_info=False, attachment=None):
+             exc_info=None, extra=None, stack_info=False, attachment=None, **kwargs):
         """
         Low-level logging routine which creates a LogRecord and then calls.
 
@@ -59,7 +59,10 @@ def _log(self, level, msg, args,
                     # and returns 3 elements
                     fn, lno, func = self.findCaller()
                 else:
-                    fn, lno, func, sinfo = self.findCaller(stack_info)
+                    if 'stacklevel' in kwargs:
+                        fn, lno, func, sinfo = self.findCaller(stack_info, kwargs['stacklevel'])
+                    else:
+                        fn, lno, func, sinfo = self.findCaller(stack_info)
 
             except ValueError:  # pragma: no cover
                 fn, lno, func = '(unknown file)', 0, '(unknown function)'

tests/logs/test_rp_logger.py

@@ -10,7 +10,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License
+import sys
 import logging
+import inspect
 from logging import LogRecord
 
 import pytest
@@ -65,3 +67,12 @@ def test_log_level_filter(handler_level, log_level, expected_calls):
     getattr(logger, log_level)('test_log')
 
     assert mock_client.log.call_count == expected_calls
+
+
+@pytest.skipif(sys.version_info < (3, 8), '"stacklevel" introduced in Python 3.8, so not actual for earlier versions')
+@mock.patch('reportportal_client.logs.logging.Logger.handle')
+def test_stacklevel_record_make(logger_handler):
+    logger = RPLogger('test_logger')
+    logger.error('test_log', exc_info=RuntimeError('test'), stack_info=inspect.stack(), stacklevel=2)
+    record = verify_record(logger_handler)
+    assert record.stack_info.endswith('return func(*newargs, **newkeywargs)')