Skip to content

Commit 247f871

Browse files
committed
fix: use number format exception
1 parent 53117a3 commit 247f871

2 files changed

Lines changed: 24 additions & 6 deletions

File tree

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,11 @@ private long extractContentLength(final java.util.Map<String, Object> headers) {
147147
if (headers == null || headerGetter.get() == null) {
148148
return -1;
149149
}
150-
return Long.parseLong(String.valueOf(headerGetter.get()));
150+
try {
151+
return Long.parseLong(String.valueOf(headerGetter.get()));
152+
} catch (NumberFormatException ex) {
153+
return -1;
154+
}
151155
}
152156

153157
private void endAttempt() {

gax-java/gax/src/test/java/com/google/api/gax/tracing/SpanTracerTest.java

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,23 @@ void testResponseHeadersReceived_missingContentLength() {
117117
headers.put("Other-Header", "123");
118118
spanTracer.responseHeadersReceived(headers);
119119

120-
verify(span, org.mockito.Mockito.never())
121-
.setAttribute(
122-
org.mockito.ArgumentMatchers.eq(ObservabilityAttributes.HTTP_RESPONSE_BODY_SIZE),
123-
org.mockito.ArgumentMatchers.anyLong());
124-
}
120+
verify(span, org.mockito.Mockito.never())
121+
.setAttribute(
122+
org.mockito.ArgumentMatchers.eq(ObservabilityAttributes.HTTP_RESPONSE_BODY_SIZE),
123+
org.mockito.ArgumentMatchers.anyLong());
124+
}
125+
126+
@Test
127+
void testResponseHeadersReceived_badFormat() {
128+
spanTracer.attemptStarted(new Object(), 1);
129+
130+
java.util.Map<String, Object> headers = new java.util.HashMap<>();
131+
headers.put("Other-Header", "12X3");
132+
spanTracer.responseHeadersReceived(headers);
133+
134+
verify(span, org.mockito.Mockito.never())
135+
.setAttribute(
136+
org.mockito.ArgumentMatchers.eq(ObservabilityAttributes.HTTP_RESPONSE_BODY_SIZE),
137+
org.mockito.ArgumentMatchers.eq(-1));
138+
}
125139
}

0 commit comments

Comments
 (0)