Address review notices.

tests/test_otel.py

@@ -28,7 +28,6 @@ http {
     }
 
     otel_trace on;
-    {{ service_name }}
     {{ res_attrs }}
 
     server {
@@ -272,9 +271,11 @@ def test_batches(client, trace_service, batch_count):
     "nginx_config",
     [
         {
-            "service_name": 'otel_service_name "test_service";',
+            "res_attrs": """
-            "res_attrs": 'otel_resource_attr my.name "my name";\n'
+                otel_service_name "test_service";
-            + 'otel_resource_attr my.service "my service";',
+                otel_resource_attr my.name "my name";
+                otel_resource_attr my.service "my service";
+            """,
         }
     ],
     indirect=True,
@@ -282,12 +283,7 @@ def test_batches(client, trace_service, batch_count):
 def test_custom_resource_attributes(client, trace_service):
     assert client.get("http://127.0.0.1:18080/ok").status_code == 200
 
-    for _ in range(10):
+    trace_service.wait_batch()
-        if len(trace_service.batches):
-            break
-        time.sleep(0.001)
-
-    assert len(trace_service.batches) == 1
 
     for batch in trace_service.batches:
         assert get_attr(batch[0].resource, "service.name") == "test_service"

tests/trace_service.py

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