flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

otel tracing: fix span names (#11974)

This commit is contained in:
yifeizhuang 2025-03-21 15:19:25 -07:00 committed by GitHub
parent d60e6fc251
commit 94f8e93691
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opentelemetry/src/main/java/io/grpc/opentelemetry/OpenTelemetryTracingModule.java
View File

@ -446,7 +446,7 @@ final class OpenTelemetryTracingModule {
if (optionalWireSize != -1 && optionalWireSize != optionalUncompressedSize) { if (optionalWireSize != -1 && optionalWireSize != optionalUncompressedSize) {
attributesBuilder.put("message-size-compressed", optionalWireSize); attributesBuilder.put("message-size-compressed", optionalWireSize);
} }
span.addEvent("Outbound message sent", attributesBuilder.build()); span.addEvent("Outbound message", attributesBuilder.build());
} }
private void recordInboundCompressedMessage(Span span, int seqNo, long optionalWireSize) { private void recordInboundCompressedMessage(Span span, int seqNo, long optionalWireSize) {
@ -460,7 +460,7 @@ final class OpenTelemetryTracingModule {
AttributesBuilder attributesBuilder = io.opentelemetry.api.common.Attributes.builder(); AttributesBuilder attributesBuilder = io.opentelemetry.api.common.Attributes.builder();
attributesBuilder.put("sequence-number", seqNo); attributesBuilder.put("sequence-number", seqNo);
attributesBuilder.put("message-size", bytes); attributesBuilder.put("message-size", bytes);
span.addEvent("Inbound message received", attributesBuilder.build()); span.addEvent("Inbound message", attributesBuilder.build());
} }
private String generateErrorStatusDescription(io.grpc.Status status) { private String generateErrorStatusDescription(io.grpc.Status status) {

18
opentelemetry/src/test/java/io/grpc/opentelemetry/OpenTelemetryTracingModuleTest.java
View File

@ -231,7 +231,7 @@ public class OpenTelemetryTracingModuleTest {
List<String> events = eventNameCaptor.getAllValues(); List<String> events = eventNameCaptor.getAllValues();
List<io.opentelemetry.api.common.Attributes> attributes = attributesCaptor.getAllValues(); List<io.opentelemetry.api.common.Attributes> attributes = attributesCaptor.getAllValues();
assertEquals( assertEquals(
"Outbound message sent" , "Outbound message" ,
events.get(0)); events.get(0));
assertEquals( assertEquals(
io.opentelemetry.api.common.Attributes.builder() io.opentelemetry.api.common.Attributes.builder()
@ -241,7 +241,7 @@ public class OpenTelemetryTracingModuleTest {
attributes.get(0)); attributes.get(0));
assertEquals( assertEquals(
"Outbound message sent" , "Outbound message" ,
events.get(1)); events.get(1));
assertEquals( assertEquals(
io.opentelemetry.api.common.Attributes.builder() io.opentelemetry.api.common.Attributes.builder()
@ -313,7 +313,7 @@ public class OpenTelemetryTracingModuleTest {
assertTrue(clientSpanEvents.get(0).getAttributes().isEmpty()); assertTrue(clientSpanEvents.get(0).getAttributes().isEmpty());
assertEquals( assertEquals(
"Inbound message received" , "Inbound message" ,
clientSpanEvents.get(1).getName()); clientSpanEvents.get(1).getName());
assertEquals( assertEquals(
io.opentelemetry.api.common.Attributes.builder() io.opentelemetry.api.common.Attributes.builder()
@ -323,7 +323,7 @@ public class OpenTelemetryTracingModuleTest {
clientSpanEvents.get(1).getAttributes()); clientSpanEvents.get(1).getAttributes());
assertEquals( assertEquals(
"Inbound message received" , "Inbound message" ,
clientSpanEvents.get(2).getName()); clientSpanEvents.get(2).getName());
assertEquals( assertEquals(
io.opentelemetry.api.common.Attributes.builder() io.opentelemetry.api.common.Attributes.builder()
@ -342,7 +342,7 @@ public class OpenTelemetryTracingModuleTest {
assertTrue(clientSpanEvents.get(0).getAttributes().isEmpty()); assertTrue(clientSpanEvents.get(0).getAttributes().isEmpty());
assertEquals( assertEquals(
"Outbound message sent" , "Outbound message" ,
attemptSpanEvents.get(1).getName()); attemptSpanEvents.get(1).getName());
assertEquals( assertEquals(
io.opentelemetry.api.common.Attributes.builder() io.opentelemetry.api.common.Attributes.builder()
@ -352,7 +352,7 @@ public class OpenTelemetryTracingModuleTest {
attemptSpanEvents.get(1).getAttributes()); attemptSpanEvents.get(1).getAttributes());
assertEquals( assertEquals(
"Outbound message sent" , "Outbound message" ,
attemptSpanEvents.get(2).getName()); attemptSpanEvents.get(2).getName());
assertEquals( assertEquals(
io.opentelemetry.api.common.Attributes.builder() io.opentelemetry.api.common.Attributes.builder()
@ -518,7 +518,7 @@ public class OpenTelemetryTracingModuleTest {
List<EventData> events = spans.get(0).getEvents(); List<EventData> events = spans.get(0).getEvents();
assertEquals(events.size(), 4); assertEquals(events.size(), 4);
assertEquals( assertEquals(
"Outbound message sent" , "Outbound message" ,
events.get(0).getName()); events.get(0).getName());
assertEquals( assertEquals(
io.opentelemetry.api.common.Attributes.builder() io.opentelemetry.api.common.Attributes.builder()
@ -529,7 +529,7 @@ public class OpenTelemetryTracingModuleTest {
events.get(0).getAttributes()); events.get(0).getAttributes());
assertEquals( assertEquals(
"Outbound message sent" , "Outbound message" ,
events.get(1).getName()); events.get(1).getName());
assertEquals( assertEquals(
io.opentelemetry.api.common.Attributes.builder() io.opentelemetry.api.common.Attributes.builder()
@ -549,7 +549,7 @@ public class OpenTelemetryTracingModuleTest {
events.get(2).getAttributes()); events.get(2).getAttributes());
assertEquals( assertEquals(
"Inbound message received" , "Inbound message" ,
events.get(3).getName()); events.get(3).getName());
assertEquals( assertEquals(
io.opentelemetry.api.common.Attributes.builder() io.opentelemetry.api.common.Attributes.builder()