Skip to content

Commit c7167fc

Browse files
committed
fix and move async grpc server interceptor
1 parent 1dfcd05 commit c7167fc

File tree

3 files changed

+70
-2
lines changed

3 files changed

+70
-2
lines changed
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# BSD 3-Clause License
2+
#
3+
# Copyright (c) 2022, Elasticsearch BV
4+
# All rights reserved.
5+
#
6+
# Redistribution and use in source and binary forms, with or without
7+
# modification, are permitted provided that the following conditions are met:
8+
#
9+
# * Redistributions of source code must retain the above copyright notice, this
10+
# list of conditions and the following disclaimer.
11+
#
12+
# * Redistributions in binary form must reproduce the above copyright notice,
13+
# this list of conditions and the following disclaimer in the documentation
14+
# and/or other materials provided with the distribution.
15+
#
16+
# * Neither the name of the copyright holder nor the names of its
17+
# contributors may be used to endorse or promote products derived from
18+
# this software without specific prior written permission.
19+
#
20+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21+
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23+
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
24+
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25+
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
26+
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
27+
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
28+
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29+
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30+
31+
import inspect
32+
33+
import grpc
34+
35+
import elasticapm
36+
from elasticapm.contrib.grpc.server_interceptor import _ServicerContextWrapper, _wrap_rpc_behavior, get_trace_parent
37+
38+
39+
class _AsyncServerInterceptor(grpc.aio.ServerInterceptor):
40+
async def intercept_service(self, continuation, handler_call_details):
41+
def transaction_wrapper(behavior, request_streaming, response_streaming):
42+
async def _interceptor(request_or_iterator, context):
43+
if request_streaming or response_streaming: # only unary-unary is supported
44+
return behavior(request_or_iterator, context)
45+
tp = get_trace_parent(handler_call_details)
46+
client = elasticapm.get_client()
47+
transaction = client.begin_transaction("request", trace_parent=tp)
48+
try:
49+
result = behavior(request_or_iterator, _ServicerContextWrapper(context, transaction))
50+
51+
# This is so we can support both sync and async rpc functions
52+
if inspect.isawaitable(result):
53+
result = await result
54+
55+
if transaction and not transaction.outcome:
56+
transaction.set_success()
57+
return result
58+
except Exception:
59+
if transaction:
60+
transaction.set_failure()
61+
client.capture_exception(handled=False)
62+
raise
63+
finally:
64+
client.end_transaction(name=handler_call_details.method)
65+
66+
return _interceptor
67+
68+
return _wrap_rpc_behavior(await continuation(handler_call_details), transaction_wrapper)

elasticapm/contrib/grpc/server_interceptor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def _interceptor(request_or_iterator, context):
123123
return _wrap_rpc_behavior(continuation(handler_call_details), transaction_wrapper)
124124

125125

126-
class _AsyncServerInterceptor(grpc.ServerInterceptor):
126+
class _AsyncServerInterceptor(grpc.aio.ServerInterceptor):
127127
async def intercept_service(self, continuation, handler_call_details):
128128
def transaction_wrapper(behavior, request_streaming, response_streaming):
129129
async def _interceptor(request_or_iterator, context):

elasticapm/instrumentation/packages/grpc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def get_instrument_list(self):
9393
return []
9494

9595
def call(self, module, method, wrapped, instance, args, kwargs):
96-
from elasticapm.contrib.grpc.server_interceptor import _AsyncServerInterceptor
96+
from elasticapm.contrib.grpc.async_server_interceptor import _AsyncServerInterceptor
9797

9898
interceptors = kwargs.get("interceptors") or (args[2] if len(args) > 2 else [])
9999
interceptors.insert(0, _AsyncServerInterceptor())

0 commit comments

Comments
 (0)