Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 0eff6fe

Browse files
committedSep 13, 2021
revert default_response_hook
1 parent a40c9a9 commit 0eff6fe

File tree

1 file changed

+12
-12
lines changed
  • instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch

1 file changed

+12
-12
lines changed
 

‎instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def _instrument(self, **kwargs):
9797
"""
9898
tracer_provider = kwargs.get("tracer_provider")
9999
tracer = get_tracer(__name__, __version__, tracer_provider)
100-
response_hook = kwargs.get("response_hook", _default_response_hook)
100+
response_hook = kwargs.get("response_hook")
101101
_wrap(
102102
elasticsearch,
103103
"Transport.perform_request",
@@ -110,7 +110,7 @@ def _uninstrument(self, **kwargs):
110110
unwrap(elasticsearch.Transport, "perform_request")
111111

112112

113-
def _wrap_perform_request(tracer, span_name_prefix, response_hook):
113+
def _wrap_perform_request(tracer, span_name_prefix, response_hook=None):
114114
# pylint: disable=R0912
115115
def wrapper(wrapped, _, args, kwargs):
116116
method = url = None
@@ -146,16 +146,16 @@ def wrapper(wrapped, _, args, kwargs):
146146
span.set_attribute(key, value)
147147

148148
rv = wrapped(*args, **kwargs)
149-
response_hook(span, rv)
149+
if isinstance(rv, dict) and span.is_recording():
150+
for member in _ATTRIBUTES_FROM_RESULT:
151+
if member in rv:
152+
span.set_attribute(
153+
"elasticsearch.{0}".format(member),
154+
str(rv[member]),
155+
)
156+
157+
if callable(response_hook):
158+
response_hook(span, rv)
150159
return rv
151160

152161
return wrapper
153-
154-
155-
def _default_response_hook(span, response):
156-
if isinstance(response, dict) and span.is_recording():
157-
for member in _ATTRIBUTES_FROM_RESULT:
158-
if member in response:
159-
span.set_attribute(
160-
"elasticsearch.{0}".format(member), str(response[member]),
161-
)

0 commit comments

Comments
 (0)
Please sign in to comment.