diff -pruN 0.3.0-3/debian/changelog 0.4.0-2/debian/changelog
--- 0.3.0-3/debian/changelog	2021-09-29 14:46:28.000000000 +0000
+++ 0.4.0-2/debian/changelog	2022-03-24 15:24:41.000000000 +0000
@@ -1,3 +1,16 @@
+python-oslo.metrics (0.4.0-2) unstable; urgency=medium
+
+  * Uploading to unstable.
+  * Add autopkgtest.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 24 Mar 2022 16:24:41 +0100
+
+python-oslo.metrics (0.4.0-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 21 Feb 2022 11:54:15 +0100
+
 python-oslo.metrics (0.3.0-3) unstable; urgency=medium
 
   * Uploading to unstable.
diff -pruN 0.3.0-3/debian/tests/control 0.4.0-2/debian/tests/control
--- 0.3.0-3/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-2/debian/tests/control	2022-03-24 15:24:41.000000000 +0000
@@ -0,0 +1,5 @@
+Tests: unittests
+Depends:
+ @,
+ @builddeps@,
+Restrictions: allow-stderr needs-root
diff -pruN 0.3.0-3/debian/tests/unittests 0.4.0-2/debian/tests/unittests
--- 0.3.0-3/debian/tests/unittests	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-2/debian/tests/unittests	2022-03-24 15:24:41.000000000 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+pkgos-dh_auto_test --no-py2 'oslo_metrics\.tests.*'
diff -pruN 0.3.0-3/oslo_metrics/__main__.py 0.4.0-2/oslo_metrics/__main__.py
--- 0.3.0-3/oslo_metrics/__main__.py	2021-08-11 13:22:34.000000000 +0000
+++ 0.4.0-2/oslo_metrics/__main__.py	2021-10-13 15:34:39.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/releasenotes/notes/port-config-ac5d9ee247a8ff9b.yaml 0.4.0-2/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-2/releasenotes/notes/port-config-ac5d9ee247a8ff9b.yaml	2021-10-13 15:34:39.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-2/releasenotes/source/index.rst
--- 0.3.0-3/releasenotes/source/index.rst	2021-08-11 13:22:34.000000000 +0000
+++ 0.4.0-2/releasenotes/source/index.rst	2021-10-13 15:34:39.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-2/releasenotes/source/xena.rst
--- 0.3.0-3/releasenotes/source/xena.rst	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.0-2/releasenotes/source/xena.rst	2021-10-13 15:34:39.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-2/setup.cfg
--- 0.3.0-3/setup.cfg	2021-08-11 13:22:34.000000000 +0000
+++ 0.4.0-2/setup.cfg	2021-10-13 15:34:39.000000000 +0000
@@ -1,12 +1,12 @@
 [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 =
+description_file =
     README.rst
-home-page = https://opendev.org/openstack/oslo.metrics
-python-requires = >=3.6
+home_page = https://opendev.org/openstack/oslo.metrics
+python_requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Developers
diff -pruN 0.3.0-3/tox.ini 0.4.0-2/tox.ini
--- 0.3.0-3/tox.ini	2021-08-11 13:22:34.000000000 +0000
+++ 0.4.0-2/tox.ini	2021-10-13 15:34:39.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 =