Skip to content

Return 0 status code on exception or invalid code #1387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcingrzejszczak merged 2 commits into from
Jul 3, 2019
Merged

Return 0 status code on exception or invalid code #1387

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
052d14a
Return 0 status code on exception or invalid code
marcingrzejszczak Jul 3, 2019
c7b37a1
Changed the impl following the review
marcingrzejszczak Jul 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...ain/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,8 @@ private static <T> boolean anyFinalMethods(T object, Class<T> iface) {
method -> {
Method m = ReflectionUtils.findMethod(object.getClass(),
method.getName(), method.getParameterTypes());
return m != null &&
!ReflectionUtils.isObjectMethod(m) &&
Modifier.isFinal(m.getModifiers());
return m != null && !ReflectionUtils.isObjectMethod(m)
&& Modifier.isFinal(m.getModifiers());
});
return finalMethodPresent.get();
}
Expand Down
12 changes: 11 additions & 1 deletion ...g/springframework/cloud/sleuth/instrument/web/client/TraceWebClientBeanPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,17 @@ public String requestHeader(ClientRequest request, String name) {

@Override
public Integer statusCode(ClientResponse response) {
return response.statusCode().value();
return response.rawStatusCode();
Copy link
Contributor

@codefromthecrypt codefromthecrypt Jul 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

something like this otherwise you still end up with the exception :P

  @Override public Integer statusCode(HttpResponse response) {
    int result = statusCodeAsInt(response);
    return result != 0 ? result : null;
  }

Copy link
Contributor Author

@marcingrzejszczak marcingrzejszczak Jul 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok but statusCode is called only via the statusCodeAsInt in Brave

}

@Override
public int statusCodeAsInt(ClientResponse response) {
try {
return super.statusCodeAsInt(response);
}
catch (Exception dontCare) {
return 0;
}
}

}
Expand Down
50 changes: 50 additions & 0 deletions ...ework/cloud/sleuth/instrument/web/client/TraceExchangeFilterFunctionHttpAdapterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* Copyright 2013-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.springframework.cloud.sleuth.instrument.web.client;

import org.assertj.core.api.BDDAssertions;
import org.junit.Test;
import org.mockito.BDDMockito;

import org.springframework.web.reactive.function.client.ClientResponse;

public class TraceExchangeFilterFunctionHttpAdapterTests {

@Test
public void should_return_0_when_invalid_status_code_is_returned() {
ClientResponse clientResponse = BDDMockito.mock(ClientResponse.class);
BDDMockito.given(clientResponse.rawStatusCode())
.willThrow(new IllegalStateException("Boom"));
TraceExchangeFilterFunction.HttpAdapter adapter = new TraceExchangeFilterFunction.HttpAdapter();

Integer statusCode = adapter.statusCodeAsInt(clientResponse);

BDDAssertions.then(statusCode).isZero();
}

@Test
public void should_return_status_code_when_valid_status_code_is_returned() {
ClientResponse clientResponse = BDDMockito.mock(ClientResponse.class);
BDDMockito.given(clientResponse.rawStatusCode()).willReturn(200);
TraceExchangeFilterFunction.HttpAdapter adapter = new TraceExchangeFilterFunction.HttpAdapter();

Integer statusCode = adapter.statusCodeAsInt(clientResponse);

BDDAssertions.then(statusCode).isEqualTo(200);
}

}