Get rid of RequestContext

requirements/base.txt

@@ -10,4 +10,4 @@ packaging>=21.3
 looseversion
 # We need contextvars for salt-ssh
 contextvars
-tornado==6.1
+tornado>=6.1

requirements/static/ci/docs.in

@@ -1,5 +1,6 @@
 --constraint=./py{py_version}/{platform}.txt
 
+
 sphinx>=3.5.1; python_version < '3.9'
 sphinx>=6.1.0; python_version >= '3.9'
 myst-docutils[linkify]

requirements/static/ci/py3.10/cloud.txt

@@ -850,6 +850,8 @@ toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
     # via pytest
+tornado==6.1.0
+    # via -r requirements/base.txt
 transitions==0.8.9
     # via junos-eznc
 typing-extensions==4.2.0

requirements/static/ci/py3.10/darwin.txt

@@ -832,7 +832,7 @@ toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
     # via pytest
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 transitions==0.8.1
     # via junos-eznc

requirements/static/ci/py3.10/docs.txt

@@ -177,6 +177,10 @@ tempora==4.1.1
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   portend
+tornado==6.1.0
+    # via
+    #   -c requirements/static/ci/py3.10/linux.txt
+    #   -r requirements/base.txt
 typing-extensions==4.2.0
     # via
     #   -c requirements/static/ci/py3.10/linux.txt

requirements/static/ci/py3.10/freebsd.txt

@@ -832,7 +832,7 @@ toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
     # via pytest
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 transitions==0.8.1
     # via junos-eznc

requirements/static/ci/py3.10/lint.txt

@@ -821,7 +821,9 @@ toml==0.10.2
     #   -r requirements/static/ci/common.in
     #   -r requirements/static/ci/lint.in
 tornado==6.1
-    # via python-telegram-bot
+    # via
+    #   -r requirements/base.txt
+    #   python-telegram-bot
 transitions==0.8.8
     # via junos-eznc
 twilio==7.9.2

requirements/static/ci/py3.10/pkgtests-windows.txt

@@ -150,6 +150,8 @@ tempora==5.2.1
     # via portend
 tomli==2.0.1
     # via pytest
+tornado==6.1.0
+    # via -r requirements/base.txt
 typing-extensions==4.4.0
     # via
     #   pydantic

requirements/static/ci/py3.10/pkgtests.txt

@@ -139,6 +139,8 @@ tempora==5.2.0
     # via portend
 tomli==2.0.1
     # via pytest
+tornado==6.1.0
+    # via -r requirements/base.txt
 typing-extensions==4.4.0
     # via
     #   pydantic

requirements/static/ci/py3.10/windows.txt

@@ -381,7 +381,7 @@ toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
     # via pytest
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 typing-extensions==4.4.0
     # via

requirements/static/ci/py3.11/darwin.txt

@@ -794,7 +794,7 @@ timelib==0.2.5
     # via -r requirements/darwin.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 typing-extensions==4.2.0
     # via

requirements/static/ci/py3.11/freebsd.txt

@@ -802,7 +802,7 @@ timelib==0.2.5
     # via -r requirements/static/pkg/freebsd.in
 toml==0.10.2
     # via -r requirements/static/ci/common.in
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 typing-extensions==4.2.0
     # via

requirements/static/ci/py3.11/windows.txt

@@ -377,7 +377,7 @@ timelib==0.2.5
     # via -r requirements/windows.txt
 toml==0.10.2
     # via -r requirements/static/ci/common.in
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 typing-extensions==4.4.0
     # via

requirements/static/ci/py3.7/cloud.txt

@@ -906,7 +906,7 @@ toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
     # via pytest
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 transitions==0.8.9
     # via junos-eznc

requirements/static/ci/py3.7/docs.txt

@@ -185,6 +185,10 @@ tempora==4.1.1
     # via
     #   -c requirements/static/ci/py3.7/linux.txt
     #   portend
+tornado==6.1.0
+    # via
+    #   -c requirements/static/ci/py3.7/linux.txt
+    #   -r requirements/base.txt
 typing-extensions==3.10.0.0
     # via
     #   -c requirements/static/ci/py3.7/linux.txt

requirements/static/ci/py3.7/freebsd.txt

@@ -883,7 +883,7 @@ toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
     # via pytest
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 transitions==0.8.1
     # via junos-eznc

requirements/static/ci/py3.7/lint.txt

@@ -878,7 +878,9 @@ toml==0.10.2
     #   -r requirements/static/ci/common.in
     #   -r requirements/static/ci/lint.in
 tornado==6.1
-    # via python-telegram-bot
+    # via
+    #   -r requirements/base.txt
+    #   python-telegram-bot
 transitions==0.8.8
     # via junos-eznc
 twilio==7.9.2

requirements/static/ci/py3.7/windows.txt

@@ -396,7 +396,7 @@ toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
     # via pytest
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 typing-extensions==4.2.0
     # via

requirements/static/ci/py3.8/cloud.txt

@@ -895,6 +895,8 @@ toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
     # via pytest
+tornado==6.1.0
+    # via -r requirements/base.txt
 transitions==0.8.9
     # via junos-eznc
 typing-extensions==3.10.0.2

requirements/static/ci/py3.8/docs.txt

@@ -177,6 +177,10 @@ tempora==4.1.1
     # via
     #   -c requirements/static/ci/py3.8/linux.txt
     #   portend
+tornado==6.1.0
+    # via
+    #   -c requirements/static/ci/py3.8/linux.txt
+    #   -r requirements/base.txt
 typing-extensions==4.2.0
     # via
     #   -c requirements/static/ci/py3.8/linux.txt

requirements/static/ci/py3.8/freebsd.txt

@@ -873,7 +873,7 @@ toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
     # via pytest
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 transitions==0.8.1
     # via junos-eznc

requirements/static/ci/py3.8/lint.txt

@@ -869,7 +869,9 @@ toml==0.10.2
     #   -r requirements/static/ci/common.in
     #   -r requirements/static/ci/lint.in
 tornado==6.1
-    # via python-telegram-bot
+    # via
+    #   -r requirements/base.txt
+    #   python-telegram-bot
 transitions==0.8.8
     # via junos-eznc
 twilio==7.9.2

requirements/static/ci/py3.8/windows.txt

@@ -384,7 +384,7 @@ toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
     # via pytest
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 typing-extensions==4.2.0
     # via

requirements/static/ci/py3.9/cloud.txt

@@ -898,6 +898,8 @@ toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
     # via pytest
+tornado==6.1.0
+    # via -r requirements/base.txt
 transitions==0.8.9
     # via junos-eznc
 typing-extensions==3.10.0.2

requirements/static/ci/py3.9/darwin.txt

@@ -876,7 +876,7 @@ toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
     # via pytest
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 transitions==0.8.1
     # via junos-eznc

requirements/static/ci/py3.9/docs.txt

@@ -181,6 +181,10 @@ tempora==4.1.1
     # via
     #   -c requirements/static/ci/py3.9/linux.txt
     #   portend
+tornado==6.1
+    # via
+    #   -c requirements/static/ci/py3.9/linux.txt
+    #   -r requirements/base.txt
 typing-extensions==4.2.0
     # via
     #   -c requirements/static/ci/py3.9/linux.txt

requirements/static/ci/py3.9/freebsd.txt

@@ -876,7 +876,7 @@ toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
     # via pytest
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 transitions==0.8.1
     # via junos-eznc

requirements/static/ci/py3.9/lint.txt

@@ -870,7 +870,9 @@ toml==0.10.2
     #   -r requirements/static/ci/common.in
     #   -r requirements/static/ci/lint.in
 tornado==6.1
-    # via python-telegram-bot
+    # via
+    #   -r requirements/base.txt
+    #   python-telegram-bot
 transitions==0.8.8
     # via junos-eznc
 twilio==7.9.2

requirements/static/ci/py3.9/windows.txt

@@ -385,7 +385,7 @@ toml==0.10.2
     # via -r requirements/static/ci/common.in
 tomli==2.0.1
     # via pytest
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 typing-extensions==4.2.0
     # via

requirements/static/pkg/py3.10/darwin.txt

@@ -110,7 +110,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/darwin.txt
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 urllib3==1.26.6
     # via requests

requirements/static/pkg/py3.10/freebsd.txt

@@ -94,7 +94,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/static/pkg/freebsd.in
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 urllib3==1.26.6
     # via requests

requirements/static/pkg/py3.10/linux.txt

@@ -4,84 +4,90 @@
 #
 #    pip-compile --output-file=requirements/static/pkg/py3.10/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt
 #
-certifi==2022.12.7
+autocommand==2.2.2
+    # via jaraco.text
+certifi==2023.5.7
     # via requests
-cffi==1.14.6
+cffi==1.15.1
     # via cryptography
-chardet==3.0.4
+charset-normalizer==3.1.0
     # via requests
-cheroot==8.5.2
+cheroot==9.0.0
     # via cherrypy
-cherrypy==18.6.1
+cherrypy==18.8.0
     # via -r requirements/static/pkg/linux.in
 contextvars==2.4
     # via -r requirements/base.txt
-cryptography==39.0.2
+cryptography==40.0.2
     # via
     #   -r requirements/static/pkg/linux.in
     #   pyopenssl
-distro==1.5.0
+distro==1.8.0
     # via -r requirements/base.txt
-idna==2.8
+idna==3.4
     # via requests
-immutables==0.15
+immutables==0.19
     # via contextvars
-importlib-metadata==6.0.0
+importlib-metadata==6.6.0
     # via -r requirements/static/pkg/linux.in
-jaraco.classes==3.2.1
-    # via jaraco.collections
-jaraco.collections==3.4.0
+inflect==6.0.4
+    # via jaraco.text
+jaraco.collections==4.1.0
     # via cherrypy
-jaraco.functools==2.0
+jaraco.context==4.3.0
+    # via jaraco.text
+jaraco.functools==3.6.0
     # via
     #   cheroot
     #   jaraco.text
     #   tempora
-jaraco.text==3.5.1
+jaraco.text==3.11.1
     # via jaraco.collections
 jinja2==3.1.2
     # via -r requirements/base.txt
 jmespath==1.0.1
     # via -r requirements/base.txt
-looseversion==1.0.2
+looseversion==1.1.2
     # via -r requirements/base.txt
 markupsafe==2.1.2
     # via
     #   -r requirements/base.txt
     #   jinja2
-more-itertools==5.0.0
+more-itertools==9.1.0
     # via
     #   cheroot
     #   cherrypy
-    #   jaraco.classes
     #   jaraco.functools
-msgpack==1.0.2
+    #   jaraco.text
+msgpack==1.0.5
     # via -r requirements/base.txt
-packaging==22.0
+packaging==23.1
     # via -r requirements/base.txt
-portend==2.4
+portend==3.1.0
     # via cherrypy
-psutil==5.8.0
+psutil==5.9.5
     # via -r requirements/base.txt
 pycparser==2.21 ; python_version >= "3.9"
     # via
     #   -r requirements/static/pkg/linux.in
     #   cffi
-pycryptodomex==3.9.8
+pycryptodomex==3.17
     # via -r requirements/crypto.txt
-pyopenssl==23.0.0
+pydantic==1.10.7
+    # via inflect
+pyopenssl==23.1.1
     # via -r requirements/static/pkg/linux.in
-python-dateutil==2.8.1
+python-dateutil==2.8.2
     # via -r requirements/static/pkg/linux.in
-python-gnupg==0.4.8
+python-gnupg==0.5.0
     # via -r requirements/static/pkg/linux.in
-pytz==2022.1
+pytz==2023.3
     # via tempora
-pyyaml==5.4.1
+pyyaml==6.0
     # via -r requirements/base.txt
-pyzmq==23.2.0 ; python_version < "3.11"
+pyzmq==25.0.2 ; python_version < "3.11"
     # via -r requirements/zeromq.txt
-requests==2.25.1
+requests==2.30.0
     # via -r requirements/base.txt
 rpm-vercmp==0.1.2
     # via -r requirements/static/pkg/linux.in
@@ -90,19 +96,20 @@ setproctitle==1.3.2
 six==1.16.0
     # via
     #   cheroot
-    #   more-itertools
     #   python-dateutil
-tempora==4.1.1
+tempora==5.2.2
     # via portend
-timelib==0.2.5
+timelib==0.3.0
     # via -r requirements/static/pkg/linux.in
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
-urllib3==1.26.6
+typing-extensions==4.5.0
+    # via pydantic
+urllib3==2.0.2
     # via requests
-zc.lockfile==1.4
+zc.lockfile==3.0.post1
     # via cherrypy
-zipp==3.6.0
+zipp==3.15.0
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/static/pkg/py3.10/windows.txt

@@ -124,7 +124,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/windows.txt
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 urllib3==1.26.6
     # via

requirements/static/pkg/py3.11/darwin.txt

@@ -110,7 +110,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/darwin.txt
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 urllib3==1.26.6
     # via requests

requirements/static/pkg/py3.11/freebsd.txt

@@ -94,7 +94,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/static/pkg/freebsd.in
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 urllib3==1.26.6
     # via requests

requirements/static/pkg/py3.11/linux.txt

@@ -96,7 +96,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/static/pkg/linux.in
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 urllib3==1.26.6
     # via requests

requirements/static/pkg/py3.11/windows.txt

@@ -124,7 +124,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/windows.txt
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 urllib3==1.26.6
     # via

requirements/static/pkg/py3.7/freebsd.txt

@@ -92,7 +92,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/static/pkg/freebsd.in
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 typing-extensions==3.10.0.0
     # via importlib-metadata

requirements/static/pkg/py3.7/linux.txt

@@ -94,7 +94,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/static/pkg/linux.in
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 typing-extensions==3.10.0.0
     # via importlib-metadata

requirements/static/pkg/py3.7/windows.txt

@@ -125,7 +125,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/windows.txt
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 typing-extensions==4.4.0
     # via

requirements/static/pkg/py3.8/freebsd.txt

@@ -92,7 +92,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/static/pkg/freebsd.in
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 urllib3==1.26.6
     # via requests

requirements/static/pkg/py3.8/linux.txt

@@ -94,7 +94,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/static/pkg/linux.in
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 urllib3==1.26.6
     # via requests

requirements/static/pkg/py3.8/windows.txt

@@ -125,7 +125,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/windows.txt
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 urllib3==1.26.6
     # via

requirements/static/pkg/py3.9/darwin.txt

@@ -110,7 +110,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/darwin.txt
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 urllib3==1.26.6
     # via requests

requirements/static/pkg/py3.9/freebsd.txt

@@ -94,7 +94,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/static/pkg/freebsd.in
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 urllib3==1.26.6
     # via requests

requirements/static/pkg/py3.9/linux.txt

@@ -96,7 +96,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/static/pkg/linux.in
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 urllib3==1.26.6
     # via requests

requirements/static/pkg/py3.9/windows.txt

@@ -125,7 +125,7 @@ tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/windows.txt
-tornado==6.1
+tornado==6.1.0
     # via -r requirements/base.txt
 urllib3==1.26.6
     # via

salt/_logging/impl.py

@@ -32,7 +32,6 @@ from salt._logging.handlers import SysLogHandler  # isort:skip
 from salt._logging.handlers import WatchedFileHandler  # isort:skip
 from salt._logging.mixins import LoggingMixinMeta  # isort:skip
 from salt.exceptions import LoggingRuntimeError  # isort:skip
-from salt.utils.ctx import RequestContext  # isort:skip
 from salt.utils.immutabletypes import freeze, ImmutableDict  # isort:skip
 from salt.utils.textformat import TextFormat  # isort:skip
 
@@ -238,8 +237,11 @@ class SaltLoggingClass(LOGGING_LOGGER_CLASS, metaclass=LoggingMixinMeta):
             extra = {}
 
         # pylint: disable=no-member
-        current_jid = RequestContext.current.get("data", {}).get("jid", None)
-        log_fmt_jid = RequestContext.current.get("opts", {}).get("log_fmt_jid", None)
+        # XXX TODO
+        # current_jid = RequestContext.current.get("data", {}).get("jid", None)
+        # log_fmt_jid = RequestContext.current.get("opts", {}).get("log_fmt_jid", None)
+        current_jid = ""
+        log_fmt_jid = ""
         # pylint: enable=no-member
 
         if current_jid is not None:

salt/master.py

@@ -5,7 +5,6 @@ involves preparing the three listeners and the workers needed by the master.
 import collections
 import copy
 import ctypes
-import functools
 import logging
 import multiprocessing
 import os
@@ -58,7 +57,6 @@ from salt.config import DEFAULT_INTERVAL
 from salt.defaults import DEFAULT_TARGET_DELIM
 from salt.transport import TRANSPORTS
 from salt.utils.channel import iter_transport_opts
-from salt.utils.ctx import RequestContext
 from salt.utils.debug import (
     enable_sigusr1_handler,
     enable_sigusr2_handler,

salt/minion.py

@@ -4,7 +4,6 @@ Routines to set up a minion
 import binascii
 import contextlib
 import copy
-import functools
 import logging
 import multiprocessing
 import os
@@ -70,7 +69,6 @@ from salt.exceptions import (
     SaltSystemExit,
 )
 from salt.template import SLS_ENCODING
-from salt.utils.ctx import RequestContext
 from salt.utils.debug import enable_sigusr1_handler
 from salt.utils.event import tagify
 from salt.utils.network import parse_host_port
@@ -2250,7 +2248,8 @@ class Minion(MinionBase):
         else:
             # pylint: disable=unexpected-keyword-arg
             ret_val = self._send_req_async(
-                load, timeout=timeout, callback=lambda f: None
+                load,
+                timeout=timeout,
             )
             # pylint: enable=unexpected-keyword-arg
 
@@ -2340,7 +2339,8 @@ class Minion(MinionBase):
         else:
             # pylint: disable=unexpected-keyword-arg
             ret_val = self._send_req_async(
-                load, timeout=timeout, callback=lambda f: None
+                load,
+                timeout=timeout,
             )
             # pylint: enable=unexpected-keyword-arg