Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package python-oslo.log for openSUSE:Factory 
checked in at 2022-06-19 21:11:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-oslo.log (Old)
 and      /work/SRC/openSUSE:Factory/.python-oslo.log.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-oslo.log"

Sun Jun 19 21:11:40 2022 rev:22 rq:983766 version:5.0.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-oslo.log/python-oslo.log.changes  
2021-12-12 00:57:36.970584650 +0100
+++ 
/work/SRC/openSUSE:Factory/.python-oslo.log.new.1548/python-oslo.log.changes    
    2022-06-19 21:11:57.990224522 +0200
@@ -1,0 +2,17 @@
+Tue May 24 20:46:47 UTC 2022 - cloud-de...@suse.de
+
+- update to version 5.0.0
+  - Update CI to use unversioned jobs template
+  - Drop python3.6/3.7 support in testing runtime
+  - Add Yoga to versionutils
+  - Use project when logging the user identity
+  - Add Zed in versionutils
+  - Log Global Request IDs by default
+  - Fix formatting of release list
+  - [Fix] init global_request_id if not in context
+  - Add system scope information to default user identity string
+  - Replace deprecated arguments of RequestContext
+  - Update python testing classifier
+  - Add Python3 yoga unit tests
+
+-------------------------------------------------------------------

Old:
----
  oslo.log-4.6.0.tar.gz

New:
----
  oslo.log-5.0.0.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-oslo.log.spec ++++++
--- /var/tmp/diff_new_pack.jRKAOR/_old  2022-06-19 21:11:58.498225277 +0200
+++ /var/tmp/diff_new_pack.jRKAOR/_new  2022-06-19 21:11:58.502225284 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package python-oslo.log
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,18 +17,17 @@
 
 
 Name:           python-oslo.log
-Version:        4.6.0
+Version:        5.0.0
 Release:        0
 Summary:        OpenStack log library
 License:        Apache-2.0
 Group:          Development/Languages/Python
 URL:            https://docs.openstack.org/oslo.log
-Source0:        
https://files.pythonhosted.org/packages/source/o/oslo.log/oslo.log-4.6.0.tar.gz
+Source0:        
https://files.pythonhosted.org/packages/source/o/oslo.log/oslo.log-5.0.0.tar.gz
 BuildRequires:  openstack-macros
-BuildRequires:  python3-mock
 BuildRequires:  python3-monotonic
 BuildRequires:  python3-oslo.config >= 5.2.0
-BuildRequires:  python3-oslo.context >= 2.20.0
+BuildRequires:  python3-oslo.context >= 2.21.0
 BuildRequires:  python3-oslo.i18n >= 3.20.0
 BuildRequires:  python3-oslo.serialization >= 2.25.0
 BuildRequires:  python3-oslo.utils >= 3.36.0
@@ -36,7 +35,6 @@
 BuildRequires:  python3-pbr >= 3.1.1
 BuildRequires:  python3-pyinotify >= 0.9.6
 BuildRequires:  python3-python-dateutil >= 2.7.0
-BuildRequires:  python3-six
 BuildRequires:  python3-stestr
 BuildRequires:  python3-testtools
 BuildArch:      noarch
@@ -51,13 +49,12 @@
 Requires:       python3-debtcollector >= 1.19.0
 Requires:       python3-monotonic
 Requires:       python3-oslo.config >= 5.2.0
-Requires:       python3-oslo.context >= 2.20.0
+Requires:       python3-oslo.context >= 2.21.0
 Requires:       python3-oslo.i18n >= 3.20.0
 Requires:       python3-oslo.serialization >= 2.25.0
 Requires:       python3-oslo.utils >= 3.36.0
 Requires:       python3-pyinotify >= 0.9.6
 Requires:       python3-python-dateutil >= 2.7.0
-Requires:       python3-six
 Requires:       python3-systemd
 %if 0%{?suse_version}
 Obsoletes:      python2-oslo.log < 4.0.0
@@ -79,14 +76,14 @@
 Documentation for the oslo.log library.
 
 %prep
-%autosetup -p1 -n oslo.log-4.6.0
+%autosetup -p1 -n oslo.log-5.0.0
 %py_req_cleanup
 
 %build
 %{py3_build}
 
 # generate html docs
-PYTHONPATH=. PBR_VERSION=4.6.0 %sphinx_build -b html doc/source doc/build/html
+PYTHONPATH=. PBR_VERSION=5.0.0 %sphinx_build -b html doc/source doc/build/html
 rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %install

++++++ oslo.log-4.6.0.tar.gz -> oslo.log-5.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslo.log-4.6.0/.zuul.yaml 
new/oslo.log-5.0.0/.zuul.yaml
--- old/oslo.log-4.6.0/.zuul.yaml       2021-07-01 14:36:18.000000000 +0200
+++ new/oslo.log-5.0.0/.zuul.yaml       2022-05-19 11:47:22.000000000 +0200
@@ -47,7 +47,7 @@
     templates:
       - check-requirements
       - lib-forward-testing-python3
-      - openstack-python3-wallaby-jobs
+      - openstack-python3-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslo.log-4.6.0/AUTHORS new/oslo.log-5.0.0/AUTHORS
--- old/oslo.log-4.6.0/AUTHORS  2021-07-01 14:36:51.000000000 +0200
+++ new/oslo.log-5.0.0/AUTHORS  2022-05-19 11:47:52.000000000 +0200
@@ -1,6 +1,7 @@
 Adam Spiers <aspi...@suse.com>
 Akash Gangil <gang...@vmware.com>
 Akihiro Motoki <mot...@da.jp.nec.com>
+Alan Bishop <abis...@redhat.com>
 Alexander Gorodnev <agorod...@mirantis.com>
 Alexis Lee <lx...@hpe.com>
 Alexis Lee <openst...@lxsli.co.uk>
@@ -121,6 +122,7 @@
 Nikita Gerasimov <nikita.gerasi...@oracle.com>
 OpenStack Release Bot <infra-r...@openstack.org>
 Pavlo Shchelokovskyy <shchelokovs...@gmail.com>
+Pierre Riteau <pie...@stackhpc.com>
 P??draig Brady <pbr...@redhat.com>
 Radomir Dopieralski <openst...@sheep.art.pl>
 Rajesh Tailor <rajesh.tai...@nttdata.com>
@@ -138,10 +140,12 @@
 Sergey Vilgelm <ser...@vilgelm.info>
 Stanislav Kudriashev <skudrias...@griddynamics.com>
 Stephen Finucane <sfinu...@redhat.com>
+Stephen Finucane <stephen...@redhat.com>
 Steve Martinelli <s.martine...@gmail.com>
 Steve Martinelli <steve...@ca.ibm.com>
 Stuart McLaren <stuart.mcla...@hp.com>
 Suff <dmitry.a.grac...@gmail.com>
+Takashi Kajinami <tkaji...@redhat.com>
 Thomas Bechtold <tbecht...@suse.com>
 Thomas Herve <the...@redhat.com>
 Thomas Herve <thomas.he...@enovance.com>
@@ -182,6 +186,7 @@
 songwenping <songwenp...@inspur.com>
 sonu.kumar <sonu.ku...@nectechnologies.in>
 tanlin <lin....@intel.com>
+tushargite96 <tushargit...@gmail.com>
 venkatamahesh <venkatamaheshko...@gmail.com>
 wangqi <wang...@99cloud.net>
 xuanyandong <xuanyand...@inspur.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslo.log-4.6.0/ChangeLog new/oslo.log-5.0.0/ChangeLog
--- old/oslo.log-4.6.0/ChangeLog        2021-07-01 14:36:51.000000000 +0200
+++ new/oslo.log-5.0.0/ChangeLog        2022-05-19 11:47:52.000000000 +0200
@@ -1,6 +1,34 @@
 CHANGES
 =======
 
+5.0.0
+-----
+
+* [Fix] init global\_request\_id if not in context
+* Drop python3.6/3.7 support in testing runtime
+
+4.8.0
+-----
+
+* Log Global Request IDs by default
+* Add system scope information to default user identity string
+* Update CI to use unversioned jobs template
+* Add Zed in versionutils
+* Add Python3 yoga unit tests
+* Fix formatting of release list
+
+4.7.0
+-----
+
+* Add Yoga to versionutils
+* Use project when logging the user identity
+* Update python testing classifier
+
+4.6.1
+-----
+
+* Replace deprecated arguments of RequestContext
+
 4.6.0
 -----
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslo.log-4.6.0/PKG-INFO new/oslo.log-5.0.0/PKG-INFO
--- old/oslo.log-4.6.0/PKG-INFO 2021-07-01 14:36:52.107553000 +0200
+++ new/oslo.log-5.0.0/PKG-INFO 2022-05-19 11:47:52.769834800 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oslo.log
-Version: 4.6.0
+Version: 5.0.0
 Summary: oslo.log library
 Home-page: https://docs.openstack.org/oslo.log/latest
 Author: OpenStack
@@ -47,12 +47,11 @@
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Provides-Extra: fixtures
 Provides-Extra: systemd
 Provides-Extra: test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslo.log-4.6.0/oslo.log.egg-info/PKG-INFO 
new/oslo.log-5.0.0/oslo.log.egg-info/PKG-INFO
--- old/oslo.log-4.6.0/oslo.log.egg-info/PKG-INFO       2021-07-01 
14:36:51.000000000 +0200
+++ new/oslo.log-5.0.0/oslo.log.egg-info/PKG-INFO       2022-05-19 
11:47:52.000000000 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oslo.log
-Version: 4.6.0
+Version: 5.0.0
 Summary: oslo.log library
 Home-page: https://docs.openstack.org/oslo.log/latest
 Author: OpenStack
@@ -47,12 +47,11 @@
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Provides-Extra: fixtures
 Provides-Extra: systemd
 Provides-Extra: test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslo.log-4.6.0/oslo.log.egg-info/SOURCES.txt 
new/oslo.log-5.0.0/oslo.log.egg-info/SOURCES.txt
--- old/oslo.log-4.6.0/oslo.log.egg-info/SOURCES.txt    2021-07-01 
14:36:52.000000000 +0200
+++ new/oslo.log-5.0.0/oslo.log.egg-info/SOURCES.txt    2022-05-19 
11:47:52.000000000 +0200
@@ -89,11 +89,14 @@
 releasenotes/notes/add-context-section-0b2f411ec64f42f6.yaml
 releasenotes/notes/add-facility-to-journal-e10bf7002cc19dd3.yaml
 releasenotes/notes/add-reno-e4fedb11ece56f1e.yaml
+releasenotes/notes/add-system_scope-to-logging_user_identity_format-0581ce5070740375.yaml
 releasenotes/notes/always-add-error-text-715022964364ffa0.yaml
 releasenotes/notes/drop-python27-support-0fe4909a5468feb3.yaml
 releasenotes/notes/info-logging-7b7be9fc7a95aebc.yaml
+releasenotes/notes/init-global-request-id-eb2031bc221e5fb7.yaml
 releasenotes/notes/is_debug_enabled-d7afee4c811a46df.yaml
 releasenotes/notes/jsonformatter-repr-fd616eb6fa6caeb3.yaml
+releasenotes/notes/log-global_request_id-f97e6d663e8a80b3.yaml
 releasenotes/notes/log-rotation-595f8232cd987a6d.yaml
 releasenotes/notes/reload_log_config-743817192b1172b6.yaml
 releasenotes/notes/remove-log-format-b4b949701cee3315.yaml
@@ -101,6 +104,7 @@
 releasenotes/notes/remove-verbose-option-d0d1381e182d1be1.yaml
 releasenotes/notes/systemd-journal-support-fcbc34b3c5ce93ec.yaml
 releasenotes/notes/use-json-option-96f71da54a3b9a18.yaml
+releasenotes/notes/use-project-in-user-identity-93fd6e0a2e434a6f.yaml
 releasenotes/notes/use_stderr_default_false-50d846b88cf2be90.yaml
 releasenotes/notes/windows-eventlog-2beb0a6010e342eb.yaml
 releasenotes/source/conf.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslo.log-4.6.0/oslo.log.egg-info/pbr.json 
new/oslo.log-5.0.0/oslo.log.egg-info/pbr.json
--- old/oslo.log-4.6.0/oslo.log.egg-info/pbr.json       2021-07-01 
14:36:51.000000000 +0200
+++ new/oslo.log-5.0.0/oslo.log.egg-info/pbr.json       2022-05-19 
11:47:52.000000000 +0200
@@ -1 +1 @@
-{"git_version": "41c8807", "is_release": true}
\ No newline at end of file
+{"git_version": "6401da7", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslo.log-4.6.0/oslo.log.egg-info/requires.txt 
new/oslo.log-5.0.0/oslo.log.egg-info/requires.txt
--- old/oslo.log-4.6.0/oslo.log.egg-info/requires.txt   2021-07-01 
14:36:51.000000000 +0200
+++ new/oslo.log-5.0.0/oslo.log.egg-info/requires.txt   2022-05-19 
11:47:52.000000000 +0200
@@ -1,6 +1,6 @@
 debtcollector>=1.19.0
 oslo.config>=5.2.0
-oslo.context>=2.20.0
+oslo.context>=2.21.0
 oslo.i18n>=3.20.0
 oslo.serialization>=2.25.0
 oslo.utils>=3.36.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslo.log-4.6.0/oslo_log/_options.py 
new/oslo.log-5.0.0/oslo_log/_options.py
--- old/oslo.log-4.6.0/oslo_log/_options.py     2021-07-01 14:36:18.000000000 
+0200
+++ new/oslo.log-5.0.0/oslo_log/_options.py     2022-05-19 11:47:22.000000000 
+0200
@@ -146,8 +146,8 @@
 log_opts = [
     cfg.StrOpt('logging_context_format_string',
                default='%(asctime)s.%(msecs)03d %(process)d %(levelname)s '
-                       '%(name)s [%(request_id)s %(user_identity)s] '
-                       '%(instance)s%(message)s',
+                       '%(name)s [%(global_request_id)s %(request_id)s '
+                       '%(user_identity)s] %(instance)s%(message)s',
                help='Format string to use for log messages with context. '
                     'Used by oslo_log.formatters.ContextFormatter'),
     cfg.StrOpt('logging_default_format_string',
@@ -167,8 +167,8 @@
                help='Prefix each line of exception output with this format. '
                     'Used by oslo_log.formatters.ContextFormatter'),
     cfg.StrOpt('logging_user_identity_format',
-               default='%(user)s %(tenant)s '
-                       '%(domain)s %(user_domain)s %(project_domain)s',
+               default='%(user)s %(project)s %(domain)s %(system_scope)s '
+                       '%(user_domain)s %(project_domain)s',
                help='Defines the format string for %(user_identity)s that '
                     'is used in logging_context_format_string. '
                     'Used by oslo_log.formatters.ContextFormatter'),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslo.log-4.6.0/oslo_log/formatters.py 
new/oslo.log-5.0.0/oslo_log/formatters.py
--- old/oslo.log-4.6.0/oslo_log/formatters.py   2021-07-01 14:36:18.000000000 
+0200
+++ new/oslo.log-5.0.0/oslo_log/formatters.py   2022-05-19 11:47:22.000000000 
+0200
@@ -452,7 +452,7 @@
         # to an empty string so we don't throw an exception if
         # they get used
         for key in ('instance', 'color', 'user_identity', 'resource',
-                    'user_name', 'project_name'):
+                    'user_name', 'project_name', 'global_request_id'):
             if key not in record.__dict__:
                 record.__dict__[key] = ''
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/oslo.log-4.6.0/oslo_log/tests/unit/test_formatters.py 
new/oslo.log-5.0.0/oslo_log/tests/unit/test_formatters.py
--- old/oslo.log-4.6.0/oslo_log/tests/unit/test_formatters.py   2021-07-01 
14:36:18.000000000 +0200
+++ new/oslo.log-5.0.0/oslo_log/tests/unit/test_formatters.py   2022-05-19 
11:47:22.000000000 +0200
@@ -28,10 +28,10 @@
 
 
 def _fake_context():
-    ctxt = context.RequestContext(user="user",
-                                  tenant="tenant",
-                                  project_domain="pdomain",
-                                  user_domain="udomain",
+    ctxt = context.RequestContext(user_id="user",
+                                  project_id="tenant",
+                                  project_domain_id="pdomain",
+                                  user_domain_id="udomain",
                                   overwrite=True)
 
     return ctxt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslo.log-4.6.0/oslo_log/tests/unit/test_log.py 
new/oslo.log-5.0.0/oslo_log/tests/unit/test_log.py
--- old/oslo.log-4.6.0/oslo_log/tests/unit/test_log.py  2021-07-01 
14:36:18.000000000 +0200
+++ new/oslo.log-5.0.0/oslo_log/tests/unit/test_log.py  2022-05-19 
11:47:22.000000000 +0200
@@ -69,26 +69,15 @@
 
 
 def _fake_context():
-    ctxt = context.RequestContext(1, 1, overwrite=True)
-    ctxt.user = 'myuser'
-    ctxt.tenant = 'mytenant'
-    ctxt.domain = 'mydomain'
-    ctxt.project_domain = 'myprojectdomain'
-    ctxt.user_domain = 'myuserdomain'
-
-    return ctxt
-
-
-def _fake_new_context():
-    # New style contexts have a user_name / project_name, this is done
-    # distinctly from the above context to not have to rewrite all the
-    # other tests.
-    ctxt = context.RequestContext(1, 1, overwrite=True)
-    ctxt.user_name = 'myuser'
-    ctxt.project_name = 'mytenant'
-    ctxt.domain = 'mydomain'
-    ctxt.project_domain = 'myprojectdomain'
-    ctxt.user_domain = 'myuserdomain'
+    ctxt = context.RequestContext(user_id="myuser",
+                                  user_name="myuser",
+                                  system_scope="myscope",
+                                  domain="mydomain",
+                                  project_id="mytenant",
+                                  project_name="mytenant",
+                                  project_domain_id="mydomain",
+                                  user_domain_id="myuserdomain",
+                                  overwrite=True)
 
     return ctxt
 
@@ -108,7 +97,7 @@
         log.register_options(self.config_fixture.conf)
         self.config(logging_context_format_string='%(asctime)s %(levelname)s '
                                                   '%(name)s [%(request_id)s '
-                                                  '%(user)s %(tenant)s] '
+                                                  '%(user)s %(project)s] '
                                                   '%(message)s')
         self.log = None
         log._setup_logging_from_conf(self.config_fixture.conf, 'test', 'test')
@@ -405,7 +394,7 @@
 
     def test_emit(self):
         logger = log.getLogger('nova-test.foo')
-        local_context = _fake_new_context()
+        local_context = _fake_context()
         logger.info("Foo", context=local_context)
         self.assertEqual(
             mock.call(mock.ANY, CODE_FILE=mock.ANY, CODE_FUNC='test_emit',
@@ -414,6 +403,7 @@
                       SYSLOG_FACILITY=syslog.LOG_USER,
                       SYSLOG_IDENTIFIER=mock.ANY,
                       REQUEST_ID=mock.ANY,
+                      PROJECT_ID='mytenant',
                       PROJECT_NAME='mytenant',
                       PROCESS_NAME='MainProcess',
                       THREAD_NAME='MainThread',
@@ -432,7 +422,7 @@
 
     def test_emit_exception(self):
         logger = log.getLogger('nova-exception.foo')
-        local_context = _fake_new_context()
+        local_context = _fake_context()
         try:
             raise Exception("Some exception")
         except Exception:
@@ -447,6 +437,7 @@
                       REQUEST_ID=mock.ANY,
                       EXCEPTION_INFO=mock.ANY,
                       EXCEPTION_TEXT=mock.ANY,
+                      PROJECT_ID='mytenant',
                       PROJECT_NAME='mytenant',
                       PROCESS_NAME='MainProcess',
                       THREAD_NAME='MainThread',
@@ -967,25 +958,37 @@
         ctxt.request_id = '99'
         message = 'test'
         self.log.info(message, context=ctxt)
-        expected = ("HAS CONTEXT [%s %s %s %s %s %s]: %s\n" %
-                    (ctxt.request_id, ctxt.user, ctxt.tenant, ctxt.domain,
-                     ctxt.user_domain, ctxt.project_domain,
+        expected = ("HAS CONTEXT [%s %s %s %s %s %s %s]: %s\n" %
+                    (ctxt.request_id, ctxt.user, ctxt.project_id, ctxt.domain,
+                     ctxt.system_scope, ctxt.user_domain, ctxt.project_domain,
                      str(message)))
         self.assertEqual(expected, self.stream.getvalue())
 
+    def test_global_request_id_logging(self):
+        fmt_str = "HAS CONTEXT [%(request_id)s %(global_request_id)s]: " \
+                  "%(message)s"
+        self.config(logging_context_format_string=fmt_str)
+        ctxt = _fake_context()
+        ctxt.request_id = '99'
+        message = 'test'
+        self.log.info(message, context=ctxt)
+        expected = ("HAS CONTEXT [%s %s]: %s\n" %
+                    (ctxt.request_id, ctxt.global_request_id, str(message)))
+        self.assertEqual(expected, self.stream.getvalue())
+
     def test_user_identity_logging_set_format(self):
         self.config(logging_context_format_string="HAS CONTEXT "
                                                   "[%(request_id)s "
                                                   "%(user_identity)s]: "
                                                   "%(message)s",
                     logging_user_identity_format="%(user)s "
-                                                 "%(tenant)s")
+                                                 "%(project)s")
         ctxt = _fake_context()
         ctxt.request_id = '99'
         message = 'test'
         self.log.info(message, context=ctxt)
         expected = ("HAS CONTEXT [%s %s %s]: %s\n" %
-                    (ctxt.request_id, ctxt.user, ctxt.tenant,
+                    (ctxt.request_id, ctxt.user, ctxt.project_id,
                      str(message)))
         self.assertEqual(expected, self.stream.getvalue())
 
@@ -1264,7 +1267,11 @@
         super(DomainTestCase, self).setUp()
         self.config(logging_context_format_string="[%(request_id)s]: "
                                                   "%(user_identity)s "
-                                                  "%(message)s")
+                                                  "%(message)s",
+                    logging_user_identity_format="%(user)s %(project)s "
+                                                 "%(user_domain)s "
+                                                 "%(project_domain)s "
+                                                 "%(domain)s")
         self.mylog = log.getLogger()
         self._add_handler_with_cleanup(self.mylog)
         self._set_log_level_with_cleanup(self.mylog, logging.DEBUG)
@@ -1283,7 +1290,8 @@
 
     def test_domain_in_log_msg(self):
         ctxt = _fake_context()
-        user_identity = ctxt.get_logging_values()['user_identity']
+        user_identity = (self.CONF.logging_user_identity_format %
+                         ctxt.get_logging_values())
         self.assertIn(ctxt.domain, user_identity)
         self.assertIn(ctxt.project_domain, user_identity)
         self.assertIn(ctxt.user_domain, user_identity)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslo.log-4.6.0/oslo_log/versionutils.py 
new/oslo.log-5.0.0/oslo_log/versionutils.py
--- old/oslo.log-4.6.0/oslo_log/versionutils.py 2021-07-01 14:36:18.000000000 
+0200
+++ new/oslo.log-5.0.0/oslo_log/versionutils.py 2022-05-19 11:47:22.000000000 
+0200
@@ -76,6 +76,8 @@
     'V': 'Victoria',
     'W': 'Wallaby',
     'X': 'Xena',
+    'Y': 'Yoga',
+    'Z': 'Zed',
 }
 
 
@@ -157,6 +159,8 @@
     VICTORIA = 'V'
     WALLABY = 'W'
     XENA = 'X'
+    YOGA = 'Y'
+    ZED = 'Z'
 
     def __init__(self, as_of, in_favor_of=None, remove_in=2, what=None):
         """Initialize decorator
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/oslo.log-4.6.0/releasenotes/notes/add-system_scope-to-logging_user_identity_format-0581ce5070740375.yaml
 
new/oslo.log-5.0.0/releasenotes/notes/add-system_scope-to-logging_user_identity_format-0581ce5070740375.yaml
--- 
old/oslo.log-4.6.0/releasenotes/notes/add-system_scope-to-logging_user_identity_format-0581ce5070740375.yaml
        1970-01-01 01:00:00.000000000 +0100
+++ 
new/oslo.log-5.0.0/releasenotes/notes/add-system_scope-to-logging_user_identity_format-0581ce5070740375.yaml
        2022-05-19 11:47:22.000000000 +0200
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Default value of the ``[DEFAULT] logging_user_identity_format`` option has
+    been updated and now includes system scope information by default.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/oslo.log-4.6.0/releasenotes/notes/init-global-request-id-eb2031bc221e5fb7.yaml
 
new/oslo.log-5.0.0/releasenotes/notes/init-global-request-id-eb2031bc221e5fb7.yaml
--- 
old/oslo.log-4.6.0/releasenotes/notes/init-global-request-id-eb2031bc221e5fb7.yaml
  1970-01-01 01:00:00.000000000 +0100
+++ 
new/oslo.log-5.0.0/releasenotes/notes/init-global-request-id-eb2031bc221e5fb7.yaml
  2022-05-19 11:47:22.000000000 +0200
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Initialize the ``global_request_id`` context variable with a default
+    value if the key is not passed in the context.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/oslo.log-4.6.0/releasenotes/notes/log-global_request_id-f97e6d663e8a80b3.yaml
 
new/oslo.log-5.0.0/releasenotes/notes/log-global_request_id-f97e6d663e8a80b3.yaml
--- 
old/oslo.log-4.6.0/releasenotes/notes/log-global_request_id-f97e6d663e8a80b3.yaml
   1970-01-01 01:00:00.000000000 +0100
+++ 
new/oslo.log-5.0.0/releasenotes/notes/log-global_request_id-f97e6d663e8a80b3.yaml
   2022-05-19 11:47:22.000000000 +0200
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Default value of the ``[DEFAULT] logging_context_format_string`` option has
+    been updated and now Global Request IDs are logged by default.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/oslo.log-4.6.0/releasenotes/notes/use-project-in-user-identity-93fd6e0a2e434a6f.yaml
 
new/oslo.log-5.0.0/releasenotes/notes/use-project-in-user-identity-93fd6e0a2e434a6f.yaml
--- 
old/oslo.log-4.6.0/releasenotes/notes/use-project-in-user-identity-93fd6e0a2e434a6f.yaml
    1970-01-01 01:00:00.000000000 +0100
+++ 
new/oslo.log-5.0.0/releasenotes/notes/use-project-in-user-identity-93fd6e0a2e434a6f.yaml
    2022-05-19 11:47:22.000000000 +0200
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``logging_user_identity_format`` option's default value is updated to
+    replace the obsolete ``tenant`` argument with ``project``.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslo.log-4.6.0/releasenotes/source/index.rst 
new/oslo.log-5.0.0/releasenotes/source/index.rst
--- old/oslo.log-4.6.0/releasenotes/source/index.rst    2021-07-01 
14:36:18.000000000 +0200
+++ new/oslo.log-5.0.0/releasenotes/source/index.rst    2022-05-19 
11:47:22.000000000 +0200
@@ -2,18 +2,18 @@
  oslo.log Release Notes
 ========================
 
- .. toctree::
-    :maxdepth: 1
+.. toctree::
+   :maxdepth: 1
 
-    unreleased
-    victoria
-    ussuri
-    train
-    stein
-    rocky
-    queens
-    pike
-    ocata
-    newton
-    mitaka
-    liberty
+   unreleased
+   victoria
+   ussuri
+   train
+   stein
+   rocky
+   queens
+   pike
+   ocata
+   newton
+   mitaka
+   liberty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslo.log-4.6.0/requirements.txt 
new/oslo.log-5.0.0/requirements.txt
--- old/oslo.log-4.6.0/requirements.txt 2021-07-01 14:36:18.000000000 +0200
+++ new/oslo.log-5.0.0/requirements.txt 2022-05-19 11:47:22.000000000 +0200
@@ -4,7 +4,7 @@
 
 pbr>=3.1.1 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0
-oslo.context>=2.20.0 # Apache-2.0
+oslo.context>=2.21.0 # Apache-2.0
 oslo.i18n>=3.20.0 # Apache-2.0
 oslo.utils>=3.36.0 # Apache-2.0
 oslo.serialization>=2.25.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/oslo.log-4.6.0/setup.cfg new/oslo.log-5.0.0/setup.cfg
--- old/oslo.log-4.6.0/setup.cfg        2021-07-01 14:36:52.107553000 +0200
+++ new/oslo.log-5.0.0/setup.cfg        2022-05-19 11:47:52.769834800 +0200
@@ -6,7 +6,7 @@
 author = OpenStack
 author_email = openstack-disc...@lists.openstack.org
 home_page = https://docs.openstack.org/oslo.log/latest
-python_requires = >=3.6
+python_requires = >=3.8
 classifier = 
        Environment :: OpenStack
        Intended Audience :: Information Technology
@@ -15,9 +15,8 @@
        Operating System :: POSIX :: Linux
        Programming Language :: Python
        Programming Language :: Python :: 3
-       Programming Language :: Python :: 3.6
-       Programming Language :: Python :: 3.7
        Programming Language :: Python :: 3.8
+       Programming Language :: Python :: 3.9
        Programming Language :: Python :: 3 :: Only
        Programming Language :: Python :: Implementation :: CPython
 

Reply via email to