diff --git a/0001-Add-default-port-to-Elasticsearch-connection-url.patch b/0001-Add-default-port-to-Elasticsearch-connection-url.patch deleted file mode 100644 index deba306..0000000 --- a/0001-Add-default-port-to-Elasticsearch-connection-url.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5833d9519a31665447250e9c734ca64c065dab64 Mon Sep 17 00:00:00 2001 -From: Daniel Garcia Moreno -Date: Wed, 5 Oct 2022 14:42:54 +0200 -Subject: [PATCH] Add default port to Elasticsearch connection url - -This change makes it compatible with modern versions of elasticsearch. - -Change-Id: I10b8b57432894e28d5da87eb6d886a053be776f0 ---- - osprofiler/drivers/elasticsearch_driver.py | 2 +- - test-requirements.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/osprofiler/drivers/elasticsearch_driver.py b/osprofiler/drivers/elasticsearch_driver.py -index da9be17..deb42a3 100644 ---- a/osprofiler/drivers/elasticsearch_driver.py -+++ b/osprofiler/drivers/elasticsearch_driver.py -@@ -44,7 +44,7 @@ class ElasticsearchDriver(base.Driver): - client_url = parser.urlunparse(parser.urlparse(self.connection_str) - ._replace(scheme="http")) - self.conf = conf -- self.client = Elasticsearch(client_url) -+ self.client = Elasticsearch(client_url + ":9200") - self.index_name = index_name - self.index_name_error = "osprofiler-notifications-error" - -diff --git a/test-requirements.txt b/test-requirements.txt -index 3e1bbd8..52c1446 100644 ---- a/test-requirements.txt -+++ b/test-requirements.txt -@@ -13,7 +13,7 @@ bandit>=1.6.0,<1.7.0 # Apache-2.0 - pymongo!=3.1,>=3.0.2 # Apache-2.0 - - # Elasticsearch python client --elasticsearch>=2.0.0,<3.0.0 # Apache-2.0 -+elasticsearch>=2.0.0,<9.0.0 # Apache-2.0 - - # Redis python client - redis>=2.10.0 # MIT --- -2.37.3 - diff --git a/new-elasticsearch.patch b/new-elasticsearch.patch new file mode 100644 index 0000000..2570b74 --- /dev/null +++ b/new-elasticsearch.patch @@ -0,0 +1,15 @@ +submitted as https://review.opendev.org/c/openstack/osprofiler/+/927749 + +Index: osprofiler-4.2.0/osprofiler/tests/unit/drivers/test_elasticsearch.py +=================================================================== +--- osprofiler-4.2.0.orig/osprofiler/tests/unit/drivers/test_elasticsearch.py ++++ osprofiler-4.2.0/osprofiler/tests/unit/drivers/test_elasticsearch.py +@@ -23,7 +23,7 @@ class ElasticsearchTestCase(test.TestCas + + def setUp(self): + super(ElasticsearchTestCase, self).setUp() +- self.elasticsearch = ElasticsearchDriver("elasticsearch://localhost") ++ self.elasticsearch = ElasticsearchDriver("elasticsearch://localhost:9001/") + self.elasticsearch.project = "project" + self.elasticsearch.service = "service" + diff --git a/osprofiler-4.1.0.tar.gz b/osprofiler-4.1.0.tar.gz deleted file mode 100644 index 9c22ac1..0000000 --- a/osprofiler-4.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57837b620581b13444a2e20564775d4fc73eff67c7888af99947ed582fe514b0 -size 96068 diff --git a/osprofiler-4.2.0.tar.gz b/osprofiler-4.2.0.tar.gz new file mode 100644 index 0000000..2374948 --- /dev/null +++ b/osprofiler-4.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dd1c4be2645a8f24121055da5bb461688dcafc7e6b4d4babc0ef1ba66902781 +size 95940 diff --git a/python-osprofiler.changes b/python-osprofiler.changes index 58ad2d1..fd921ad 100644 --- a/python-osprofiler.changes +++ b/python-osprofiler.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Sep 2 17:28:50 UTC 2024 - cloud-devel@suse.de + +- added new-elasticsearch.patch +- removed 0001-Add-default-port-to-Elasticsearch-connection-url.patch +- update to version 4.2.0 + - List up extra requirements for drivers + - reno: Update master for unmaintained/victoria + - Update python classifier in setup.cfg + - Move oslo.config to normal requirements + - Declare Python 3.10 support + ------------------------------------------------------------------- Mon Apr 1 17:37:16 UTC 2024 - Christian Boltz diff --git a/python-osprofiler.spec b/python-osprofiler.spec index 78cfdf2..9a3cc79 100644 --- a/python-osprofiler.spec +++ b/python-osprofiler.spec @@ -17,15 +17,14 @@ Name: python-osprofiler -Version: 4.1.0 +Version: 4.2.0 Release: 0 Summary: OpenStack Profiler Library License: Apache-2.0 Group: Development/Languages/Python URL: https://docs.openstack.org/osprofiler -Source0: https://files.pythonhosted.org/packages/source/o/osprofiler/osprofiler-4.1.0.tar.gz -# https://review.opendev.org/c/openstack/osprofiler/+/860412 -Patch0: 0001-Add-default-port-to-Elasticsearch-connection-url.patch +Source0: https://files.pythonhosted.org/packages/source/o/osprofiler/osprofiler-4.2.0.tar.gz +Patch0: new-elasticsearch.patch BuildRequires: openstack-macros BuildRequires: python3-PrettyTable >= 0.7.2 BuildRequires: python3-WebOb >= 1.7.1 @@ -86,7 +85,7 @@ BuildRequires: python3-sphinxcontrib-apidoc Documentation for OSProfiler. %prep -%autosetup -p1 -n osprofiler-4.1.0 +%autosetup -p1 -n osprofiler-4.2.0 %py_req_cleanup %build @@ -101,7 +100,8 @@ PBR_VERSION=%{version} %sphinx_build -b html doc/source doc/build/html rm -rf doc/build/html/.{doctrees,buildinfo} %check -rm osprofiler/tests/unit/drivers/test_jaeger.py # causes import error, --exclude-regex in the next line isn't enough +# otherwise causes import error +rm osprofiler/tests/unit/drivers/test_jaeger.py %{openstack_stestr_run} --exclude-regex '(^osprofiler.tests.unit.drivers.test_jaeger.JaegerTestCase.*$)' %files -n python3-osprofiler