Support new osprofiler API

Notifier initialization moved to osprofiler. Added call
to init_from_conf method that does it.
Fixed osprofiler admin context.

Change-Id: Ic5c7bf72cafe077f6a77639fa439a61d39f89126
Depends-On: I77d0d3b5e9e725507916724dcd28d5fbc6f7f5c7
This commit is contained in:
Alexander Ignatyev 2016-07-15 04:51:19 +03:00 committed by Alexey Yelistratov
parent 8d6b7f8635
commit c582d17170
2 changed files with 10 additions and 8 deletions

View File

@ -12,12 +12,13 @@
from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging
import osprofiler.notifier
import osprofiler.initializer
from osprofiler import opts as profiler_opts
import osprofiler.web
from neutron._i18n import _LI
from neutron import context
CONF = cfg.CONF
profiler_opts.set_defaults(CONF)
@ -33,11 +34,13 @@ def setup(name, host='0.0.0.0'): # nosec
specified host name / address usage is highly recommended.
"""
if CONF.profiler.enabled:
_notifier = osprofiler.notifier.create(
"Messaging", oslo_messaging, {},
oslo_messaging.get_transport(CONF), "neutron", name, host)
osprofiler.notifier.set(_notifier)
osprofiler.web.enable(CONF.profiler.hmac_keys)
osprofiler.initializer.init_from_conf(
conf=CONF,
context=context.get_admin_context(),
project="neutron",
service=name,
host=host
)
LOG.info(_LI("OSProfiler is enabled.\n"
"Traces provided from the profiler "
"can only be subscribed to using the same HMAC keys that "

View File

@ -33,7 +33,6 @@ from sqlalchemy.orm import exc
import traceback
from neutron._i18n import _LE
from neutron.common import profiler # noqa
def set_hook(engine):