diff options
| author |   Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> | 2023-11-07 16:21:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2023-11-07 16:21:42 +0000 |
| commit | d9abaa46bd2ef24e04b7e68b5d8f2151a9b1a4ed (patch) | |
| tree | d2781b226870b4a9d3ced0f7c121974854ce78df | |
| parent | 7b1baebc0dd9f75bcfe0e56796c5116a77c1e3aa (diff) | |
| parent | 6c6d7d0f9ba9fbaa677cd7e9a9c4a19244a61c19 (diff) | |
Merge "Add spring-cloud-sleuth for tracing"
| -rw-r--r-- | aai-resources/.gitignore | 2 | ||||
| -rw-r--r-- | aai-resources/pom.xml | 19 | ||||
| -rw-r--r-- | aai-resources/src/main/resources/application.properties | 8 |
3 files changed, 26 insertions, 3 deletions
diff --git a/aai-resources/.gitignore b/aai-resources/.gitignore index a8f03c5..47d0f72 100644 --- a/aai-resources/.gitignore +++ b/aai-resources/.gitignore @@ -14,3 +14,5 @@ bundleconfig-local/etc/logback.xml *.iml **/dbedgerules/** **/oxm/** +**/.classpath +.classpath
\ No newline at end of file diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index 2bfd698..0451d24 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -99,8 +99,8 @@ <!-- Integration tests will be skipped by default. Could be enabled here or by -DskipITs=false--> <skipITs>true</skipITs> - <!-- https://mvnrepository.com/artifact/io.swagger/swagger-core --> <swagger.version>1.6.8</swagger.version> + <spring-cloud.version>2020.0.2</spring-cloud.version> </properties> <profiles> <!-- Docker profile to be used for building docker image and pushing to nexus --> @@ -312,6 +312,14 @@ <artifactId>spring-boot-starter-hateoas</artifactId> </dependency> <dependency> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-starter-sleuth</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-sleuth-zipkin</artifactId> + </dependency> + <dependency> <groupId>io.micrometer</groupId> <artifactId>micrometer-spring-legacy</artifactId> <version>${micrometer-spring-legacy.version}</version> @@ -713,6 +721,13 @@ <type>pom</type> <scope>import</scope> </dependency> + <dependency> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-dependencies</artifactId> + <version>${spring-cloud.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> </dependencies> </dependencyManagement> <build> @@ -984,7 +999,7 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <configuration combine.children="append"> + <configuration> <excludes> <exclude>**/*WebSecurityConfig.*</exclude> </excludes> diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties index 66a8e53..adf899a 100644 --- a/aai-resources/src/main/resources/application.properties +++ b/aai-resources/src/main/resources/application.properties @@ -4,9 +4,15 @@ info.build.name=resources info.build.description=Resources Microservice info.build.version=1.1.0 -spring.application.name=Resources Microservice +spring.application.name=aai-resources spring.jersey.type=filter spring.main.allow-bean-definition-overriding=true +spring.zipkin.baseUrl=http://jaeger-collector.istio-system:9411 +spring.sleuth.messaging.jms.enabled = false +spring.sleuth.trace-id128=true +spring.sleuth.sampler.probability=1.0 +spring.sleuth.propagation.type=w3c, b3 +spring.sleuth.supports-join=false server.servlet.context-path=/ spring.autoconfigure.exclude=\ |