|
 |
d69fc2b |
From 8bf8c358307fc08e15a23c36fa95853c259de78d Mon Sep 17 00:00:00 2001
|
|
|
bc80483 |
From: Alfredo Moralejo <amoralej@redhat.com>
|
|
|
d69fc2b |
Date: Mon, 21 Nov 2022 15:25:14 +0100
|
|
|
bc80483 |
Subject: [PATCH] Revert "Add OSprofiler support for Aodh client"
|
|
|
bc80483 |
|
|
|
bc80483 |
This reverts commit fb22e9826256ef090b8ae043583fee0a4cb481fc.
|
|
|
bc80483 |
---
|
|
|
bc80483 |
aodhclient/client.py | 2 --
|
|
|
bc80483 |
requirements.txt | 3 +--
|
|
|
bc80483 |
2 files changed, 1 insertion(+), 4 deletions(-)
|
|
|
bc80483 |
|
|
|
bc80483 |
diff --git a/aodhclient/client.py b/aodhclient/client.py
|
|
|
bc80483 |
index bb2ec09..662bde9 100644
|
|
|
bc80483 |
--- a/aodhclient/client.py
|
|
|
bc80483 |
+++ b/aodhclient/client.py
|
|
|
bc80483 |
@@ -12,7 +12,6 @@
|
|
|
bc80483 |
|
|
|
bc80483 |
from keystoneauth1 import adapter
|
|
|
bc80483 |
from oslo_utils import importutils
|
|
|
bc80483 |
-from osprofiler import web
|
|
|
bc80483 |
|
|
|
bc80483 |
from aodhclient import exceptions
|
|
|
bc80483 |
|
|
|
bc80483 |
@@ -30,7 +29,6 @@ class SessionClient(adapter.Adapter):
|
|
|
bc80483 |
# NOTE(sileht): The standard call raises errors from
|
|
|
bc80483 |
# keystoneauth, where we need to raise the aodhclient errors.
|
|
|
bc80483 |
raise_exc = kwargs.pop('raise_exc', True)
|
|
|
bc80483 |
- kwargs['headers'].update(web.get_trace_id_headers())
|
|
|
bc80483 |
resp = super(SessionClient, self).request(url,
|
|
|
bc80483 |
method,
|
|
|
bc80483 |
raise_exc=False,
|
|
|
bc80483 |
diff --git a/requirements.txt b/requirements.txt
|
|
 |
f7b0c3c |
-index f2b84d9..ed9eff0 100644
|
|
|
f7b0c3c |
+index 80d0aca..e2ac44c 100644
|
|
|
f7b0c3c |
--- a/requirements.txt
|
|
|
f7b0c3c |
+++ b/requirements.txt
|
|
|
f7b0c3c |
-@@ -8,6 +8,5 @@ osc-lib>=1.0.1 # Apache-2.0
|
|
|
f7b0c3c |
+@@ -8,7 +8,6 @@ osc-lib>=1.0.1 # Apache-2.0
|
|
|
f7b0c3c |
oslo.i18n>=1.5.0 # Apache-2.0
|
|
|
f7b0c3c |
oslo.serialization>=1.4.0 # Apache-2.0
|
|
|
f7b0c3c |
oslo.utils>=2.0.0 # Apache-2.0
|
|
|
f7b0c3c |
-osprofiler>=1.4.0 # Apache-2.0
|
|
|
f7b0c3c |
keystoneauth1>=1.0.0
|
|
|
f7b0c3c |
--pyparsing
|
|
|
f7b0c3c |
-\ No newline at end of file
|
|
|
f7b0c3c |
-+pyparsing
|
|
|
f7b0c3c |
---
|
|
|
f7b0c3c |
-2.34.1
|
|
|
f7b0c3c |
-
|
|
|
f7b0c3c |
+ pyparsing
|
|
|
f7b0c3c |
+ SQLAlchemy-Utils<=0.38.3
|
|
|
bc80483 |
|