Browse Source
* WIP on Micrometer Observations * Added verification that metrics are measured * Fixed formatting * Fixed wrong status code method call * Converted to using around * Fixed compilation issues * prepare release 11.10 * [ci skip] updating versions to next development iteration 11.11-SNAPSHOT * Preparing for next development version * build(deps): bump json from 20220320 to 20220924 (#1768) Bumps [json](https://github.com/douglascrockford/JSON-java) from 20220320 to 20220924. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md) - [Commits](https://github.com/douglascrockford/JSON-java/commits) --- updated-dependencies: - dependency-name: org.json:json dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Updated to latest micrometer changes * Enriches via clientInterceptors * Fixed the error in the DEFAULT instance * Reverts enriching of CLientInterceptor to achieve observability * build(deps): bump slf4j.version from 2.0.2 to 2.0.3 (#1769) Bumps `slf4j.version` from 2.0.2 to 2.0.3. Updates `slf4j-simple` from 2.0.2 to 2.0.3 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.2...v_2.0.3) Updates `slf4j-nop` from 2.0.2 to 2.0.3 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.2...v_2.0.3) Updates `slf4j-api` from 2.0.2 to 2.0.3 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.2...v_2.0.3) Updates `slf4j-jdk14` from 2.0.2 to 2.0.3 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.2...v_2.0.3) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-nop dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-jdk14 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump kotlin.version from 1.7.10 to 1.7.20 (#1771) Bumps `kotlin.version` from 1.7.10 to 1.7.20. Updates `kotlin-stdlib-jdk8` from 1.7.10 to 1.7.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.10...v1.7.20) Updates `kotlin-reflect` from 1.7.10 to 1.7.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.10...v1.7.20) Updates `kotlin-maven-plugin` from 1.7.10 to 1.7.20 --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump asm from 9.3 to 9.4 (#1777) Bumps asm from 9.3 to 9.4. --- updated-dependencies: - dependency-name: org.ow2.asm:asm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Applied latest changes of Micrometer * Polish * Upgraded Micrometer to 1.10.0' * Alternative micrometer observation using capability * Ban 'repositories' * Applied my own review suggestions ;) * Polish Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Marvin Froeder <marvin.froeder@dovetailstudios.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marvin Froeder <marvin.froeder@police.govt.nz> Co-authored-by: Marvin Froeder <velo@users.noreply.github.com>pull/1837/head
Marcin Grzejszczak
2 years ago
committed by
GitHub
14 changed files with 614 additions and 45 deletions
@ -0,0 +1,72 @@
@@ -0,0 +1,72 @@
|
||||
/* |
||||
* Copyright 2012-2022 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.micrometer; |
||||
|
||||
import feign.Request; |
||||
import feign.Response; |
||||
import io.micrometer.common.KeyValues; |
||||
import io.micrometer.common.lang.Nullable; |
||||
|
||||
/** |
||||
* Default implementation of {@link FeignObservationConvention}. |
||||
* |
||||
* @since 12.1 |
||||
* @see FeignObservationConvention |
||||
*/ |
||||
public class DefaultFeignObservationConvention implements FeignObservationConvention { |
||||
|
||||
/** |
||||
* Singleton instance of this convention. |
||||
*/ |
||||
public static final DefaultFeignObservationConvention INSTANCE = |
||||
new DefaultFeignObservationConvention(); |
||||
|
||||
// There is no need to instantiate this class multiple times, but it may be extended,
|
||||
// hence protected visibility.
|
||||
protected DefaultFeignObservationConvention() {} |
||||
|
||||
@Override |
||||
public String getName() { |
||||
return "http.client.requests"; |
||||
} |
||||
|
||||
@Override |
||||
public String getContextualName(FeignContext context) { |
||||
return "HTTP " + getMethodString(context.getCarrier()); |
||||
} |
||||
|
||||
@Override |
||||
public KeyValues getLowCardinalityKeyValues(FeignContext context) { |
||||
String templatedUrl = context.getCarrier().requestTemplate().methodMetadata().template().url(); |
||||
return KeyValues.of( |
||||
FeignObservationDocumentation.HttpClientTags.METHOD |
||||
.withValue(getMethodString(context.getCarrier())), |
||||
FeignObservationDocumentation.HttpClientTags.URI |
||||
.withValue(templatedUrl), |
||||
FeignObservationDocumentation.HttpClientTags.STATUS |
||||
.withValue(getStatusValue(context.getResponse()))); |
||||
} |
||||
|
||||
String getStatusValue(@Nullable Response response) { |
||||
return response != null ? String.valueOf(response.status()) : "CLIENT_ERROR"; |
||||
} |
||||
|
||||
String getMethodString(@Nullable Request request) { |
||||
if (request == null) { |
||||
return "UNKNOWN"; |
||||
} |
||||
return request.httpMethod().name(); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,34 @@
@@ -0,0 +1,34 @@
|
||||
/* |
||||
* Copyright 2012-2022 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.micrometer; |
||||
|
||||
import feign.Request; |
||||
import feign.Response; |
||||
import io.micrometer.observation.transport.RequestReplySenderContext; |
||||
import io.micrometer.observation.transport.SenderContext; |
||||
|
||||
/** |
||||
* A {@link SenderContext} for Feign. |
||||
* |
||||
* @author Marcin Grzejszczak |
||||
* @since 12.1 |
||||
*/ |
||||
public class FeignContext extends RequestReplySenderContext<Request, Response> { |
||||
|
||||
public FeignContext(Request request) { |
||||
super(Request::header); |
||||
setCarrier(request); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,31 @@
@@ -0,0 +1,31 @@
|
||||
/* |
||||
* Copyright 2012-2022 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.micrometer; |
||||
|
||||
import io.micrometer.observation.Observation; |
||||
import io.micrometer.observation.ObservationConvention; |
||||
|
||||
/** |
||||
* {@link ObservationConvention} for Feign. |
||||
* |
||||
* @since 12.1 |
||||
*/ |
||||
public interface FeignObservationConvention extends ObservationConvention<FeignContext> { |
||||
|
||||
@Override |
||||
default boolean supportsContext(Observation.Context context) { |
||||
return context instanceof FeignContext; |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,81 @@
@@ -0,0 +1,81 @@
|
||||
/* |
||||
* Copyright 2012-2022 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.micrometer; |
||||
|
||||
import io.micrometer.common.docs.KeyName; |
||||
import io.micrometer.observation.Observation; |
||||
import io.micrometer.observation.ObservationConvention; |
||||
import io.micrometer.observation.docs.ObservationDocumentation; |
||||
|
||||
/** |
||||
* {@link ObservationDocumentation} for Feign. |
||||
* |
||||
* @since 12.1 |
||||
*/ |
||||
public enum FeignObservationDocumentation implements ObservationDocumentation { |
||||
|
||||
DEFAULT { |
||||
@Override |
||||
public Class<? extends ObservationConvention<? extends Observation.Context>> getDefaultConvention() { |
||||
return DefaultFeignObservationConvention.class; |
||||
} |
||||
|
||||
@Override |
||||
public KeyName[] getLowCardinalityKeyNames() { |
||||
return HttpClientTags.values(); |
||||
} |
||||
}; |
||||
|
||||
enum HttpClientTags implements KeyName { |
||||
|
||||
STATUS { |
||||
@Override |
||||
public String asString() { |
||||
return "http.status_code"; |
||||
} |
||||
}, |
||||
METHOD { |
||||
@Override |
||||
public String asString() { |
||||
return "http.method"; |
||||
} |
||||
}, |
||||
URI { |
||||
@Override |
||||
public String asString() { |
||||
return "http.url"; |
||||
} |
||||
}, |
||||
TARGET_SCHEME { |
||||
@Override |
||||
public String asString() { |
||||
return "http.scheme"; |
||||
} |
||||
}, |
||||
TARGET_HOST { |
||||
@Override |
||||
public String asString() { |
||||
return "net.peer.host"; |
||||
} |
||||
}, |
||||
TARGET_PORT { |
||||
@Override |
||||
public String asString() { |
||||
return "net.peer.port"; |
||||
} |
||||
} |
||||
|
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,95 @@
@@ -0,0 +1,95 @@
|
||||
/* |
||||
* Copyright 2012-2022 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.micrometer; |
||||
|
||||
import feign.AsyncClient; |
||||
import feign.Capability; |
||||
import feign.Client; |
||||
import feign.FeignException; |
||||
import feign.Response; |
||||
import io.micrometer.observation.Observation; |
||||
import io.micrometer.observation.ObservationRegistry; |
||||
|
||||
/** Warp feign {@link Client} with metrics. */ |
||||
public class MicrometerObservationCapability implements Capability { |
||||
|
||||
private final ObservationRegistry observationRegistry; |
||||
|
||||
private final FeignObservationConvention customFeignObservationConvention; |
||||
|
||||
public MicrometerObservationCapability(ObservationRegistry observationRegistry, |
||||
FeignObservationConvention customFeignObservationConvention) { |
||||
this.observationRegistry = observationRegistry; |
||||
this.customFeignObservationConvention = customFeignObservationConvention; |
||||
} |
||||
|
||||
public MicrometerObservationCapability(ObservationRegistry observationRegistry) { |
||||
this(observationRegistry, null); |
||||
} |
||||
|
||||
@Override |
||||
public Client enrich(Client client) { |
||||
return (request, options) -> { |
||||
FeignContext feignContext = new FeignContext(request); |
||||
|
||||
Observation observation = FeignObservationDocumentation.DEFAULT |
||||
.observation(this.customFeignObservationConvention, |
||||
DefaultFeignObservationConvention.INSTANCE, () -> feignContext, |
||||
this.observationRegistry) |
||||
.start(); |
||||
|
||||
try { |
||||
Response response = client.execute(request, options); |
||||
finalizeObservation(feignContext, observation, null, response); |
||||
return response; |
||||
} catch (FeignException ex) { |
||||
finalizeObservation(feignContext, observation, ex, null); |
||||
throw ex; |
||||
} |
||||
}; |
||||
} |
||||
|
||||
@Override |
||||
public AsyncClient<Object> enrich(AsyncClient<Object> client) { |
||||
return (request, options, context) -> { |
||||
FeignContext feignContext = new FeignContext(request); |
||||
|
||||
Observation observation = FeignObservationDocumentation.DEFAULT |
||||
.observation(this.customFeignObservationConvention, |
||||
DefaultFeignObservationConvention.INSTANCE, () -> feignContext, |
||||
this.observationRegistry) |
||||
.start(); |
||||
|
||||
try { |
||||
return client.execute(feignContext.getCarrier(), options, context) |
||||
.whenComplete((r, ex) -> finalizeObservation(feignContext, observation, ex, r)); |
||||
} catch (FeignException ex) { |
||||
finalizeObservation(feignContext, observation, ex, null); |
||||
|
||||
throw ex; |
||||
} |
||||
}; |
||||
} |
||||
|
||||
private void finalizeObservation(FeignContext feignContext, |
||||
Observation observation, |
||||
Throwable ex, |
||||
Response response) { |
||||
feignContext.setResponse(response); |
||||
if (ex != null) { |
||||
observation.error(ex); |
||||
} |
||||
observation.stop(); |
||||
} |
||||
} |
||||
@ -0,0 +1,131 @@
@@ -0,0 +1,131 @@
|
||||
/* |
||||
* Copyright 2012-2022 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.micrometer; |
||||
|
||||
import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl; |
||||
import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; |
||||
import static com.github.tomakehurst.wiremock.client.WireMock.get; |
||||
import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor; |
||||
import static com.github.tomakehurst.wiremock.client.WireMock.ok; |
||||
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; |
||||
import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; |
||||
import static com.github.tomakehurst.wiremock.client.WireMock.verify; |
||||
import static org.assertj.core.api.Assertions.assertThat; |
||||
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; |
||||
import com.github.tomakehurst.wiremock.junit5.WireMockTest; |
||||
import feign.AsyncFeign; |
||||
import feign.Feign; |
||||
import feign.Param; |
||||
import feign.Request; |
||||
import feign.RequestLine; |
||||
import feign.Response; |
||||
import io.micrometer.core.instrument.MeterRegistry; |
||||
import io.micrometer.core.instrument.Timer; |
||||
import io.micrometer.core.instrument.observation.DefaultMeterObservationHandler; |
||||
import io.micrometer.core.instrument.simple.SimpleMeterRegistry; |
||||
import io.micrometer.observation.Observation; |
||||
import io.micrometer.observation.ObservationHandler; |
||||
import io.micrometer.observation.ObservationRegistry; |
||||
import io.micrometer.observation.transport.RequestReplySenderContext; |
||||
import java.util.concurrent.CompletableFuture; |
||||
import java.util.concurrent.ExecutionException; |
||||
import java.util.concurrent.TimeUnit; |
||||
import okhttp3.OkHttpClient; |
||||
import org.junit.jupiter.api.BeforeEach; |
||||
import org.junit.jupiter.api.Test; |
||||
|
||||
@WireMockTest |
||||
class FeignHeaderInstrumentationTest { |
||||
|
||||
MeterRegistry meterRegistry = new SimpleMeterRegistry(); |
||||
|
||||
ObservationRegistry observationRegistry = ObservationRegistry.create(); |
||||
|
||||
@BeforeEach |
||||
void setup() { |
||||
observationRegistry.observationConfig() |
||||
.observationHandler(new DefaultMeterObservationHandler(meterRegistry)); |
||||
observationRegistry.observationConfig().observationHandler(new HeaderMutatingHandler()); |
||||
} |
||||
|
||||
@Test |
||||
void getTemplatedPathForUri(WireMockRuntimeInfo wmRuntimeInfo) { |
||||
stubFor(get(anyUrl()).willReturn(ok())); |
||||
|
||||
TestClient testClient = clientInstrumentedWithObservations(wmRuntimeInfo.getHttpBaseUrl()); |
||||
testClient.templated("1", "2"); |
||||
|
||||
verify(getRequestedFor(urlEqualTo("/customers/1/carts/2")).withHeader("foo", equalTo("bar"))); |
||||
Timer timer = meterRegistry.get("http.client.requests").timer(); |
||||
assertThat(timer.count()).isEqualTo(1); |
||||
assertThat(timer.totalTime(TimeUnit.NANOSECONDS)).isPositive(); |
||||
} |
||||
|
||||
@Test |
||||
void getTemplatedPathForUriForAsync(WireMockRuntimeInfo wmRuntimeInfo) |
||||
throws ExecutionException, InterruptedException { |
||||
stubFor(get(anyUrl()).willReturn(ok())); |
||||
|
||||
AsyncTestClient testClient = |
||||
asyncClientInstrumentedWithObservations(wmRuntimeInfo.getHttpBaseUrl()); |
||||
testClient.templated("1", "2").get(); |
||||
|
||||
verify(getRequestedFor(urlEqualTo("/customers/1/carts/2")).withHeader("foo", equalTo("bar"))); |
||||
Timer timer = meterRegistry.get("http.client.requests").timer(); |
||||
assertThat(timer.count()).isEqualTo(1); |
||||
assertThat(timer.totalTime(TimeUnit.NANOSECONDS)).isPositive(); |
||||
} |
||||
|
||||
private TestClient clientInstrumentedWithObservations(String url) { |
||||
return Feign.builder() |
||||
.client(new feign.okhttp.OkHttpClient(new OkHttpClient())) |
||||
.addCapability(new MicrometerObservationCapability(this.observationRegistry)) |
||||
.target(TestClient.class, url); |
||||
} |
||||
|
||||
private AsyncTestClient asyncClientInstrumentedWithObservations(String url) { |
||||
return AsyncFeign.builder() |
||||
.client(new feign.okhttp.OkHttpClient(new OkHttpClient())) |
||||
.addCapability(new MicrometerObservationCapability(this.observationRegistry)) |
||||
.target(AsyncTestClient.class, url); |
||||
} |
||||
|
||||
public interface TestClient { |
||||
|
||||
@RequestLine("GET /customers/{customerId}/carts/{cartId}") |
||||
String templated(@Param("customerId") String customerId, @Param("cartId") String cartId); |
||||
} |
||||
|
||||
public interface AsyncTestClient { |
||||
|
||||
@RequestLine("GET /customers/{customerId}/carts/{cartId}") |
||||
CompletableFuture<String> templated(@Param("customerId") String customerId, |
||||
@Param("cartId") String cartId); |
||||
} |
||||
|
||||
static class HeaderMutatingHandler |
||||
implements ObservationHandler<RequestReplySenderContext<Request, Response>> { |
||||
|
||||
@Override |
||||
public void onStart(RequestReplySenderContext<Request, Response> context) { |
||||
Request carrier = context.getCarrier(); |
||||
carrier.header("foo", "bar"); |
||||
} |
||||
|
||||
@Override |
||||
public boolean supportsContext(Observation.Context context) { |
||||
return context instanceof FeignContext; |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,43 @@
@@ -0,0 +1,43 @@
|
||||
/* |
||||
* Copyright 2012-2022 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.micrometer; |
||||
|
||||
import feign.AsyncFeign; |
||||
import feign.Feign; |
||||
import io.micrometer.core.instrument.observation.DefaultMeterObservationHandler; |
||||
import io.micrometer.observation.ObservationRegistry; |
||||
import org.junit.Before; |
||||
|
||||
public class MicrometerObservationRegistryCapabilityTest extends MicrometerCapabilityTest { |
||||
|
||||
ObservationRegistry observationRegistry = ObservationRegistry.create(); |
||||
|
||||
@Before |
||||
public void setupRegistry() { |
||||
observationRegistry.observationConfig() |
||||
.observationHandler(new DefaultMeterObservationHandler(metricsRegistry)); |
||||
} |
||||
|
||||
@Override |
||||
protected Feign.Builder customizeBuilder(Feign.Builder builder) { |
||||
return super.customizeBuilder(builder) |
||||
.addCapability(new MicrometerObservationCapability(this.observationRegistry)); |
||||
} |
||||
|
||||
@Override |
||||
protected <C> AsyncFeign.AsyncBuilder<C> customizeBuilder(AsyncFeign.AsyncBuilder<C> builder) { |
||||
return super.customizeBuilder(builder) |
||||
.addCapability(new MicrometerObservationCapability(this.observationRegistry)); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue