-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add metrics support to feign * Introduced capabilities to hystrix * Addressing PR comments
- Loading branch information
Showing
18 changed files
with
1,205 additions
and
135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,115 @@ | ||
/** | ||
* Copyright 2012-2020 The Feign 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 | ||
* | ||
* http://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 feign; | ||
|
||
import java.lang.reflect.InvocationTargetException; | ||
import java.util.Arrays; | ||
import java.util.List; | ||
import feign.Logger.Level; | ||
import feign.Request.Options; | ||
import feign.codec.Decoder; | ||
import feign.codec.Encoder; | ||
|
||
/** | ||
* Capabilities expose core feign artifacts to implementations so parts of core can be customized | ||
* around the time the client being built. | ||
* | ||
* For instance, capabilities take the {@link Client}, make changes to it and feed the modified | ||
* version back to feign. | ||
* | ||
* @see Metrics5Capability | ||
*/ | ||
public interface Capability { | ||
|
||
|
||
static <E> E enrich(E componentToEnrich, List<Capability> capabilities) { | ||
return capabilities.stream() | ||
// invoke each individual capability and feed the result to the next one. | ||
// This is equivalent to: | ||
// Capability cap1 = ...; | ||
// Capability cap2 = ...; | ||
// Capability cap2 = ...; | ||
// Contract contract = ...; | ||
// Contract contract1 = cap1.enrich(contract); | ||
// Contract contract2 = cap2.enrich(contract1); | ||
// Contract contract3 = cap3.enrich(contract2); | ||
// or in a more compact version | ||
// Contract enrichedContract = cap3.enrich(cap2.enrich(cap1.enrich(contract))); | ||
.reduce( | ||
componentToEnrich, | ||
(component, capability) -> invoke(component, capability), | ||
(component, enrichedComponent) -> enrichedComponent); | ||
} | ||
|
||
static <E> E invoke(E target, Capability capability) { | ||
return Arrays.stream(capability.getClass().getMethods()) | ||
.filter(method -> method.getName().equals("enrich")) | ||
.filter(method -> method.getReturnType().isInstance(target)) | ||
.findFirst() | ||
.map(method -> { | ||
try { | ||
return (E) method.invoke(capability, target); | ||
} catch (IllegalAccessException | IllegalArgumentException | ||
| InvocationTargetException e) { | ||
throw new RuntimeException("Unable to enrich " + target, e); | ||
} | ||
}) | ||
.orElse(target); | ||
} | ||
|
||
default Client enrich(Client client) { | ||
return client; | ||
} | ||
|
||
default Retryer enrich(Retryer retryer) { | ||
return retryer; | ||
} | ||
|
||
default RequestInterceptor enrich(RequestInterceptor requestInterceptor) { | ||
return requestInterceptor; | ||
} | ||
|
||
default Logger enrich(Logger logger) { | ||
return logger; | ||
} | ||
|
||
default Level enrich(Level level) { | ||
return level; | ||
} | ||
|
||
default Contract enrich(Contract contract) { | ||
return contract; | ||
} | ||
|
||
default Options enrich(Options options) { | ||
return options; | ||
} | ||
|
||
default Encoder enrich(Encoder encoder) { | ||
return encoder; | ||
} | ||
|
||
default Decoder enrich(Decoder decoder) { | ||
return decoder; | ||
} | ||
|
||
default InvocationHandlerFactory enrich(InvocationHandlerFactory invocationHandlerFactory) { | ||
return invocationHandlerFactory; | ||
} | ||
|
||
default QueryMapEncoder enrich(QueryMapEncoder queryMapEncoder) { | ||
return queryMapEncoder; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/** | ||
* Copyright 2012-2020 The Feign 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 | ||
* | ||
* http://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 feign; | ||
|
||
import static org.hamcrest.CoreMatchers.nullValue; | ||
import static org.junit.Assert.assertThat; | ||
import org.hamcrest.CoreMatchers; | ||
import org.junit.Test; | ||
import java.io.IOException; | ||
import java.util.Arrays; | ||
import feign.Request.Options; | ||
|
||
public class CapabilityTest { | ||
|
||
private class AClient implements Client { | ||
|
||
public AClient(Client client) {} | ||
|
||
@Override | ||
public Response execute(Request request, Options options) throws IOException { | ||
return null; | ||
} | ||
|
||
} | ||
private class BClient implements Client { | ||
|
||
public BClient(Client client) { | ||
if (!(client instanceof AClient)) { | ||
throw new RuntimeException("Test is chaing invokations, expected AClient instace here"); | ||
} | ||
} | ||
|
||
@Override | ||
public Response execute(Request request, Options options) throws IOException { | ||
return null; | ||
} | ||
|
||
} | ||
|
||
@Test | ||
public void enrichClient() { | ||
Client enriched = Capability.enrich(new Client.Default(null, null), Arrays.asList( | ||
new Capability() { | ||
@Override | ||
public Client enrich(Client client) { | ||
return new AClient(client); | ||
} | ||
}, new Capability() { | ||
@Override | ||
public Client enrich(Client client) { | ||
return new BClient(client); | ||
} | ||
})); | ||
|
||
assertThat(enriched, CoreMatchers.instanceOf(BClient.class)); | ||
} | ||
|
||
} |
60 changes: 60 additions & 0 deletions
60
hystrix/src/main/java/feign/hystrix/HystrixCapability.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
/** | ||
* Copyright 2012-2020 The Feign 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 | ||
* | ||
* http://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 feign.hystrix; | ||
|
||
import com.netflix.hystrix.HystrixCommand; | ||
import java.util.HashMap; | ||
import java.util.Map; | ||
import feign.Capability; | ||
import feign.Contract; | ||
import feign.InvocationHandlerFactory; | ||
|
||
/** | ||
* Allows Feign interfaces to return HystrixCommand or rx.Observable or rx.Single objects. Also | ||
* decorates normal Feign methods with circuit breakers, but calls {@link HystrixCommand#execute()} | ||
* directly. | ||
*/ | ||
public final class HystrixCapability implements Capability { | ||
|
||
private SetterFactory setterFactory = new SetterFactory.Default(); | ||
private final Map<Class, Object> fallbacks = new HashMap<>(); | ||
|
||
/** | ||
* Allows you to override hystrix properties such as thread pools and command keys. | ||
*/ | ||
public HystrixCapability setterFactory(SetterFactory setterFactory) { | ||
this.setterFactory = setterFactory; | ||
return this; | ||
} | ||
|
||
@Override | ||
public Contract enrich(Contract contract) { | ||
return new HystrixDelegatingContract(contract); | ||
} | ||
|
||
@Override | ||
public InvocationHandlerFactory enrich(InvocationHandlerFactory invocationHandlerFactory) { | ||
return (target, dispatch) -> new HystrixInvocationHandler(target, dispatch, setterFactory, | ||
fallbacks.containsKey(target.type()) | ||
? new FallbackFactory.Default<>(fallbacks.get(target.type())) | ||
: null); | ||
} | ||
|
||
public <E> Capability fallback(Class<E> api, E fallback) { | ||
fallbacks.put(api, fallback); | ||
|
||
return this; | ||
} | ||
|
||
} |
Oops, something went wrong.