Skip to content

Commit 12143fd

Browse files
committed
fix: restore default overload
1 parent 074ab67 commit 12143fd

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/GoldenSignalsMetricsTracer.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@
2929
*/
3030
package com.google.api.gax.tracing;
3131

32+
import static com.google.api.gax.tracing.ObservabilityAttributes.HTTP_RESPONSE_STATUS_ATTRIBUTE;
3233
import static com.google.api.gax.tracing.ObservabilityAttributes.RPC_RESPONSE_STATUS_ATTRIBUTE;
3334

3435
import com.google.api.gax.rpc.StatusCode;
36+
import com.google.api.gax.tracing.ApiTracerContext.Transport;
3537
import com.google.common.annotations.VisibleForTesting;
3638
import com.google.common.base.Stopwatch;
3739
import com.google.common.base.Ticker;
@@ -91,8 +93,13 @@ public void operationCancelled() {
9193

9294
@Override
9395
public void operationFailed(Throwable error) {
94-
attributes.put(
95-
RPC_RESPONSE_STATUS_ATTRIBUTE, ObservabilityUtils.extractStatus(error, transport));
96+
if (transport == Transport.HTTP) {
97+
attributes.put(
98+
HTTP_RESPONSE_STATUS_ATTRIBUTE, ObservabilityUtils.extractStatus(error, transport));
99+
} else {
100+
attributes.put(
101+
RPC_RESPONSE_STATUS_ATTRIBUTE, ObservabilityUtils.extractStatus(error, transport));
102+
}
96103
metricsRecorder.recordOperationLatency(
97104
clientRequestTimer.elapsed(TimeUnit.NANOSECONDS) / 1_000_000_000.0, attributes);
98105
}

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/LoggingTracer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import com.google.api.core.InternalApi;
3535
import com.google.api.gax.logging.LoggerProvider;
3636
import com.google.api.gax.logging.LoggingUtils;
37-
import com.google.api.gax.tracing.ApiTracerContext.Transport;
3837
import com.google.common.annotations.VisibleForTesting;
3938
import com.google.rpc.ErrorInfo;
4039
import java.util.HashMap;
@@ -81,7 +80,7 @@ void recordActionableError(Throwable error) {
8180

8281
logContext.put(
8382
ObservabilityAttributes.RPC_RESPONSE_STATUS_ATTRIBUTE,
84-
ObservabilityUtils.extractStatus(error, Transport.GRPC));
83+
ObservabilityUtils.extractStatus(error));
8584

8685
ErrorInfo errorInfo = ObservabilityUtils.extractErrorInfo(error);
8786
if (errorInfo != null) {

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/MetricsTracer.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,7 @@ public void operationFailed(Throwable error) {
120120
if (operationFinished.getAndSet(true)) {
121121
throw new IllegalStateException(OPERATION_FINISHED_STATUS_MESSAGE);
122122
}
123-
attributes.put(
124-
STATUS_ATTRIBUTE,
125-
(String) ObservabilityUtils.extractStatus(error, ApiTracerContext.Transport.GRPC));
123+
attributes.put(STATUS_ATTRIBUTE, (String) ObservabilityUtils.extractStatus(error));
126124
metricsRecorder.recordOperationLatency(
127125
operationTimer.elapsed(TimeUnit.MILLISECONDS), attributes);
128126
metricsRecorder.recordOperationCount(1, attributes);
@@ -174,9 +172,7 @@ public void attemptCancelled() {
174172
*/
175173
@Override
176174
public void attemptFailedDuration(Throwable error, java.time.Duration delay) {
177-
attributes.put(
178-
STATUS_ATTRIBUTE,
179-
(String) ObservabilityUtils.extractStatus(error, ApiTracerContext.Transport.GRPC));
175+
attributes.put(STATUS_ATTRIBUTE, (String) ObservabilityUtils.extractStatus(error));
180176
metricsRecorder.recordAttemptLatency(attemptTimer.elapsed(TimeUnit.MILLISECONDS), attributes);
181177
metricsRecorder.recordAttemptCount(1, attributes);
182178
}
@@ -200,9 +196,7 @@ public void attemptFailed(Throwable error, org.threeten.bp.Duration delay) {
200196
*/
201197
@Override
202198
public void attemptFailedRetriesExhausted(Throwable error) {
203-
attributes.put(
204-
STATUS_ATTRIBUTE,
205-
(String) ObservabilityUtils.extractStatus(error, ApiTracerContext.Transport.GRPC));
199+
attributes.put(STATUS_ATTRIBUTE, (String) ObservabilityUtils.extractStatus(error));
206200
metricsRecorder.recordAttemptLatency(attemptTimer.elapsed(TimeUnit.MILLISECONDS), attributes);
207201
metricsRecorder.recordAttemptCount(1, attributes);
208202
}
@@ -216,9 +210,7 @@ public void attemptFailedRetriesExhausted(Throwable error) {
216210
*/
217211
@Override
218212
public void attemptPermanentFailure(Throwable error) {
219-
attributes.put(
220-
STATUS_ATTRIBUTE,
221-
(String) ObservabilityUtils.extractStatus(error, ApiTracerContext.Transport.GRPC));
213+
attributes.put(STATUS_ATTRIBUTE, (String) ObservabilityUtils.extractStatus(error));
222214
metricsRecorder.recordAttemptLatency(attemptTimer.elapsed(TimeUnit.MILLISECONDS), attributes);
223215
metricsRecorder.recordAttemptCount(1, attributes);
224216
}

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/ObservabilityUtils.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@
4343

4444
final class ObservabilityUtils {
4545

46+
/** Function to extract the status of the error as a string (defaults to gRPC canonical codes). */
47+
static String extractStatus(@Nullable Throwable error) {
48+
return (String) extractStatus(error, ApiTracerContext.Transport.GRPC);
49+
}
50+
4651
static Object extractStatus(@Nullable Throwable error, ApiTracerContext.Transport transport) {
4752
if (transport == ApiTracerContext.Transport.HTTP) {
4853
return extractHttpStatus(error);

0 commit comments

Comments
 (0)