synapse 2.237.0__tar.gz → 2.239.0__tar.gz

{synapse-2.237.0/synapse.egg-info → synapse-2.239.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synapse
-Version: 2.237.0
+Version: 2.239.0
 Summary: Synapse Intelligence Analysis Framework
 Author-email: The Vertex Project LLC <root@vertex.link>
 License-Expression: Apache-2.0
@@ -18,10 +18,9 @@ Classifier: Operating System :: POSIX :: Linux
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: pyOpenSSL<24.3.0,>=24.0.0
-Requires-Dist: cryptography<44.0.0,>=43.0.1
+Requires-Dist: cryptography<47.0.0,>=46.0.7
 Requires-Dist: msgpack<1.2.0,>=1.0.5
-Requires-Dist: xxhash<3.6.0,>=1.4.4
+Requires-Dist: xxhash<3.7.0,>=1.4.4
 Requires-Dist: lmdb<1.8.0,>=1.7.0
 Requires-Dist: tornado<7.0.0,>=6.2.0
 Requires-Dist: regex>=2022.9.11
@@ -30,9 +29,9 @@ Requires-Dist: aiohttp<4.0,>=3.10.0
 Requires-Dist: aiohttp-socks<0.11.0,>=0.9.0
 Requires-Dist: aiosmtplib<3.1.0,>=3.0.0
 Requires-Dist: prompt_toolkit<3.1.0,>=3.0.29
-Requires-Dist: lark==1.2.2
+Requires-Dist: lark==1.3.1
 Requires-Dist: Pygments<2.21.0,>=2.7.4
-Requires-Dist: packaging<25.0,>=20.0
+Requires-Dist: packaging<27.0,>=20.0
 Requires-Dist: fastjsonschema<2.22.0,>=2.20.0
 Requires-Dist: stix2-validator<4.0.0,>=3.2.0
 Requires-Dist: vcrpy<5.2.0,>=4.3.1
@@ -44,7 +43,7 @@ Requires-Dist: scalecodec<1.3.0,>=1.0.2
 Requires-Dist: cbor2<5.10.0,>=5.4.1
 Requires-Dist: bech32==1.2.0
 Requires-Dist: oauthlib<4.0.0,>=3.2.1
-Requires-Dist: idna<3.11,>=3.6
+Requires-Dist: idna<3.12,>=3.6
 Requires-Dist: python-dateutil<3.0,>=2.8
 Requires-Dist: pytz<2025.3,>=2023.3
 Requires-Dist: beautifulsoup4[html5lib]<5.0,>=4.11.1

{synapse-2.237.0 → synapse-2.239.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'synapse'
-version = '2.237.0'
+version = '2.239.0'
 authors = [
     { name = 'The Vertex Project LLC', email = 'root@vertex.link'},
 ]
@@ -22,10 +22,9 @@ classifiers = [
     'Operating System :: POSIX :: Linux',
 ]
 dependencies = [
-    'pyOpenSSL>=24.0.0,<24.3.0',
-    'cryptography>=43.0.1,<44.0.0',
+    'cryptography>=46.0.7,<47.0.0',
     'msgpack>=1.0.5,<1.2.0',
-    'xxhash>=1.4.4,<3.6.0',
+    'xxhash>=1.4.4,<3.7.0',
     'lmdb>=1.7.0,<1.8.0',
     'tornado>=6.2.0,<7.0.0',
     'regex>=2022.9.11',
@@ -34,9 +33,9 @@ dependencies = [
     'aiohttp-socks>=0.9.0,<0.11.0',
     'aiosmtplib>=3.0.0,<3.1.0',
     'prompt_toolkit>=3.0.29,<3.1.0',
-    'lark==1.2.2',
+    'lark==1.3.1',
     'Pygments>=2.7.4,<2.21.0',
-    'packaging>=20.0,<25.0',
+    'packaging>=20.0,<27.0',
     'fastjsonschema>=2.20.0,<2.22.0',
     'stix2-validator>=3.2.0,<4.0.0',
     'vcrpy>=4.3.1,<5.2.0',
@@ -48,7 +47,7 @@ dependencies = [
     'cbor2>=5.4.1,<5.10.0',
     'bech32==1.2.0',
     'oauthlib>=3.2.1,<4.0.0',
-    'idna>=3.6,<3.11',
+    'idna>=3.6,<3.12',
     'python-dateutil>=2.8,<3.0',
     'pytz>=2023.3,<2025.3',
     'beautifulsoup4[html5lib]>=4.11.1,<5.0',

{synapse-2.237.0 → synapse-2.239.0}/synapse/axon.py

@@ -1067,7 +1067,7 @@ class Axon(s_cell.Cell):
         fsize = await self._reqHas(sha256)
 
         fhash = s_common.ehex(sha256)
-        logger.debug(f'Getting blob [{fhash}].', extra=await self.getLogExtra(sha256=fhash))
+        logger.debug(f'Getting blob [{fhash}].', extra=self.getLogExtra(sha256=fhash))
 
         if offs is not None or size is not None:
 
@@ -1203,7 +1203,7 @@ class Axon(s_cell.Cell):
         await self._reqHas(sha256)
 
         fhash = s_common.ehex(sha256)
-        logger.debug(f'Getting blob [{fhash}].', extra=await self.getLogExtra(sha256=fhash))
+        logger.debug(f'Getting blob [{fhash}].', extra=self.getLogExtra(sha256=fhash))
 
         hashset = s_hashset.HashSet()
 
@@ -1251,7 +1251,7 @@ class Axon(s_cell.Cell):
                 return int.from_bytes(byts, 'big')
 
             fhash = s_common.ehex(sha256)
-            logger.debug(f'Saving blob [{fhash}].', extra=await self.getLogExtra(sha256=fhash))
+            logger.debug(f'Saving blob [{fhash}].', extra=self.getLogExtra(sha256=fhash))
 
             size = await self._saveFileGenr(sha256, genr, size)
 
@@ -1378,7 +1378,7 @@ class Axon(s_cell.Cell):
                 return False
 
             fhash = s_common.ehex(sha256)
-            logger.debug(f'Deleting blob [{fhash}].', extra=await self.getLogExtra(sha256=fhash))
+            logger.debug(f'Deleting blob [{fhash}].', extra=self.getLogExtra(sha256=fhash))
 
             size = int.from_bytes(byts, 'big')
             self.axonmetrics.inc('file:count', valu=-1)
@@ -1447,7 +1447,7 @@ class Axon(s_cell.Cell):
             todo = s_common.todo(_spawn_readlines, sock00, errors=errors)
             async with await s_base.Base.anit() as scope:
 
-                scope.schedCoro(s_process.spawn(todo, log_conf=await self._getSpawnLogConf()))
+                scope.schedCoro(s_process.spawn(todo, logconf=self.getLogConf()))
                 feedtask = scope.schedCoro(self._sha256ToLink(sha256, link00))
 
                 while not self.isfini:
@@ -1481,7 +1481,7 @@ class Axon(s_cell.Cell):
             todo = s_common.todo(_spawn_readrows, sock00, dialect, fmtparams, errors=errors)
             async with await s_base.Base.anit() as scope:
 
-                scope.schedCoro(s_process.spawn(todo, log_conf=await self._getSpawnLogConf()))
+                scope.schedCoro(s_process.spawn(todo, logconf=self.getLogConf()))
                 feedtask = scope.schedCoro(self._sha256ToLink(sha256, link00))
 
                 while not self.isfini:
@@ -1817,7 +1817,7 @@ class Axon(s_cell.Cell):
         Returns:
             dict: An information dictionary containing the results of the request.
         '''
-        logger.debug(f'Wget called for [{url}].', extra=await self.getLogExtra(url=s_urlhelp.sanitizeUrl(url)))
+        logger.debug(f'Wget called for [{url}].', extra=self.getLogExtra(url=s_urlhelp.sanitizeUrl(url)))
 
         ssl = self.getCachedSslCtx(opts=ssl_opts, verify=ssl)
 

{synapse-2.237.0 → synapse-2.239.0}/synapse/common.py

@@ -7,9 +7,7 @@ import http
 import stat
 import time
 import heapq
-import queue
 import types
-import atexit
 import base64
 import shutil
 import struct
@@ -32,15 +30,13 @@ import collections
 
 import http.cookies
 import tornado.escape
-import logging.handlers
 
 import yaml
 import regex
 
 import synapse.exc as s_exc
-import synapse.lib.const as s_const
+import synapse.lib.logging as s_logging
 import synapse.lib.msgpack as s_msgpack
-import synapse.lib.structlog as s_structlog
 
 import synapse.vendor.cpython.lib.ipaddress as ipaddress  # noqa: F401
 import synapse.vendor.cpython.lib.http.cookies as v_cookies
@@ -763,108 +759,6 @@ def makedirs(path, mode=0o777):
 def iterzip(*args, fillvalue=None):
     return itertools.zip_longest(*args, fillvalue=fillvalue)
 
-def _getLogConfFromEnv(defval=None, structlog=None, datefmt=None):
-    if structlog:
-        structlog = 'true'
-    else:
-        structlog = 'false'
-    defval = os.getenv('SYN_LOG_LEVEL', defval)
-    datefmt = os.getenv('SYN_LOG_DATEFORMAT', datefmt)
-    structlog = envbool('SYN_LOG_STRUCT', structlog)
-    ret = {'defval': defval, 'structlog': structlog, 'datefmt': datefmt}
-    return ret
-
-def normLogLevel(valu):
-    '''
-    Norm a log level value to a integer.
-
-    Args:
-        valu: The value to norm ( a string or integer ).
-
-    Returns:
-        int: A valid Logging log level.
-    '''
-    if isinstance(valu, int):
-        if valu not in s_const.LOG_LEVEL_INVERSE_CHOICES:
-            raise s_exc.BadArg(mesg=f'Invalid log level provided: {valu}', valu=valu)
-        return valu
-    if isinstance(valu, str):
-        valu = valu.strip()
-        try:
-            valu = int(valu)
-        except ValueError:
-            valu = valu.upper()
-            ret = s_const.LOG_LEVEL_CHOICES.get(valu)
-            if ret is None:
-                raise s_exc.BadArg(mesg=f'Invalid log level provided: {valu}', valu=valu) from None
-            return ret
-        else:
-            return normLogLevel(valu)
-    raise s_exc.BadArg(mesg=f'Unknown log level type: {type(valu)} {valu}', valu=valu)
-
-def setlogging(mlogger, defval=None, structlog=None, log_setup=True, datefmt=None):
-    '''
-    Configure synapse logging.
-
-    Args:
-        mlogger (logging.Logger): Reference to a logging.Logger()
-        defval (str): Default log level. May be an integer.
-        structlog (bool): Enabled structured (jsonl) logging output.
-        datefmt (str): Optional strftime format string.
-
-    Notes:
-        This calls logging.basicConfig and should only be called once per process.
-
-    Returns:
-        None
-    '''
-    ret = _getLogConfFromEnv(defval, structlog, datefmt)
-
-    datefmt = ret.get('datefmt')
-    log_level = ret.get('defval')
-    log_struct = ret.get('structlog')
-
-    if log_level:  # pragma: no cover
-
-        log_level = normLogLevel(log_level)
-
-        # See https://docs.python.org/3/howto/logging-cookbook.html#blocking-handlers for info on this configuration
-        logq = queue.SimpleQueue()
-        handler = logging.handlers.QueueHandler(logq)
-        stream = logging.StreamHandler()
-
-        listener = logging.handlers.QueueListener(logq, stream)
-        listener.start()
-
-        def logfini():
-            # On shutdown, stop the QueueListener, remove QueueHandler from the
-            # logger, and add the StreamHandler so we don't lose messages that
-            # are logged after the QueueListener has shutdown. Messages already
-            # in the QueueListener will flush as part of the stop(). This is all
-            # required because atexit handlers are called in reverse order of
-            # when they were registered. So, we want to make sure to have
-            # functional logging until the process is completely gone.
-            listener.stop()
-            logging.root.removeHandler(handler)
-            logging.root.addHandler(stream)
-
-        atexit.register(logfini)
-
-        if log_struct:
-            formatter = s_structlog.JsonFormatter(datefmt=datefmt)
-        else:
-            formatter = logging.Formatter(fmt=s_const.LOG_FORMAT, datefmt=datefmt)
-
-        stream.setFormatter(formatter)
-
-        logging.root.setLevel(log_level)
-        logging.root.addHandler(handler)
-
-        if log_setup:
-            mlogger.info('log level set to %s', s_const.LOG_LEVEL_INVERSE_CHOICES.get(log_level))
-
-    return ret
-
 syndir_default = '~/.syn'
 syndir = os.getenv('SYN_DIR')
 if syndir is None:
@@ -959,14 +853,14 @@ def config(conf, confdefs):
 
 @functools.lru_cache(maxsize=1024)
 def deprecated(name, curv='2.x', eolv='3.0.0'):
-    mesg = f'"{name}" is deprecated in {curv} and will be removed in {eolv}'
-    logger.warning(mesg, extra={'synapse': {'curv': curv, 'eolv': eolv}})
+    mesg = f'{name} is deprecated in {curv} and will be removed in {eolv}'
+    logger.warning(mesg, extra=s_logging.getLogExtra(curv=curv, eolv=eolv))
     return mesg
 
 @functools.lru_cache(maxsize=1024)
 def deprdate(name, date):  # pragma: no cover
     mesg = f'{name} is deprecated and will be removed on {date}.'
-    logger.warning(mesg, extra={'synapse': {'eold': date}})
+    logger.warning(mesg, extra=s_logging.getLogExtra(eold=date))
     return mesg
 
 def jsonsafe_nodeedits(nodeedits):

{synapse-2.237.0 → synapse-2.239.0}/synapse/cortex.py

@@ -35,6 +35,7 @@ import synapse.lib.parser as s_parser
 import synapse.lib.dyndeps as s_dyndeps
 import synapse.lib.grammar as s_grammar
 import synapse.lib.httpapi as s_httpapi
+import synapse.lib.logging as s_logging
 import synapse.lib.msgpack as s_msgpack
 import synapse.lib.modules as s_modules
 import synapse.lib.schemas as s_schemas
@@ -984,7 +985,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         self._initCorePerms()
 
         # Reset the storm:log:level from the config value to an int for internal use.
-        self.conf['storm:log:level'] = s_common.normLogLevel(self.conf.get('storm:log:level'))
+        self.conf['storm:log:level'] = s_logging.normLogLevel(self.conf.get('storm:log:level'))
         self.stormlog = self.conf.get('storm:log')
         self.stormloglvl = self.conf.get('storm:log:level')
 
@@ -1078,7 +1079,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
             mesg = f'User {useriden} ({user.name}) has a rule on the "cortex" authgate. This authgate is not used ' \
                    f'for permission checks and will be removed in Synapse v3.0.0.'
-            logger.warning(mesg, extra=await self.getLogExtra(user=useriden, username=user.name))
+            logger.warning(mesg)
         for roleiden in ag.gateroles.keys():
             role = self.auth.role(roleiden)
             if role is None:
@@ -1086,7 +1087,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
             mesg = f'Role {roleiden} ({role.name}) has a rule on the "cortex" authgate. This authgate is not used ' \
                    f'for permission checks and will be removed in Synapse v3.0.0.'
-            logger.warning(mesg, extra=await self.getLogExtra(role=roleiden, rolename=role.name))
+            logger.warning(mesg)
 
         self._initVaults()
 
@@ -3088,7 +3089,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
                 name = cdef.get('name')
                 mesg = f"Storm command definition 'forms' key is deprecated and will be removed " \
                        f"in 3.0.0 (command {name} in package {pkgname})"
-                logger.warning(mesg, extra=await self.getLogExtra(name=name, pkgname=pkgname))
+                logger.warning(mesg, extra=self.getLogExtra(name=name, pkgname=pkgname))
 
         for gdef in pkgdef.get('graphs', ()):
             gdef['iden'] = s_common.guid((pkgname, gdef.get('name')))
@@ -3157,7 +3158,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
                 await self.fire('core:pkg:onload:start', pkg=name)
 
-                logextra = await self.getLogExtra(pkg=name, vers=pkgvers)
+                logextra = self.getLogExtra(pkg=name, vers=pkgvers)
 
                 verskey = 'storage:version'
 
@@ -3191,7 +3192,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
                             await self.setStormPkgVar(name, verskey, vers)
                             continue
 
-                        logextra['synapse']['initvers'] = vers
+                        logextra['params']['initvers'] = vers
 
                         logger.info(f'{name} starting init vers={vers}: {vname}', extra=logextra)
 
@@ -6230,7 +6231,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
             if proxy is not None:
                 proxname = proxy._ahainfo.get('name')
-                extra = await self.getLogExtra(mirror=proxname, hash=s_storm.queryhash(text))
+                extra = self.getLogExtra(mirror=proxname, hash=s_storm.queryhash(text))
                 logger.info(f'Offloading Storm query to mirror {proxname}.', extra=extra)
 
                 mirropts = await self._getMirrorOpts(opts)
@@ -6298,21 +6299,21 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
                     return proxy
 
                 mesg = f'Pool mirror [{proxyname}] is too far out of sync. Skipping.'
-                logger.warning(mesg, extra=await self.getLogExtra(delta=delta, mirror=proxyname, mirror_offset=miroffs))
+                logger.warning(mesg, extra=self.getLogExtra(delta=delta, mirror=proxyname, mirror_offset=miroffs))
 
             except s_exc.ShuttingDown:
                 mesg = f'Proxy for pool mirror [{proxyname}] is shutting down. Skipping.'
-                logger.warning(mesg, extra=await self.getLogExtra(mirror=proxyname))
+                logger.warning(mesg, extra=self.getLogExtra(mirror=proxyname))
 
             except s_exc.IsFini:
                 mesg = f'Proxy for pool mirror [{proxyname}] was shutdown. Skipping.'
-                logger.warning(mesg, extra=await self.getLogExtra(mirror=proxyname))
+                logger.warning(mesg, extra=self.getLogExtra(mirror=proxyname))
 
             except TimeoutError:
                 mesg = f'Timeout waiting for pool mirror [{proxyname}] Nexus offset.'
-                logger.warning(mesg, extra=await self.getLogExtra(mirror=proxyname))
+                logger.warning(mesg, extra=self.getLogExtra(mirror=proxyname))
 
-        logger.warning('Pool members exhausted. Running query locally.', extra=await self.getLogExtra())
+        logger.warning('Pool members exhausted. Running query locally.', extra=self.getLogExtra())
         return None
 
     async def storm(self, text, opts=None):
@@ -6324,7 +6325,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
             if proxy is not None:
                 proxname = proxy._ahainfo.get('name')
-                extra = await self.getLogExtra(mirror=proxname, hash=s_storm.queryhash(text))
+                extra = self.getLogExtra(mirror=proxname, hash=s_storm.queryhash(text))
                 logger.info(f'Offloading Storm query to mirror {proxname}.', extra=extra)
 
                 mirropts = await self._getMirrorOpts(opts)
@@ -6358,7 +6359,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
             if proxy is not None:
                 proxname = proxy._ahainfo.get('name')
-                extra = await self.getLogExtra(mirror=proxname, hash=s_storm.queryhash(text))
+                extra = self.getLogExtra(mirror=proxname, hash=s_storm.queryhash(text))
                 logger.info(f'Offloading Storm query to mirror {proxname}.', extra=extra)
 
                 mirropts = await self._getMirrorOpts(opts)
@@ -6388,7 +6389,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
             if proxy is not None:
                 proxname = proxy._ahainfo.get('name')
-                extra = await self.getLogExtra(mirror=proxname, hash=s_storm.queryhash(text))
+                extra = self.getLogExtra(mirror=proxname, hash=s_storm.queryhash(text))
                 logger.info(f'Offloading Storm query to mirror {proxname}.', extra=extra)
 
                 mirropts = await self._getMirrorOpts(opts)
@@ -6515,8 +6516,8 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
     async def _getStormEval(self, text):
         try:
             astvalu = copy.deepcopy(await s_parser.evalcache.aget(text))
-        except s_exc.FatalErr:
-            logger.exception(f'Fatal error while parsing [{text}]', extra={'synapse': {'text': text}})
+        except s_exc.FatalErr: # pragma: no cover
+            logger.exception(f'Fatal error while parsing [{text}]', extra=self.getLogExtra(text=text))
             await self.fini()
             raise
         astvalu.init(self)
@@ -6525,8 +6526,8 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
     async def _getStormQuery(self, args):
         try:
             query = copy.deepcopy(await s_parser.querycache.aget(args))
-        except s_exc.FatalErr:
-            logger.exception(f'Fatal error while parsing [{args}]', extra={'synapse': {'text': args[0]}})
+        except s_exc.FatalErr: # pragma: no cover
+            logger.exception(f'Fatal error while parsing [{args}]', extra=self.getLogExtra(text=args[0]))
             await self.fini()
             raise
         query.init(self)
@@ -6593,11 +6594,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             if info is None:
                 info = {}
             info['text'] = text
-            info['username'] = user.name
-            info['user'] = user.iden
             info['hash'] = s_storm.queryhash(text)
             stormlogger.log(self.stormloglvl, 'Executing storm query {%s} as [%s]', text, user.name,
-                            extra={'synapse': info})
+                            extra=self.getLogExtra(**info))
 
     async def getNodeByNdef(self, ndef, view=None):
         '''
@@ -7088,7 +7087,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         '''
         await self.agenda.enable(iden)
         await self.feedBeholder('cron:enable', {'iden': iden}, gates=[iden])
-        logger.info(f'Enabled cron job {iden}', extra=await self.getLogExtra(iden=iden, status='MODIFY'))
+        logger.info(f'Enabled cron job {iden}', extra=self.getLogExtra(iden=iden, status='MODIFY'))
 
     @s_nexus.Pusher.onPushAuto('cron:disable')
     async def disableCronJob(self, iden):
@@ -7101,7 +7100,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         await self.agenda.disable(iden)
         await self._killCronTask(iden)
         await self.feedBeholder('cron:disable', {'iden': iden}, gates=[iden])
-        logger.info(f'Disabled cron job {iden}', extra=await self.getLogExtra(iden=iden, status='MODIFY'))
+        logger.info(f'Disabled cron job {iden}', extra=self.getLogExtra(iden=iden, status='MODIFY'))
 
     async def killCronTask(self, iden):
         if self.agenda.appts.get(iden) is None:

{synapse-2.237.0 → synapse-2.239.0}/synapse/datamodel.py

@@ -16,6 +16,7 @@ import synapse.lib.cache as s_cache
 import synapse.lib.types as s_types
 import synapse.lib.dyndeps as s_dyndeps
 import synapse.lib.grammar as s_grammar
+import synapse.lib.logging as s_logging
 import synapse.lib.msgpack as s_msgpack
 
 logger = logging.getLogger(__name__)
@@ -948,7 +949,6 @@ class Model:
     def _checkTypeDef(self, typ):
         if 'comp' in typ.info.get('bases', ()):
             for fname, ftypename in typ.opts.get('fields', ()):
-                extra = {'synapse': {'type': typ.name, 'field': fname}}
 
                 if isinstance(ftypename, (list, tuple)):
                     ftypename = ftypename[0]
@@ -957,7 +957,7 @@ class Model:
                     ftype = typ.tcache[fname]
                 except s_exc.BadTypeDef:
                     mesg = f'The {typ.name} field {fname} is declared as a type ({ftypename}) that does not exist.'
-                    logger.warning(mesg, extra=extra)
+                    logger.warning(mesg, extra=s_logging.getLogExtra(type=typ.name, field=fname))
                     continue
 
                 # We're only interested in extended model comp types
@@ -966,12 +966,11 @@ class Model:
 
                 if ftype.ismutable:
                     mesg = f'Comp types with mutable fields ({typ.name}:{fname}) are deprecated and will be removed in 3.0.0.'
-                    logger.warning(mesg, extra=extra)
+                    logger.warning(mesg, extra=s_logging.getLogExtra(type=typ.name, field=fname))
 
                 if ftype.deprecated:
                     mesg = f'The type {typ.name} field {fname} uses a deprecated type {ftype.name}.'
-                    extra['synapse']['field:type'] = ftype.name
-                    logger.warning(mesg, extra=extra)
+                    logger.warning(mesg, extra=s_logging.getLogExtra(type=typ.name, field=fname, field_type=ftype.name))
 
     def addForm(self, formname, forminfo, propdefs, checks=True):
 

{synapse-2.237.0 → synapse-2.239.0}/synapse/lib/agenda.py

@@ -17,6 +17,7 @@ import synapse.telepath as s_telepath
 
 import synapse.lib.base as s_base
 import synapse.lib.coro as s_coro
+import synapse.lib.logging as s_logging
 import synapse.lib.schemas as s_schemas
 
 # Agenda: manages running one-shot and periodic tasks in the future ("appointments")
@@ -433,7 +434,7 @@ class _Appt:
     async def edits(self, edits):
         for name, valu in edits.items():
             if name not in self.__class__._synced_attrs:
-                extra = await self.stor.core.getLogExtra(name=name, valu=valu)
+                extra = self.stor.core.getLogExtra(name=name, valu=valu)
                 logger.warning('_Appt.edits() Invalid attribute received: %s = %r', name, valu, extra=extra)
                 continue
 
@@ -845,22 +846,18 @@ class Agenda(s_base.Base):
                 if appt.isrunning:  # pragma: no cover
                     mesg = f'Appointment {appt.iden} {appt.name} is still running from previous time when scheduled' \
                            f' to run. Skipping.'
-                    logger.warning(mesg,
-                                   extra={'synapse': {'iden': appt.iden, 'name': appt.name}})
+                    logger.warning(mesg, extra=self.core.getLogExtra(iden=appt.iden, name=appt.name))
                 else:
                     try:
                         await self._execute(appt)
                     except Exception as e:
-                        extra = {'iden': appt.iden, 'name': appt.name, 'user': appt.creator, 'view': appt.view}
-                        user = self.core.auth.user(appt.creator)
-                        if user is not None:
-                            extra['username'] = user.name
+                        extra = {'iden': appt.iden, 'name': appt.name, 'view': appt.view}
                         if isinstance(e, s_exc.SynErr):
                             mesg = e.get('mesg', str(e))
                         else:  # pragma: no cover
                             mesg = str(e)
                         logger.exception(f'Agenda error running appointment {appt.iden} {appt.name}: {mesg}',
-                                         extra={'synapse': extra})
+                                         extra=self.core.getLogExtra(**extra))
                         await self._markfailed(appt, f'error: {e}')
 
     async def _execute(self, appt):
@@ -870,23 +867,21 @@ class Agenda(s_base.Base):
         user = self.core.auth.user(appt.creator)
         if user is None:
             logger.warning(f'Unknown user {appt.creator} in stored appointment {appt.iden} {appt.name}',
-                           extra={'synapse': {'iden': appt.iden, 'name': appt.name, 'user': appt.creator}})
+                           extra=self.core.getLogExtra(iden=appt.iden, name=appt.name, user=appt.creator))
             await self._markfailed(appt, 'unknown user')
             return
 
         locked = user.info.get('locked')
         if locked:
             logger.warning(f'Cron {appt.iden} {appt.name} failed because creator {user.name} is locked',
-                           extra={'synapse': {'iden': appt.iden, 'name': appt.name, 'user': appt.creator,
-                                              'username': user.name}})
+                           extra=self.core.getLogExtra(iden=appt.iden, name=appt.name))
             await self._markfailed(appt, 'locked user')
             return
 
         view = self.core.getView(iden=appt.view, user=user)
         if view is None:
             logger.warning(f'Unknown view {appt.view} in stored appointment {appt.iden} {appt.name}',
-                           extra={'synapse': {'iden': appt.iden, 'name': appt.name, 'user': appt.creator,
-                                              'username': user.name, 'view': appt.view}})
+                           extra=self.core.getLogExtra(iden=appt.iden, name=appt.name, view=appt.view))
             await self._markfailed(appt, 'unknown view')
             return
 
@@ -894,6 +889,7 @@ class Agenda(s_base.Base):
 
         coro = self._runJob(user, appt)
         task = self.core.runActiveTask(coro)
+        task._syn_scope['user'] = user
 
         appt.task = await self.core.boss.promotetask(task, f'Cron {appt.iden}', user, info=info)
         async def fini():
@@ -955,12 +951,11 @@ class Agenda(s_base.Base):
         await self.core.addCronEdits(appt.iden, edits)
 
         logger.info(f'Agenda executing for iden={appt.iden}, name={appt.name} user={user.name}, view={appt.view}, query={appt.query}',
-                    extra={'synapse': {'iden': appt.iden, 'name': appt.name, 'user': user.iden, 'text': appt.query,
-                                       'username': user.name, 'view': appt.view}})
+                    extra=self.core.getLogExtra(iden=appt.iden, name=appt.name, text=appt.query, view=appt.view))
         starttime = self._getNowTick()
 
         success = False
-        loglevel = s_common.normLogLevel(appt.loglevel)
+        loglevel = s_logging.normLogLevel(appt.loglevel)
 
         try:
             opts = {
@@ -985,8 +980,10 @@ class Agenda(s_base.Base):
 
                     elif mesg[0] == 'warn' and loglevel <= logging.WARNING:
                         text = mesg[1].get('mesg', '<missing message>')
-                        extra = await self.core.getLogExtra(cron=appt.iden, **mesg[1])
-                        logger.warning(f'Cron job {appt.iden} issued warning: {text}', extra=extra)
+                        _params = mesg[1]
+                        _params['iden'] = appt.iden
+                        logger.warning(f'Cron job {appt.iden} issued warning: {text}',
+                                       extra=self.core.getLogExtra(**_params))
 
                     elif mesg[0] == 'err':
                         excname, errinfo = mesg[1]
@@ -1002,7 +999,7 @@ class Agenda(s_base.Base):
         except Exception as e:
             result = f'raised exception {e}'
             logger.exception(f'Agenda job {appt.iden} {appt.name} raised exception',
-                             extra={'synapse': {'iden': appt.iden, 'name': appt.name}}
+                             extra=self.core.getLogExtra(iden=appt.iden, name=appt.name),
                              )
         else:
             success = True
@@ -1026,8 +1023,7 @@ class Agenda(s_base.Base):
                    f'took {took:.3f}s'
             if not self.core.isactive:
                 mesg = mesg + ' Agenda status will not be saved since the Cortex is no longer the leader.'
-            logger.info(mesg, extra={'synapse': {'iden': appt.iden, 'name': appt.name, 'user': user.iden,
-                                                 'result': result, 'username': user.name, 'took': took}})
+            logger.info(mesg, extra=self.core.getLogExtra(iden=appt.iden, name=appt.name, result=result, took=took))
             edits = {
                 'lastfinishtime': finishtime,
                 'isrunning': False,