diff options
| author |   Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> | 2024-01-02 22:35:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2024-01-02 22:35:26 +0000 |
| commit | 87cbabb974af4fa9b4777cd54b5cadfc7b9ee3fd (patch) | |
| tree | a2ef4b20bf52a15e0425b10f4ef9e5613e7efda2 /aai-traversal/src/main | |
| parent | dd0160e654eba5b2758b7bb214424fd1aee13eb6 (diff) | |
| parent | ca3aa8f05227638b96b0ae0745574c8067a63def (diff) | |
Merge "Update spring-boot to 2.3"
Diffstat (limited to 'aai-traversal/src/main')
| -rw-r--r-- | aai-traversal/src/main/java/org/onap/aai/web/JerseyConfiguration.java | 3 | ||||
| -rw-r--r-- | aai-traversal/src/main/resources/application.properties | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/aai-traversal/src/main/java/org/onap/aai/web/JerseyConfiguration.java b/aai-traversal/src/main/java/org/onap/aai/web/JerseyConfiguration.java index 0bfbd9d..e430e77 100644 --- a/aai-traversal/src/main/java/org/onap/aai/web/JerseyConfiguration.java +++ b/aai-traversal/src/main/java/org/onap/aai/web/JerseyConfiguration.java @@ -43,6 +43,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.env.Environment; +import org.springframework.core.env.Profiles; @Configuration public class JerseyConfiguration { @@ -115,7 +116,7 @@ public class JerseyConfiguration { private boolean isEnabledByActiveProfiles(AnnotatedElement annotatedElement) { boolean result = !annotatedElement.isAnnotationPresent(Profile.class) - || environment.acceptsProfiles(annotatedElement.getAnnotation(Profile.class).value()); + || environment.acceptsProfiles(Profiles.of(annotatedElement.getAnnotation(Profile.class).value())); logger.debug("isEnabledByActiveProfiles: annotatedElement: " + annotatedElement.toString() + " result=" + result); return result; diff --git a/aai-traversal/src/main/resources/application.properties b/aai-traversal/src/main/resources/application.properties index 5242148..5e49d18 100644 --- a/aai-traversal/src/main/resources/application.properties +++ b/aai-traversal/src/main/resources/application.properties @@ -120,7 +120,7 @@ management.server.port=8448 management.endpoints.enabled-by-default=true #To Enable Actuator Endpoint, you can override this in OOM Charts management.endpoints.web.exposure.include=info, health, prometheus -management.metrics.web.server.auto-time-requests=false +management.metrics.web.server.request.autotime.enabled=false management.metrics.tags.group_id=aai # management.metrics.tags.app_id=${info.build.artifact} #Enable this option only for debug purposes. For more information: https://github.com/micrometer-metrics/micrometer/issues/1584 |