From 651eb80003027857f970d6bcf8d57605a470307f Mon Sep 17 00:00:00 2001
From: yifeizhuang <zivy@google.com>
Date: Fri, 21 Mar 2025 14:05:16 -0700
Subject: [PATCH] otel tracing: fix span names

---
 .../OpenTelemetryTracingModule.java            |  4 ++--
 .../OpenTelemetryTracingModuleTest.java        | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/opentelemetry/src/main/java/io/grpc/opentelemetry/OpenTelemetryTracingModule.java b/opentelemetry/src/main/java/io/grpc/opentelemetry/OpenTelemetryTracingModule.java
index 838ee0797a7..8c42a189ac2 100644
--- a/opentelemetry/src/main/java/io/grpc/opentelemetry/OpenTelemetryTracingModule.java
+++ b/opentelemetry/src/main/java/io/grpc/opentelemetry/OpenTelemetryTracingModule.java
@@ -446,7 +446,7 @@ private void recordOutboundMessageSentEvent(Span span,
     if (optionalWireSize != -1 && optionalWireSize != optionalUncompressedSize) {
       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) {
@@ -460,7 +460,7 @@ private void recordInboundMessageSize(Span span, int seqNo, long bytes) {
     AttributesBuilder attributesBuilder = io.opentelemetry.api.common.Attributes.builder();
     attributesBuilder.put("sequence-number", seqNo);
     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) {
diff --git a/opentelemetry/src/test/java/io/grpc/opentelemetry/OpenTelemetryTracingModuleTest.java b/opentelemetry/src/test/java/io/grpc/opentelemetry/OpenTelemetryTracingModuleTest.java
index b4486bcf2e4..bca6be94b9f 100644
--- a/opentelemetry/src/test/java/io/grpc/opentelemetry/OpenTelemetryTracingModuleTest.java
+++ b/opentelemetry/src/test/java/io/grpc/opentelemetry/OpenTelemetryTracingModuleTest.java
@@ -231,7 +231,7 @@ public void clientBasicTracingMocking() {
     List<String> events = eventNameCaptor.getAllValues();
     List<io.opentelemetry.api.common.Attributes> attributes = attributesCaptor.getAllValues();
     assertEquals(
-        "Outbound message sent" ,
+        "Outbound message" ,
         events.get(0));
     assertEquals(
         io.opentelemetry.api.common.Attributes.builder()
@@ -241,7 +241,7 @@ public void clientBasicTracingMocking() {
         attributes.get(0));
 
     assertEquals(
-        "Outbound message sent" ,
+        "Outbound message" ,
         events.get(1));
     assertEquals(
         io.opentelemetry.api.common.Attributes.builder()
@@ -313,7 +313,7 @@ public void clientBasicTracingRule() {
     assertTrue(clientSpanEvents.get(0).getAttributes().isEmpty());
 
     assertEquals(
-        "Inbound message received" ,
+        "Inbound message" ,
         clientSpanEvents.get(1).getName());
     assertEquals(
         io.opentelemetry.api.common.Attributes.builder()
@@ -323,7 +323,7 @@ public void clientBasicTracingRule() {
         clientSpanEvents.get(1).getAttributes());
 
     assertEquals(
-        "Inbound message received" ,
+        "Inbound message" ,
         clientSpanEvents.get(2).getName());
     assertEquals(
         io.opentelemetry.api.common.Attributes.builder()
@@ -342,7 +342,7 @@ public void clientBasicTracingRule() {
     assertTrue(clientSpanEvents.get(0).getAttributes().isEmpty());
 
     assertEquals(
-        "Outbound message sent" ,
+        "Outbound message" ,
         attemptSpanEvents.get(1).getName());
     assertEquals(
         io.opentelemetry.api.common.Attributes.builder()
@@ -352,7 +352,7 @@ public void clientBasicTracingRule() {
         attemptSpanEvents.get(1).getAttributes());
 
     assertEquals(
-        "Outbound message sent" ,
+        "Outbound message" ,
         attemptSpanEvents.get(2).getName());
     assertEquals(
         io.opentelemetry.api.common.Attributes.builder()
@@ -518,7 +518,7 @@ public void serverBasicTracingNoHeaders() {
     List<EventData> events = spans.get(0).getEvents();
     assertEquals(events.size(), 4);
     assertEquals(
-        "Outbound message sent" ,
+        "Outbound message" ,
         events.get(0).getName());
     assertEquals(
         io.opentelemetry.api.common.Attributes.builder()
@@ -529,7 +529,7 @@ public void serverBasicTracingNoHeaders() {
         events.get(0).getAttributes());
 
     assertEquals(
-        "Outbound message sent" ,
+        "Outbound message" ,
         events.get(1).getName());
     assertEquals(
         io.opentelemetry.api.common.Attributes.builder()
@@ -549,7 +549,7 @@ public void serverBasicTracingNoHeaders() {
         events.get(2).getAttributes());
 
     assertEquals(
-        "Inbound message received" ,
+        "Inbound message" ,
         events.get(3).getName());
     assertEquals(
         io.opentelemetry.api.common.Attributes.builder()