daroche/nginx-otel-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address review notices.

Browse source
This commit is contained in:
Eugene Grebenschikov 2024-12-19 15:31:29 -08:00
parent e625db711a
commit 023ea7962f
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/test_otel.py
View file

@ -28,7 +28,7 @@ http {
} }
otel_trace on; otel_trace on;
{{ res_attrs }} {{ resource_attrs }}
server { server {
listen 127.0.0.1:18443 ssl; listen 127.0.0.1:18443 ssl;
@ -271,7 +271,7 @@ def test_batches(client, trace_service, batch_count):
"nginx_config", "nginx_config",
[ [
{ {
"res_attrs": """ "resource_attrs": """
otel_service_name "test_service"; otel_service_name "test_service";
otel_resource_attr my.name "my name"; otel_resource_attr my.name "my name";
otel_resource_attr my.service "my service"; otel_resource_attr my.service "my service";
@ -283,11 +283,10 @@ def test_batches(client, trace_service, batch_count):
def test_custom_resource_attributes(client, trace_service): def test_custom_resource_attributes(client, trace_service):
assert client.get("http://127.0.0.1:18080/ok").status_code == 200 assert client.get("http://127.0.0.1:18080/ok").status_code == 200
trace_service.wait_one_batch() batch = trace_service.get_batch()
for batch in trace_service.batches: assert get_attr(batch[0].resource, "service.name") == "test_service"
assert get_attr(batch[0].resource, "service.name") == "test_service" assert get_attr(batch[0].resource, "my.name") == "my name"
assert get_attr(batch[0].resource, "my.name") == "my name" assert get_attr(batch[0].resource, "my.service") == "my service"
assert get_attr(batch[0].resource, "my.service") == "my service"
trace_service.batches.clear() trace_service.batches.clear()

10
tests/trace_service.py
View file

@ -14,18 +14,16 @@ class TraceService(trace_service_pb2_grpc.TraceServiceServicer):
self.batches.append(request.resource_spans) self.batches.append(request.resource_spans)
return trace_service_pb2.ExportTracePartialSuccess() return trace_service_pb2.ExportTracePartialSuccess()
def wait_one_batch(self): def get_batch(self):
for _ in range(10): for _ in range(10):
if len(self.batches): if len(self.batches):
break break
time.sleep(0.001) time.sleep(0.001)
assert len(self.batches) == 1, "No spans received" assert len(self.batches) == 1
return self.batches.pop()
def get_span(self): def get_span(self):
self.wait_one_batch() return self.get_batch()[0].scope_spans[0].spans.pop()
span = self.batches[0][0].scope_spans[0].spans.pop()
self.batches.clear()
return span
@pytest.fixture(scope="module") @pytest.fixture(scope="module")