diff -pruN 0.3.0-3/AUTHORS 0.4.0-0ubuntu2/AUTHORS
--- 0.3.0-3/AUTHORS	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/AUTHORS	2021-10-21 09:35:53.000000000 +0000
@@ -0,0 +1,10 @@
+Ching Kuo <ching.kuo@linecorp.com>
+Ching Kuo <igene@igene.tw>
+Corey Bryant <corey.bryant@canonical.com>
+Hervé Beraud <hberaud@redhat.com>
+Masahito Muroi <masahito.muroi@linecorp.com>
+OpenStack Release Bot <infra-root@openstack.org>
+Thierry Carrez <thierry@openstack.org>
+maaoyu <maaoyu@inspur.com>
+wangzihao <wangzihao@yovole.com>
+zhangboye <zhangboye@inspur.com>
diff -pruN 0.3.0-3/ChangeLog 0.4.0-0ubuntu2/ChangeLog
--- 0.3.0-3/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/ChangeLog	2021-10-21 09:35:53.000000000 +0000
@@ -0,0 +1,54 @@
+CHANGES
+=======
+
+0.4.0
+-----
+
+* Limit metrics\_socket\_file permissions
+* Update master for stable/xena
+* Changed minversion in tox to 3.18.0
+
+0.3.0
+-----
+
+* setup.cfg: Replace dashes with underscores
+* Enable Test Coverage and Add New Test
+* Fix Heading Characters
+* Enable bandit
+* Make Expose Port Configurable
+* Add Devstack Installation Guide
+* Use py3 as the default runtime for tox
+* Dropping lower constraints testing
+* Update master for stable/wallaby
+
+0.2.1
+-----
+
+* Add timeout, method to RPC Client Label
+
+0.2.0
+-----
+
+* Update Metric Naming
+* Handle Sigterm Properly
+
+0.1.0
+-----
+
+* Improve Socket for oslo.metrics
+* bump py37 to py38 in tox.ini
+* Add basic tests for message processing
+* Add a basic test framework for oslo.metrics
+* Configure zuul
+* add lower-constraints
+* fix pep8 issues
+* Add releasenotes
+* Add project documentation
+* Setup base test environment
+* Add an entrypoints to launch oslo.metrics
+* Add a couple of gitignore rules
+* Sample oslo.metrics codes
+* Trivial change to test replication
+* Add date for expected initial code drop
+* Base content, waiting for initial code drop
+* Added .gitreview
diff -pruN 0.3.0-3/debian/changelog 0.4.0-0ubuntu2/debian/changelog
--- 0.3.0-3/debian/changelog	2021-09-29 14:46:28.000000000 +0000
+++ 0.4.0-0ubuntu2/debian/changelog	2022-06-08 14:17:51.000000000 +0000
@@ -1,18 +1,26 @@
-python-oslo.metrics (0.3.0-3) unstable; urgency=medium
+python-oslo.metrics (0.4.0-0ubuntu2) kinetic; urgency=medium
 
-  * Uploading to unstable.
+  * d/t/control, d/t/python-(o)stestr: Switch from ostestr to stestr.
 
- -- Thomas Goirand <zigo@debian.org>  Wed, 29 Sep 2021 16:46:28 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 08 Jun 2022 10:17:51 -0400
 
-python-oslo.metrics (0.3.0-2) experimental; urgency=medium
+python-oslo.metrics (0.4.0-0ubuntu1) jammy; urgency=medium
 
-  * Rebuilt source-only.
-  * Added (c) 2020 LINE Corp. in d/copyright after FTP master remark.
+  * New upstream release for OpenStack Yoga.
+  * d/control: Bump debhelper compat to 13.
+  * d/p/bug1945533.patch: Dropped. Fixed upstream.
 
- -- Thomas Goirand <zigo@debian.org>  Sun, 19 Sep 2021 19:24:13 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 01 Dec 2021 15:44:36 -0500
 
-python-oslo.metrics (0.3.0-1) experimental; urgency=medium
+python-oslo.metrics (0.3.0-0ubuntu2) impish; urgency=medium
 
-  * Initial release. (Closes: #993120)
+  * d/p/bug1945533.patch: Cherry pick permissions fix to harden the
+    socket used for metrics (LP: #1945533).
 
- -- Thomas Goirand <zigo@debian.org>  Fri, 27 Aug 2021 15:42:31 +0200
+ -- James Page <james.page@ubuntu.com>  Wed, 13 Oct 2021 09:41:23 +0100
+
+python-oslo.metrics (0.3.0-0ubuntu1) impish; urgency=medium
+
+  * Initial release.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Tue, 07 Sep 2021 13:39:37 -0400
diff -pruN 0.3.0-3/debian/control 0.4.0-0ubuntu2/debian/control
--- 0.3.0-3/debian/control	2021-09-29 14:46:28.000000000 +0000
+++ 0.4.0-0ubuntu2/debian/control	2022-06-08 14:17:51.000000000 +0000
@@ -1,61 +1,38 @@
 Source: python-oslo.metrics
 Section: python
 Priority: optional
-Maintainer: Debian OpenStack <team+openstack@tracker.debian.org>
-Uploaders:
- Thomas Goirand <zigo@debian.org>,
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Build-Depends:
- debhelper-compat (= 11),
+ debhelper-compat (= 13),
  dh-python,
  openstack-pkg-tools,
  python3-all,
- python3-pbr,
+ python3-pbr (>= 3.1.1),
  python3-setuptools,
- python3-sphinx,
 Build-Depends-Indep:
- python3-bandit,
- python3-coverage,
- python3-hacking,
- python3-openstackdocstheme,
- python3-oslo.config,
- python3-oslo.log,
- python3-oslo.utils,
- python3-oslotest,
- python3-prometheus-client,
- python3-sphinxcontrib.apidoc,
- python3-stestr,
- subunit,
-Standards-Version: 4.6.0
-Vcs-Browser: https://salsa.debian.org/openstack-team/python/python-oslo.metrics
-Vcs-Git: https://salsa.debian.org/openstack-team/python/python-oslo.metrics.git
+ python3-oslo.config (>= 1:6.9.0),
+ python3-oslo.log (>= 3.44.0),
+ python3-oslo.utils (>= 3.41.0),
+ python3-prometheus-client (>= 0.6.0),
+ python3-oslotest (>= 1:3.2.0),
+ python3-stestr (>= 2.0.0),
+Standards-Version: 4.5.0
+Vcs-Browser: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-oslo.metrics
+Vcs-Git: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-oslo.metrics
 Homepage: https://opendev.org/openstack/oslo.metrics
 
 Package: python3-oslo.metrics
 Architecture: all
 Depends:
- python3-oslo.config,
- python3-oslo.log,
- python3-oslo.utils,
- python3-pbr,
- python3-prometheus-client,
+ python3-pbr (>= 3.1.1),
+ python3-oslo.config (>= 1:6.9.0),
+ python3-oslo.log (>= 3.44.0),
+ python3-oslo.utils (>= 3.41.0),
+ python3-prometheus-client (>= 0.6.0),
  ${misc:Depends},
  ${python3:Depends},
-Suggests:
- python-oslo.metrics-doc,
-Description: OpenStack Oslo Metrics API - Python 3.x
- This Oslo metrics API supports collecting metrics data from other Oslo
- libraries and exposing the metrics data to monitoring system.
+Description: OpenStack library for metric collection
+ oslo.metrics is the OpenStack library for collecting metrics data from other Oslo
+ libraries and exposing metrics data to monitoring system.
  .
- This package contains the Python 3.x module.
-
-Package: python-oslo.metrics-doc
-Section: doc
-Architecture: all
-Depends:
- ${misc:Depends},
- ${sphinxdoc:Depends},
-Description: OpenStack Oslo Metrics API - doc
- This Oslo metrics API supports collecting metrics data from other Oslo
- libraries and exposing the metrics data to monitoring system.
- .
- This package contains the documentation.
+ This package contains the Python 3 module.
diff -pruN 0.3.0-3/debian/copyright 0.4.0-0ubuntu2/debian/copyright
--- 0.3.0-3/debian/copyright	2021-09-29 14:46:28.000000000 +0000
+++ 0.4.0-0ubuntu2/debian/copyright	2022-06-08 14:17:51.000000000 +0000
@@ -1,14 +1,14 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: oslo.metrics
 Source: https://opendev.org/openstack/oslo.metrics
 
 Files: *
-Copyright: (c) 2019, OpenStack <openstack-discuss@lists.openstack.org>
- (c) 2020 LINE Corp.
+Copyright: (c) 2020, Line Corp.
+           (c) 2014, OpenStack Foundation
 License: Apache-2
 
 Files: debian/*
-Copyright: (c) 2019, Thomas Goirand <zigo@debian.org>
+Copyright: (c) 2021, Canonical Ltd.
 License: Apache-2
 
 License: Apache-2
diff -pruN 0.3.0-3/debian/gbp.conf 0.4.0-0ubuntu2/debian/gbp.conf
--- 0.3.0-3/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/debian/gbp.conf	2022-06-08 14:17:51.000000000 +0000
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = master
+upstream-tag = %(version)s
+pristine-tar = True
+
+[buildpackage]
+export-dir = ../build-area
diff -pruN 0.3.0-3/debian/patches/remove-intersphinx-from-doc.patch 0.4.0-0ubuntu2/debian/patches/remove-intersphinx-from-doc.patch
--- 0.3.0-3/debian/patches/remove-intersphinx-from-doc.patch	2021-09-29 14:46:28.000000000 +0000
+++ 0.4.0-0ubuntu2/debian/patches/remove-intersphinx-from-doc.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-Description: Remove intersphinx from docs
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: not-needed
-Last-Update: 2021-08-27
-
---- python-oslo.metrics-0.3.0.orig/doc/source/conf.py
-+++ python-oslo.metrics-0.3.0/doc/source/conf.py
-@@ -22,7 +22,6 @@ sys.path.insert(0, os.path.abspath('../.
- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- extensions = [
-     'sphinxcontrib.apidoc',
--    'sphinx.ext.intersphinx',
-     'openstackdocstheme',
-     'oslo_config.sphinxext',
- ]
diff -pruN 0.3.0-3/debian/patches/series 0.4.0-0ubuntu2/debian/patches/series
--- 0.3.0-3/debian/patches/series	2021-09-29 14:46:28.000000000 +0000
+++ 0.4.0-0ubuntu2/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-remove-intersphinx-from-doc.patch
diff -pruN 0.3.0-3/debian/python3-oslo.metrics.install 0.4.0-0ubuntu2/debian/python3-oslo.metrics.install
--- 0.3.0-3/debian/python3-oslo.metrics.install	2021-09-29 14:46:28.000000000 +0000
+++ 0.4.0-0ubuntu2/debian/python3-oslo.metrics.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/usr
diff -pruN 0.3.0-3/debian/python-oslo.metrics-doc.doc-base 0.4.0-0ubuntu2/debian/python-oslo.metrics-doc.doc-base
--- 0.3.0-3/debian/python-oslo.metrics-doc.doc-base	2021-09-29 14:46:28.000000000 +0000
+++ 0.4.0-0ubuntu2/debian/python-oslo.metrics-doc.doc-base	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-Document: python-oslo.metrics-doc
-Title: oslo.metrics Documentation
-Author: N/A
-Abstract: Sphinx documentation for oslo.metrics
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-oslo.metrics-doc/html/index.html
-Files: /usr/share/doc/python-oslo.metrics-doc/html/*
diff -pruN 0.3.0-3/debian/rules 0.4.0-0ubuntu2/debian/rules
--- 0.3.0-3/debian/rules	2021-09-29 14:46:28.000000000 +0000
+++ 0.4.0-0ubuntu2/debian/rules	2022-06-08 14:17:51.000000000 +0000
@@ -1,35 +1,6 @@
 #!/usr/bin/make -f
 
-UPSTREAM_GIT := https://opendev.org/openstack/oslo.metrics.git
-include /usr/share/openstack-pkg-tools/pkgos.make
+export PYBUILD_NAME=oslo_metrics
 
 %:
-	dh $@ --buildsystem=python_distutils --with python3,sphinxdoc
-
-override_dh_auto_clean:
-	rm -rf build .stestr
-	find . -iname '*.pyc' -delete
-	for i in $$(find . -type d -iname __pycache__) ; do rm -rf $$i ; done
-
-override_dh_auto_build:
-	echo "Do nothing..."
-
-override_dh_auto_install:
-	pkgos-dh_auto_install --no-py2 --in-tmp
-
-override_dh_auto_test:
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-	pkgos-dh_auto_test --no-py2
-endif
-
-override_dh_auto_test:
-	echo "Do nothing..."
-
-override_dh_sphinxdoc:
-ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
-	PYTHONPATH=. python3 -m sphinx -b html doc/source debian/python-oslo.metrics-doc/usr/share/doc/python-oslo.metrics-doc/html
-	dh_sphinxdoc
-endif
-
-override_dh_python3:
-	dh_python3 --shebang=/usr/bin/python3
+	dh $@ --buildsystem=pybuild --with python3
diff -pruN 0.3.0-3/debian/tests/control 0.4.0-0ubuntu2/debian/tests/control
--- 0.3.0-3/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/debian/tests/control	2022-06-08 14:17:51.000000000 +0000
@@ -0,0 +1,3 @@
+Tests: python-import, python-stestr
+Depends: @, @builddeps@
+Restrictions: allow-stderr
diff -pruN 0.3.0-3/debian/tests/python-import 0.4.0-0ubuntu2/debian/tests/python-import
--- 0.3.0-3/debian/tests/python-import	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/debian/tests/python-import	2022-06-08 14:17:51.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+MODULE_NAME=$(python3 setup.py --name | sed 's/\./_/g')
+
+for py in $(py3versions -r 2>/dev/null); do
+    cd "$AUTOPKGTEST_TMP"
+    echo "Testing with $py:"
+    $py -c "import $MODULE_NAME; print($MODULE_NAME)"
+done
diff -pruN 0.3.0-3/debian/tests/python-stestr 0.4.0-0ubuntu2/debian/tests/python-stestr
--- 0.3.0-3/debian/tests/python-stestr	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/debian/tests/python-stestr	2022-06-08 14:17:51.000000000 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -ex
+
+for py in $(py3versions -r 2>/dev/null); do
+    echo "Testing with $py:"
+    PYTHON=$py stestr run
+    rm -rf .stestr
+done
diff -pruN 0.3.0-3/debian/watch 0.4.0-0ubuntu2/debian/watch
--- 0.3.0-3/debian/watch	2021-09-29 14:46:28.000000000 +0000
+++ 0.4.0-0ubuntu2/debian/watch	2022-06-08 14:17:51.000000000 +0000
@@ -1,4 +1,3 @@
 version=3
-opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
-https://pypi.debian.net/oslo.metrics/oslo.metrics-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
-
+opts="uversionmangle=s/\.(b|rc)/~$1/" \
+    http://tarballs.openstack.org/oslo.metrics/ oslo.metrics-(\d.*)\.tar\.gz
diff -pruN 0.3.0-3/.gitignore 0.4.0-0ubuntu2/.gitignore
--- 0.3.0-3/.gitignore	2021-08-11 13:22:34.000000000 +0000
+++ 0.4.0-0ubuntu2/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-# Add patterns in here to exclude files created by tools integrated with this
-# repository, such as test frameworks from the project's recommended workflow,
-# rendered documentation and package builds.
-#
-# Don't add patterns to exclude files created by preferred personal tools
-# (editors, IDEs, your operating system itself even). These should instead be
-# maintained outside the repository, for example in a ~/.gitignore file added
-# with:
-#
-# git config --global core.excludesfile '~/.gitignore'
-
-# Bytecompiled Python
-*.py[cod]
-*.pyc
-
-
-# C extensions
-*.so
-
-# Packages
-*.egg*
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-lib
-lib64
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-.stestr/
-test.sock
-.venv
-cover/
-
-# Translations
-*.mo
-
-# Complexity
-output/*.html
-output/*/index.html
-
-# Sphinx
-doc/build
-doc/source/reference/api
-
-# pbr generates these
-AUTHORS
-ChangeLog
-
-# reno build
-releasenotes/build
-RELEASENOTES.rst
-releasenotes/notes/reno.cache
-
-# pifpaf and testing artifacts
-etcd-v*
diff -pruN 0.3.0-3/.gitreview 0.4.0-0ubuntu2/.gitreview
--- 0.3.0-3/.gitreview	2021-08-11 13:22:34.000000000 +0000
+++ 0.4.0-0ubuntu2/.gitreview	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[gerrit]
-host=review.opendev.org
-port=29418
-project=openstack/oslo.metrics.git
diff -pruN 0.3.0-3/oslo_metrics/__main__.py 0.4.0-0ubuntu2/oslo_metrics/__main__.py
--- 0.3.0-3/oslo_metrics/__main__.py	2021-08-11 13:22:34.000000000 +0000
+++ 0.4.0-0ubuntu2/oslo_metrics/__main__.py	2021-10-21 09:34:54.000000000 +0000
@@ -17,7 +17,6 @@ import os
 import select
 import signal
 import socket
-import stat
 import sys
 import threading
 from wsgiref.simple_server import make_server
@@ -33,7 +32,9 @@ oslo_metrics_configs = [
     cfg.StrOpt('metrics_socket_file',
                default='/var/tmp/metrics_collector.sock',
                help='Unix domain socket file to be used'
-                    'to send rpc related metrics'),
+                    ' to send rpc related metrics'),
+    cfg.IntOpt('prometheus_port', default=3000,
+               help='Port number to expose metrics in prometheus format.'),
 ]
 cfg.CONF.register_opts(oslo_metrics_configs, group='oslo_metrics')
 
@@ -97,7 +98,7 @@ def main():
     socket_path = cfg.CONF.oslo_metrics.metrics_socket_file
     m = MetricsListener(socket_path)
     try:
-        os.chmod(socket_path, stat.S_IRWXU | stat.S_IRWXO)
+        os.chmod(socket_path, 0o660)
     except OSError:
         LOG.error("Changing the mode of the file failed.... continuing")
     mt = threading.Thread(target=m.serve)
@@ -107,7 +108,7 @@ def main():
     app = make_wsgi_app()
     try:
         global httpd
-        httpd = make_server('', 3000, app)
+        httpd = make_server('', CONF.oslo_metrics.prometheus_port, app)
         signal.signal(signal.SIGTERM, handle_sigterm)
         httpd.serve_forever()
     except KeyboardInterrupt:
diff -pruN 0.3.0-3/oslo.metrics.egg-info/dependency_links.txt 0.4.0-0ubuntu2/oslo.metrics.egg-info/dependency_links.txt
--- 0.3.0-3/oslo.metrics.egg-info/dependency_links.txt	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/oslo.metrics.egg-info/dependency_links.txt	2021-10-21 09:35:53.000000000 +0000
@@ -0,0 +1 @@
+
diff -pruN 0.3.0-3/oslo.metrics.egg-info/entry_points.txt 0.4.0-0ubuntu2/oslo.metrics.egg-info/entry_points.txt
--- 0.3.0-3/oslo.metrics.egg-info/entry_points.txt	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/oslo.metrics.egg-info/entry_points.txt	2021-10-21 09:35:53.000000000 +0000
@@ -0,0 +1,3 @@
+[console_scripts]
+oslo-metrics = oslo_metrics.__main__:main
+
diff -pruN 0.3.0-3/oslo.metrics.egg-info/not-zip-safe 0.4.0-0ubuntu2/oslo.metrics.egg-info/not-zip-safe
--- 0.3.0-3/oslo.metrics.egg-info/not-zip-safe	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/oslo.metrics.egg-info/not-zip-safe	2021-10-21 09:35:53.000000000 +0000
@@ -0,0 +1 @@
+
diff -pruN 0.3.0-3/oslo.metrics.egg-info/pbr.json 0.4.0-0ubuntu2/oslo.metrics.egg-info/pbr.json
--- 0.3.0-3/oslo.metrics.egg-info/pbr.json	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/oslo.metrics.egg-info/pbr.json	2021-10-21 09:35:53.000000000 +0000
@@ -0,0 +1 @@
+{"git_version": "b4eb8c3", "is_release": true}
\ No newline at end of file
diff -pruN 0.3.0-3/oslo.metrics.egg-info/PKG-INFO 0.4.0-0ubuntu2/oslo.metrics.egg-info/PKG-INFO
--- 0.3.0-3/oslo.metrics.egg-info/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/oslo.metrics.egg-info/PKG-INFO	2021-10-21 09:35:53.000000000 +0000
@@ -0,0 +1,30 @@
+Metadata-Version: 1.2
+Name: oslo.metrics
+Version: 0.4.0
+Summary: Oslo Metrics API
+Home-page: https://opendev.org/openstack/oslo.metrics
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+License: UNKNOWN
+Description: ====================
+        Oslo Metrics Library
+        ====================
+        
+        This Oslo metrics API supports collecting metrics data from other Oslo
+        libraries and exposing the metrics data to monitoring system.
+        
+        
+Platform: UNKNOWN
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Information Technology
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: OS Independent
+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 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.6
diff -pruN 0.3.0-3/oslo.metrics.egg-info/requires.txt 0.4.0-0ubuntu2/oslo.metrics.egg-info/requires.txt
--- 0.3.0-3/oslo.metrics.egg-info/requires.txt	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/oslo.metrics.egg-info/requires.txt	2021-10-21 09:35:53.000000000 +0000
@@ -0,0 +1,5 @@
+oslo.config>=6.9.0
+oslo.log>=3.44.0
+oslo.utils>=3.41.0
+pbr!=2.1.0,>=3.1.1
+prometheus-client>=0.6.0
diff -pruN 0.3.0-3/oslo.metrics.egg-info/SOURCES.txt 0.4.0-0ubuntu2/oslo.metrics.egg-info/SOURCES.txt
--- 0.3.0-3/oslo.metrics.egg-info/SOURCES.txt	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/oslo.metrics.egg-info/SOURCES.txt	2021-10-21 09:35:53.000000000 +0000
@@ -0,0 +1,46 @@
+.stestr.conf
+.zuul.yaml
+AUTHORS
+CONTRIBUTING.rst
+ChangeLog
+LICENSE
+README.rst
+requirements.txt
+setup.cfg
+setup.py
+test-requirements.txt
+tox.ini
+doc/requirements.txt
+doc/source/conf.py
+doc/source/index.rst
+doc/source/contributor/index.rst
+doc/source/install/index.rst
+doc/source/user/history.rst
+doc/source/user/index.rst
+doc/source/user/usage.rst
+oslo.metrics.egg-info/PKG-INFO
+oslo.metrics.egg-info/SOURCES.txt
+oslo.metrics.egg-info/dependency_links.txt
+oslo.metrics.egg-info/entry_points.txt
+oslo.metrics.egg-info/not-zip-safe
+oslo.metrics.egg-info/pbr.json
+oslo.metrics.egg-info/requires.txt
+oslo.metrics.egg-info/top_level.txt
+oslo_metrics/__init__.py
+oslo_metrics/__main__.py
+oslo_metrics/message_router.py
+oslo_metrics/message_type.py
+oslo_metrics/metrics/__init__.py
+oslo_metrics/metrics/oslo_messaging.py
+oslo_metrics/tests/__init__.py
+oslo_metrics/tests/test_message_process.py
+oslo_metrics/tests/test_message_validation.py
+releasenotes/notes/add-reno-0cc4d7566599aebd.yaml
+releasenotes/notes/port-config-ac5d9ee247a8ff9b.yaml
+releasenotes/source/conf.py
+releasenotes/source/index.rst
+releasenotes/source/unreleased.rst
+releasenotes/source/wallaby.rst
+releasenotes/source/xena.rst
+releasenotes/source/_static/.placeholder
+releasenotes/source/_templates/.placeholder
\ No newline at end of file
diff -pruN 0.3.0-3/oslo.metrics.egg-info/top_level.txt 0.4.0-0ubuntu2/oslo.metrics.egg-info/top_level.txt
--- 0.3.0-3/oslo.metrics.egg-info/top_level.txt	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/oslo.metrics.egg-info/top_level.txt	2021-10-21 09:35:53.000000000 +0000
@@ -0,0 +1 @@
+oslo_metrics
diff -pruN 0.3.0-3/PKG-INFO 0.4.0-0ubuntu2/PKG-INFO
--- 0.3.0-3/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/PKG-INFO	2021-10-21 09:35:53.195281300 +0000
@@ -0,0 +1,30 @@
+Metadata-Version: 1.2
+Name: oslo.metrics
+Version: 0.4.0
+Summary: Oslo Metrics API
+Home-page: https://opendev.org/openstack/oslo.metrics
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+License: UNKNOWN
+Description: ====================
+        Oslo Metrics Library
+        ====================
+        
+        This Oslo metrics API supports collecting metrics data from other Oslo
+        libraries and exposing the metrics data to monitoring system.
+        
+        
+Platform: UNKNOWN
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Information Technology
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: OS Independent
+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 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.6
diff -pruN 0.3.0-3/releasenotes/notes/port-config-ac5d9ee247a8ff9b.yaml 0.4.0-0ubuntu2/releasenotes/notes/port-config-ac5d9ee247a8ff9b.yaml
--- 0.3.0-3/releasenotes/notes/port-config-ac5d9ee247a8ff9b.yaml	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/releasenotes/notes/port-config-ac5d9ee247a8ff9b.yaml	2021-10-21 09:34:54.000000000 +0000
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Port number to expose metrics in Prometheus format is now configurable.
diff -pruN 0.3.0-3/releasenotes/source/index.rst 0.4.0-0ubuntu2/releasenotes/source/index.rst
--- 0.3.0-3/releasenotes/source/index.rst	2021-08-11 13:22:34.000000000 +0000
+++ 0.4.0-0ubuntu2/releasenotes/source/index.rst	2021-10-21 09:34:54.000000000 +0000
@@ -6,4 +6,5 @@ oslo.metrics Release Notes
    :maxdepth: 1
 
    unreleased
+   xena
    wallaby
diff -pruN 0.3.0-3/releasenotes/source/xena.rst 0.4.0-0ubuntu2/releasenotes/source/xena.rst
--- 0.3.0-3/releasenotes/source/xena.rst	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-0ubuntu2/releasenotes/source/xena.rst	2021-10-21 09:34:54.000000000 +0000
@@ -0,0 +1,6 @@
+=========================
+Xena Series Release Notes
+=========================
+
+.. release-notes::
+   :branch: stable/xena
diff -pruN 0.3.0-3/setup.cfg 0.4.0-0ubuntu2/setup.cfg
--- 0.3.0-3/setup.cfg	2021-08-11 13:22:34.000000000 +0000
+++ 0.4.0-0ubuntu2/setup.cfg	2021-10-21 09:35:53.195281300 +0000
@@ -1,30 +1,35 @@
 [metadata]
 name = oslo.metrics
 author = OpenStack
-author-email = openstack-discuss@lists.openstack.org
+author_email = openstack-discuss@lists.openstack.org
 summary = Oslo Metrics API
-description-file =
-    README.rst
-home-page = https://opendev.org/openstack/oslo.metrics
-python-requires = >=3.6
-classifier =
-    Environment :: OpenStack
-    Intended Audience :: Developers
-    Intended Audience :: Information Technology
-    License :: OSI Approved :: Apache Software License
-    Operating System :: OS Independent
-    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 :: Only
-    Programming Language :: Python :: Implementation :: CPython
+description_file = 
+	README.rst
+home_page = https://opendev.org/openstack/oslo.metrics
+python_requires = >=3.6
+classifier = 
+	Environment :: OpenStack
+	Intended Audience :: Developers
+	Intended Audience :: Information Technology
+	License :: OSI Approved :: Apache Software License
+	Operating System :: OS Independent
+	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 :: Only
+	Programming Language :: Python :: Implementation :: CPython
 
 [files]
-packages =
-    oslo_metrics
+packages = 
+	oslo_metrics
 
 [entry_points]
-console_scripts =
-    oslo-metrics = oslo_metrics.__main__:main
+console_scripts = 
+	oslo-metrics = oslo_metrics.__main__:main
+
+[egg_info]
+tag_build = 
+tag_date = 0
+
diff -pruN 0.3.0-3/tox.ini 0.4.0-0ubuntu2/tox.ini
--- 0.3.0-3/tox.ini	2021-08-11 13:22:34.000000000 +0000
+++ 0.4.0-0ubuntu2/tox.ini	2021-10-21 09:34:54.000000000 +0000
@@ -1,11 +1,11 @@
 [tox]
-minversion = 3.2.0
+minversion = 3.18.0
 envlist = py3,pep8
 ignore_basepython_conflict = True
 
 [testenv]
 basepython = python3
-whitelist_externals =
+allowlist_externals =
   find
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
@@ -24,7 +24,7 @@ commands =
 commands = {posargs}
 
 [testenv:docs]
-whitelist_externals = rm
+allowlist_externals = rm
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/doc/requirements.txt
@@ -51,7 +51,7 @@ exclude=.venv,.git,.tox,dist,doc,*lib/py
 import_exceptions =
 
 [testenv:releasenotes]
-whitelist_externals =
+allowlist_externals =
   rm
 deps = {[testenv:docs]deps}
 commands =
