Skip to content

Commit 510852e

Browse files
refactor(tracing) Rename grpc's test proto content
1 parent e1bef26 commit 510852e

File tree

8 files changed

+123
-139
lines changed

8 files changed

+123
-139
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
syntax = "proto3";
2+
3+
package grpc_test_server;
4+
5+
service gRPCTestService{
6+
rpc TestServe(gRPCTestMessage) returns (gRPCTestMessage);
7+
}
8+
9+
message gRPCTestMessage {
10+
string text = 1;
11+
}

tests/integrations/grpc/grpc_test_service_pb2.py

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/integrations/grpc/test_service_pb2.pyi renamed to tests/integrations/grpc/grpc_test_service_pb2.pyi

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ else:
1515
DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
1616

1717
@typing_extensions.final
18-
class TestMessage(google.protobuf.message.Message):
18+
class gRPCTestMessage(google.protobuf.message.Message):
1919
DESCRIPTOR: google.protobuf.descriptor.Descriptor
2020

2121
TEXT_FIELD_NUMBER: builtins.int
@@ -25,8 +25,6 @@ class TestMessage(google.protobuf.message.Message):
2525
*,
2626
text: builtins.str = ...,
2727
) -> None: ...
28-
def ClearField(
29-
self, field_name: typing_extensions.Literal["text", b"text"]
30-
) -> None: ...
28+
def ClearField(self, field_name: typing_extensions.Literal["text", b"text"]) -> None: ...
3129

32-
global___TestMessage = TestMessage
30+
global___gRPCTestMessage = gRPCTestMessage
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
2+
"""Client and server classes corresponding to protobuf-defined services."""
3+
import grpc
4+
5+
import tests.integrations.grpc.grpc_test_service_pb2 as grpc__test__service__pb2
6+
7+
8+
class gRPCTestServiceStub(object):
9+
"""Missing associated documentation comment in .proto file."""
10+
11+
def __init__(self, channel):
12+
"""Constructor.
13+
14+
Args:
15+
channel: A grpc.Channel.
16+
"""
17+
self.TestServe = channel.unary_unary(
18+
'/grpc_test_server.gRPCTestService/TestServe',
19+
request_serializer=grpc__test__service__pb2.gRPCTestMessage.SerializeToString,
20+
response_deserializer=grpc__test__service__pb2.gRPCTestMessage.FromString,
21+
)
22+
23+
24+
class gRPCTestServiceServicer(object):
25+
"""Missing associated documentation comment in .proto file."""
26+
27+
def TestServe(self, request, context):
28+
"""Missing associated documentation comment in .proto file."""
29+
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
30+
context.set_details('Method not implemented!')
31+
raise NotImplementedError('Method not implemented!')
32+
33+
34+
def add_gRPCTestServiceServicer_to_server(servicer, server):
35+
rpc_method_handlers = {
36+
'TestServe': grpc.unary_unary_rpc_method_handler(
37+
servicer.TestServe,
38+
request_deserializer=grpc__test__service__pb2.gRPCTestMessage.FromString,
39+
response_serializer=grpc__test__service__pb2.gRPCTestMessage.SerializeToString,
40+
),
41+
}
42+
generic_handler = grpc.method_handlers_generic_handler(
43+
'grpc_test_server.gRPCTestService', rpc_method_handlers)
44+
server.add_generic_rpc_handlers((generic_handler,))
45+
46+
47+
# This class is part of an EXPERIMENTAL API.
48+
class gRPCTestService(object):
49+
"""Missing associated documentation comment in .proto file."""
50+
51+
@staticmethod
52+
def TestServe(request,
53+
target,
54+
options=(),
55+
channel_credentials=None,
56+
call_credentials=None,
57+
insecure=False,
58+
compression=None,
59+
wait_for_ready=None,
60+
timeout=None,
61+
metadata=None):
62+
return grpc.experimental.unary_unary(request, target, '/grpc_test_server.gRPCTestService/TestServe',
63+
grpc__test__service__pb2.gRPCTestMessage.SerializeToString,
64+
grpc__test__service__pb2.gRPCTestMessage.FromString,
65+
options, channel_credentials,
66+
insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

tests/integrations/grpc/test_grpc.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
from sentry_sdk.consts import OP
1212
from sentry_sdk.integrations.grpc.client import ClientInterceptor
1313
from sentry_sdk.integrations.grpc.server import ServerInterceptor
14-
from tests.integrations.grpc.test_service_pb2 import TestMessage
15-
from tests.integrations.grpc.test_service_pb2_grpc import (
16-
TestServiceServicer,
17-
add_TestServiceServicer_to_server,
18-
TestServiceStub,
14+
from tests.integrations.grpc.grpc_test_service_pb2 import gRPCTestMessage
15+
from tests.integrations.grpc.grpc_test_service_pb2_grpc import (
16+
gRPCTestServiceServicer,
17+
add_gRPCTestServiceServicer_to_server,
18+
gRPCTestServiceStub,
1919
)
2020

2121
PORT = 50051
@@ -30,8 +30,8 @@ def test_grpc_server_starts_transaction(sentry_init, capture_events_forksafe):
3030
server = _set_up()
3131

3232
with grpc.insecure_channel(f"localhost:{PORT}") as channel:
33-
stub = TestServiceStub(channel)
34-
stub.TestServe(TestMessage(text="test"))
33+
stub = gRPCTestServiceStub(channel)
34+
stub.TestServe(gRPCTestMessage(text="test"))
3535

3636
_tear_down(server=server)
3737

@@ -55,7 +55,7 @@ def test_grpc_server_continues_transaction(sentry_init, capture_events_forksafe)
5555
server = _set_up()
5656

5757
with grpc.insecure_channel(f"localhost:{PORT}") as channel:
58-
stub = TestServiceStub(channel)
58+
stub = gRPCTestServiceStub(channel)
5959

6060
with start_transaction() as transaction:
6161
metadata = (
@@ -75,7 +75,7 @@ def test_grpc_server_continues_transaction(sentry_init, capture_events_forksafe)
7575
),
7676
),
7777
)
78-
stub.TestServe(TestMessage(text="test"), metadata=metadata)
78+
stub.TestServe(gRPCTestMessage(text="test"), metadata=metadata)
7979

8080
_tear_down(server=server)
8181

@@ -102,10 +102,10 @@ def test_grpc_client_starts_span(sentry_init, capture_events_forksafe):
102102

103103
with grpc.insecure_channel(f"localhost:{PORT}") as channel:
104104
channel = grpc.intercept_channel(channel, *interceptors)
105-
stub = TestServiceStub(channel)
105+
stub = gRPCTestServiceStub(channel)
106106

107107
with start_transaction():
108-
stub.TestServe(TestMessage(text="test"))
108+
stub.TestServe(gRPCTestMessage(text="test"))
109109

110110
_tear_down(server=server)
111111

@@ -139,10 +139,10 @@ def test_grpc_client_and_servers_interceptors_integration(
139139

140140
with grpc.insecure_channel(f"localhost:{PORT}") as channel:
141141
channel = grpc.intercept_channel(channel, *interceptors)
142-
stub = TestServiceStub(channel)
142+
stub = gRPCTestServiceStub(channel)
143143

144144
with start_transaction():
145-
stub.TestServe(TestMessage(text="test"))
145+
stub.TestServe(gRPCTestMessage(text="test"))
146146

147147
_tear_down(server=server)
148148

@@ -162,7 +162,7 @@ def _set_up():
162162
interceptors=[ServerInterceptor(find_name=_find_name)],
163163
)
164164

165-
add_TestServiceServicer_to_server(TestService, server)
165+
add_gRPCTestServiceServicer_to_server(TestService, server)
166166
server.add_insecure_port(f"[::]:{PORT}")
167167
server.start()
168168

@@ -177,7 +177,7 @@ def _find_name(request):
177177
return request.__class__
178178

179179

180-
class TestService(TestServiceServicer):
180+
class TestService(gRPCTestServiceServicer):
181181
events = []
182182

183183
@staticmethod
@@ -186,4 +186,4 @@ def TestServe(request, context): # noqa: N802
186186
with hub.start_span(op="test", description="test"):
187187
pass
188188

189-
return TestMessage(text=request.text)
189+
return gRPCTestMessage(text=request.text)

tests/integrations/grpc/test_service.proto

Lines changed: 0 additions & 11 deletions
This file was deleted.

tests/integrations/grpc/test_service_pb2.py

Lines changed: 0 additions & 28 deletions
This file was deleted.

tests/integrations/grpc/test_service_pb2_grpc.py

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)