fix revert request size attribute

Author: diegomarquezp

gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpRequestRunnable.java

@@ -44,7 +44,6 @@
 import com.google.api.client.json.JsonObjectParser;
 import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.util.GenericData;
-import com.google.api.gax.tracing.ApiTracer;
 import com.google.auth.Credentials;
 import com.google.auth.http.HttpCredentialsAdapter;
 import com.google.auto.value.AutoValue;
@@ -113,14 +112,6 @@ public void run() {
         return;
       }
 
-      ApiTracer tracer = httpJsonCallOptions.getTracer();
-      if (tracer != null) {
-        // If the request is using transport encoding (e.g. gzip), this should be the compressed
-        // size. getContent().getLength() returns the length of the content which would be the
-        // compressed size if transport encoding is used.
-        tracer.requestSent(httpRequest.getContent().getLength());
-      }
-
       httpResponse = httpRequest.execute();
 
       // Check if already cancelled before trying to construct and read the response

gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/BodySizeRecordingTest.java

@@ -138,13 +138,6 @@ void testBodySizeRecording() throws Exception {
 
     callable.futureCall(request, callContext).get();
 
-    // Verify request size
-    // The request body should be Field with number=42 (name is cleared in extractor)
-    // HttpRequestRunnable re-serializes it compactly.
-    String expectedRequestBody = "{\"number\":42}";
-    long expectedRequestSize = expectedRequestBody.getBytes("UTF-8").length;
-    assertThat(tracer.getRequestSentSize()).isEqualTo(expectedRequestSize);
-
     // Verify response size
     // MockHttpService uses ProtoRestSerializer which pretty-prints.
     String expectedResponseBody = ProtoRestSerializer.create().toBody("*", response, false);
@@ -219,11 +212,6 @@ public void onComplete() {
 
     assertThat(receivedResponses).hasSize(2);
 
-    // Verify request size
-    String expectedRequestBody = "{\"number\":42}";
-    long expectedRequestSize = expectedRequestBody.getBytes("UTF-8").length;
-    assertThat(tracer.getRequestSentSize()).isEqualTo(expectedRequestSize);
-
     // Verify response size
     // MockHttpService server-streaming response construction adds [ ] and ,
     String resp1Json = methodServerStreaming.getResponseParser().serialize(response1);

gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/testing/TestApiTracer.java

@@ -44,7 +44,6 @@ public class TestApiTracer implements ApiTracer {
   private final AtomicInteger attemptsStarted = new AtomicInteger();
   private final AtomicInteger attemptsFailed = new AtomicInteger();
   private final AtomicBoolean retriesExhausted = new AtomicBoolean(false);
-  private final AtomicLong requestSentSize = new AtomicLong();
   private final AtomicLong responseReceivedSize = new AtomicLong();
 
   public TestApiTracer() {}
@@ -61,10 +60,6 @@ public AtomicBoolean getRetriesExhausted() {
     return retriesExhausted;
   }
 
-  public long getRequestSentSize() {
-    return requestSentSize.get();
-  }
-
   public long getResponseReceivedSize() {
     return responseReceivedSize.get();
   }
@@ -90,11 +85,6 @@ public void attemptFailedRetriesExhausted(Throwable error) {
     retriesExhausted.set(true);
   }
 
-  @Override
-  public void requestSent(long requestSize) {
-    requestSentSize.addAndGet(requestSize);
-  }
-
   @Override
   public void responseReceived(long responseSize) {
     responseReceivedSize.addAndGet(responseSize);

gax-java/gax/src/main/java/com/google/api/gax/tracing/ApiTracer.java

@@ -187,10 +187,6 @@ default void responseReceived(long responseSize) {}
   default void requestSent() {}
   ;
 
-  /** Adds an annotation that a streaming request has been sent with size. */
-  default void requestSent(long requestSize) {}
-  ;
-
   /**
    * Adds an annotation that a batch of writes has been flushed.
    *

gax-java/gax/src/main/java/com/google/api/gax/tracing/BaseApiTracer.java

@@ -149,11 +149,6 @@ public void requestSent() {
     // noop
   }
 
-  @Override
-  public void requestSent(long requestSize) {
-    // noop
-  }
-
   @Override
   public void batchRequestSent(long elementCount, long requestSize) {
     // noop

gax-java/gax/src/main/java/com/google/api/gax/tracing/ObservabilityAttributes.java

@@ -74,9 +74,6 @@ public class ObservabilityAttributes {
   /** The url template of the request (e.g. /v1/{name}:access). */
   public static final String URL_TEMPLATE_ATTRIBUTE = "url.template";
 
-  /** Size of the request body in bytes. */
-  public static final String HTTP_REQUEST_BODY_SIZE = "http.request.body.size";
-
   /** Size of the response body in bytes. */
   public static final String HTTP_RESPONSE_BODY_SIZE = "http.response.body.size";
 }

gax-java/gax/src/main/java/com/google/api/gax/tracing/OpencensusTracer.java

@@ -422,15 +422,6 @@ public void requestSent() {
     totalSentMessages.incrementAndGet();
   }
 
-  /** {@inheritDoc} */
-  @Override
-  public void requestSent(long requestSize) {
-    requestSent();
-    span.putAttribute(
-        ObservabilityAttributes.HTTP_REQUEST_BODY_SIZE,
-        AttributeValue.longAttributeValue(requestSize));
-  }
-
   /** {@inheritDoc} */
   @Override
   public void batchRequestSent(long elementCount, long requestSize) {

gax-java/gax/src/main/java/com/google/api/gax/tracing/SpanTracer.java

@@ -85,13 +85,6 @@ public void attemptSucceeded() {
     endAttempt();
   }
 
-  @Override
-  public void requestSent(long requestSize) {
-    if (attemptHandle != null) {
-      attemptHandle.setAttribute(ObservabilityAttributes.HTTP_REQUEST_BODY_SIZE, requestSize);
-    }
-  }
-
   @Override
   public void responseReceived(long responseSize) {
     if (attemptHandle != null) {

java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITOtelTracing.java

@@ -205,11 +205,6 @@ void testTracing_httpjson_bodySizes() throws Exception {
               .findFirst()
               .orElseThrow(() -> new AssertionError("Attempt span 'Echo/Echo/attempt' not found"));
 
-      assertThat(
-              attemptSpan
-                  .getAttributes()
-                  .get(AttributeKey.longKey(ObservabilityAttributes.HTTP_REQUEST_BODY_SIZE)))
-          .isAtLeast(1L);
       assertThat(
               attemptSpan
                   .getAttributes()