From 14cd46c48abf97b31c83b60b9625fade173f28e9 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Mon, 12 May 2025 13:08:24 +0200 Subject: [PATCH] Add tracing for catalog-db-adapter - add sleuth tracing dependencies - make tracing disabled by default - make it configurable via environment variables - bump snapshot version to 1.15.1-SNAPSHOT Issue-ID: SO-4150 Signed-off-by: Fiete Ostkamp Change-Id: Id8c32584a5ae49417f0d5ddb7a828cc189dc2789 --- readme.md => README.md | 0 adapters/mso-adapter-utils/pom.xml | 2 +- adapters/mso-adapters-rest-interface/pom.xml | 2 +- adapters/mso-catalog-db-adapter/pom.xml | 2 +- .../src/main/resources/application.yaml | 27 ++++++++--- .../catalogdb/CatalogDbAdapterBaseTest.java | 16 +++++-- .../catalogdb/catalogrest/TracingTest.java | 54 ++++++++++++++++++++++ adapters/mso-openstack-adapters/pom.xml | 2 +- adapters/mso-requests-db-adapter/pom.xml | 2 +- adapters/mso-sdnc-adapter/pom.xml | 2 +- adapters/pom.xml | 2 +- adapters/so-appc-orchestrator/pom.xml | 2 +- asdc-controller/pom.xml | 2 +- bpmn/MSOCommonBPMN/pom.xml | 2 +- bpmn/MSOCoreBPMN/pom.xml | 2 +- bpmn/mso-infrastructure-bpmn/pom.xml | 2 +- bpmn/pom.xml | 2 +- bpmn/so-bpmn-building-blocks/pom.xml | 2 +- bpmn/so-bpmn-infrastructure-common/pom.xml | 2 +- bpmn/so-bpmn-infrastructure-flows/pom.xml | 2 +- bpmn/so-bpmn-moi/pom.xml | 2 +- bpmn/so-bpmn-tasks/pom.xml | 2 +- common/pom.xml | 2 +- cxf-logging/pom.xml | 2 +- deployment-configs/pom.xml | 2 +- graph-inventory/aai-client/pom.xml | 2 +- .../fluent-builder-maven-plugin/pom.xml | 2 +- graph-inventory/pom.xml | 2 +- mso-api-handlers/mso-api-handler-common/pom.xml | 2 +- mso-api-handlers/mso-api-handler-infra/pom.xml | 2 +- .../mso-requests-db-repositories/pom.xml | 2 +- mso-api-handlers/mso-requests-db/pom.xml | 2 +- mso-api-handlers/pom.xml | 2 +- mso-catalog-db/pom.xml | 2 +- packages/docker/pom.xml | 2 +- packages/pom.xml | 2 +- pom.xml | 18 +++++++- so-optimization-clients/pom.xml | 2 +- so-sdn-clients/pom.xml | 2 +- so-simulator/pom.xml | 2 +- version.properties | 2 +- 41 files changed, 141 insertions(+), 46 deletions(-) rename readme.md => README.md (100%) create mode 100644 adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/TracingTest.java diff --git a/readme.md b/README.md similarity index 100% rename from readme.md rename to README.md diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml index 852a09850b..4cbcca8c11 100644 --- a/adapters/mso-adapter-utils/pom.xml +++ b/adapters/mso-adapter-utils/pom.xml @@ -4,7 +4,7 @@ org.onap.so adapters - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT org.onap.so.adapters mso-adapter-utils diff --git a/adapters/mso-adapters-rest-interface/pom.xml b/adapters/mso-adapters-rest-interface/pom.xml index 1bdf0abba2..d8013dbb1b 100644 --- a/adapters/mso-adapters-rest-interface/pom.xml +++ b/adapters/mso-adapters-rest-interface/pom.xml @@ -4,7 +4,7 @@ org.onap.so adapters - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT org.onap.so.adapters mso-adapters-rest-interface diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml index 1aea1637c3..f38809bfe0 100644 --- a/adapters/mso-catalog-db-adapter/pom.xml +++ b/adapters/mso-catalog-db-adapter/pom.xml @@ -4,7 +4,7 @@ org.onap.so adapters - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT org.onap.so.adapters mso-catalog-db-adapter diff --git a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml index 1487cb21b2..bc6ce7a48c 100644 --- a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml +++ b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml @@ -1,11 +1,11 @@ # will be used as entry in DB to say SITE OFF/ON for healthcheck # MSO Properties go here - + server: - port: 8080 + port: 8080 tomcat: max-threads: 50 - + mso: logPath: ./logs/openstack site-name: localDevEnv @@ -13,8 +13,10 @@ mso: core-pool-size: 50 max-pool-size: 50 queue-capacity: 500 - + spring: + application: + name: so-catalog-db-adapter datasource: hikari: jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb @@ -23,7 +25,7 @@ spring: driver-class-name: org.mariadb.jdbc.Driver pool-name: catdb-pool registerMbeans: true - + flyway: baseline-on-migrate: false url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb @@ -43,6 +45,20 @@ spring: fail-on-empty-beans: false main: allow-bean-definition-overriding: true + sleuth: + enabled: ${TRACING_ENABLED:false} + messaging: + jms: + enabled: false + trace-id128: true + sampler: + probability: ${TRACING_SAMPLING_PROBABILITY:1.0} + supports-join: false + web: + skip-pattern: /actuator/health/* + zipkin: + base-url: ${TRACING_COLLECTOR_URL:http://jaeger-collector.istio-system:9411} + #Actuator management: @@ -57,4 +73,3 @@ management: prometheus: enabled: true # Whether exporting of metrics to Prometheus is enabled. step: 1m # Step size (i.e. reporting frequency) to use. - diff --git a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/CatalogDbAdapterBaseTest.java b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/CatalogDbAdapterBaseTest.java index 499310748e..2c0648ad66 100644 --- a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/CatalogDbAdapterBaseTest.java +++ b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/CatalogDbAdapterBaseTest.java @@ -7,9 +7,9 @@ * 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. @@ -25,7 +25,10 @@ import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.DynamicPropertyRegistry; +import org.springframework.test.context.DynamicPropertySource; import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.util.SocketUtils; @RunWith(SpringRunner.class) @SpringBootTest(classes = CatalogDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @@ -35,7 +38,14 @@ public class CatalogDbAdapterBaseTest { @LocalServerPort protected int port; - @Test public void testNothing() {} + + @DynamicPropertySource + static void configureProperties(DynamicPropertyRegistry registry) { + int port = SocketUtils.findAvailableTcpPort(); + registry.add("spring.datasource.url", () -> String.format("jdbc:mariadb://localhost:%s/catalogdb", port)); + registry.add("spring.flyway.url", () -> String.format("jdbc:mariadb://localhost:%s/catalogdb", port)); + registry.add("mariaDB4j.port", () -> port); + } } diff --git a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/TracingTest.java b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/TracingTest.java new file mode 100644 index 0000000000..9879d7de70 --- /dev/null +++ b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/TracingTest.java @@ -0,0 +1,54 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright © 2025 Deutsche Telekom AG Intellectual Property. All rights reserved. + * ================================================================================ + * 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. + * ============LICENSE_END========================================================= + */ +package org.onap.so.adapters.catalogdb.catalogrest; + +import org.junit.Test; +import org.onap.so.adapters.catalogdb.CatalogDbAdapterBaseTest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; +import org.springframework.http.HttpStatus; +import org.springframework.test.context.TestPropertySource; +import org.springframework.web.client.RestClientException; +import org.springframework.web.client.RestTemplate; +import com.github.tomakehurst.wiremock.client.WireMock; + +@AutoConfigureWireMock(port = 0) +@TestPropertySource( + properties = {"spring.sleuth.enabled=true", "spring.zipkin.base-url=http://localhost:${wiremock.server.port}"}) +public class TracingTest extends CatalogDbAdapterBaseTest { + + @Autowired + RestTemplate restTemplate; + + @Test + public void thatTracesAreExported() throws InterruptedException { + WireMock.stubFor(WireMock.post(WireMock.urlEqualTo("/api/v2/spans")) + .willReturn(WireMock.aResponse().withStatus(HttpStatus.OK.value()))); + + try { + restTemplate.getForObject("http://localhost:" + port + "/foo", String.class); + } catch (RestClientException e) { + // this provokes a 404. For the test it's not important what is returned here + } + Thread.sleep(1000); + WireMock.verify(WireMock.postRequestedFor(WireMock.urlEqualTo("/api/v2/spans"))); + } + +} diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml index 0de2a57553..c34feb0e5e 100644 --- a/adapters/mso-openstack-adapters/pom.xml +++ b/adapters/mso-openstack-adapters/pom.xml @@ -4,7 +4,7 @@ org.onap.so adapters - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT mso-openstack-adapters jar diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index 0f9582e698..18d4ceb9ef 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -4,7 +4,7 @@ org.onap.so adapters - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT org.onap.so.adapters mso-requests-db-adapter diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml index f09732d54e..9e3a2f30fc 100644 --- a/adapters/mso-sdnc-adapter/pom.xml +++ b/adapters/mso-sdnc-adapter/pom.xml @@ -4,7 +4,7 @@ org.onap.so adapters - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT mso-sdnc-adapter diff --git a/adapters/pom.xml b/adapters/pom.xml index c0cbdf5eaf..70aa07aeda 100644 --- a/adapters/pom.xml +++ b/adapters/pom.xml @@ -5,7 +5,7 @@ org.onap.so so - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT adapters diff --git a/adapters/so-appc-orchestrator/pom.xml b/adapters/so-appc-orchestrator/pom.xml index f83552adeb..2a9c945ab8 100644 --- a/adapters/so-appc-orchestrator/pom.xml +++ b/adapters/so-appc-orchestrator/pom.xml @@ -4,7 +4,7 @@ org.onap.so adapters - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT org.onap.so.adapters so-appc-orchestrator diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index a17d1b0748..8892431e25 100644 --- a/asdc-controller/pom.xml +++ b/asdc-controller/pom.xml @@ -4,7 +4,7 @@ org.onap.so so - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT asdc-controller asdc-controller diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml index ab90c5cd25..61952017b7 100644 --- a/bpmn/MSOCommonBPMN/pom.xml +++ b/bpmn/MSOCommonBPMN/pom.xml @@ -5,7 +5,7 @@ org.onap.so bpmn - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT MSOCommonBPMN MSOCommonBPMN diff --git a/bpmn/MSOCoreBPMN/pom.xml b/bpmn/MSOCoreBPMN/pom.xml index 662bd30532..d09eebba6e 100644 --- a/bpmn/MSOCoreBPMN/pom.xml +++ b/bpmn/MSOCoreBPMN/pom.xml @@ -4,7 +4,7 @@ org.onap.so bpmn - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT 4.0.0 MSOCoreBPMN diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml index 08e25c8786..b0d5902b0c 100644 --- a/bpmn/mso-infrastructure-bpmn/pom.xml +++ b/bpmn/mso-infrastructure-bpmn/pom.xml @@ -3,7 +3,7 @@ org.onap.so bpmn - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT 4.0.0 mso-infrastructure-bpmn diff --git a/bpmn/pom.xml b/bpmn/pom.xml index f5f448521c..fac5788072 100644 --- a/bpmn/pom.xml +++ b/bpmn/pom.xml @@ -5,7 +5,7 @@ org.onap.so so - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT bpmn BPMN Subsystem diff --git a/bpmn/so-bpmn-building-blocks/pom.xml b/bpmn/so-bpmn-building-blocks/pom.xml index 97fb26af8e..9d598c88dc 100644 --- a/bpmn/so-bpmn-building-blocks/pom.xml +++ b/bpmn/so-bpmn-building-blocks/pom.xml @@ -4,7 +4,7 @@ org.onap.so bpmn - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT 4.0.0 so-bpmn-building-blocks diff --git a/bpmn/so-bpmn-infrastructure-common/pom.xml b/bpmn/so-bpmn-infrastructure-common/pom.xml index 696de6797f..772dfef13c 100644 --- a/bpmn/so-bpmn-infrastructure-common/pom.xml +++ b/bpmn/so-bpmn-infrastructure-common/pom.xml @@ -4,7 +4,7 @@ org.onap.so bpmn - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT 4.0.0 so-bpmn-infrastructure-common diff --git a/bpmn/so-bpmn-infrastructure-flows/pom.xml b/bpmn/so-bpmn-infrastructure-flows/pom.xml index 48d2360442..e148c58e04 100644 --- a/bpmn/so-bpmn-infrastructure-flows/pom.xml +++ b/bpmn/so-bpmn-infrastructure-flows/pom.xml @@ -4,7 +4,7 @@ org.onap.so bpmn - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT 4.0.0 so-bpmn-infrastructure-flows diff --git a/bpmn/so-bpmn-moi/pom.xml b/bpmn/so-bpmn-moi/pom.xml index 5146e2b410..8d7afc2223 100644 --- a/bpmn/so-bpmn-moi/pom.xml +++ b/bpmn/so-bpmn-moi/pom.xml @@ -4,7 +4,7 @@ bpmn org.onap.so - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT 4.0.0 org.onap.so diff --git a/bpmn/so-bpmn-tasks/pom.xml b/bpmn/so-bpmn-tasks/pom.xml index 579c90c94e..07590ec195 100644 --- a/bpmn/so-bpmn-tasks/pom.xml +++ b/bpmn/so-bpmn-tasks/pom.xml @@ -3,7 +3,7 @@ org.onap.so bpmn - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT 4.0.0 so-bpmn-tasks diff --git a/common/pom.xml b/common/pom.xml index bb2ca7b159..a697ba6bef 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ org.onap.so so - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT common common diff --git a/cxf-logging/pom.xml b/cxf-logging/pom.xml index d2ce87ac21..8a1af4a044 100644 --- a/cxf-logging/pom.xml +++ b/cxf-logging/pom.xml @@ -5,7 +5,7 @@ org.onap.so so - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT CXFLogging Common CXF Logging Classes diff --git a/deployment-configs/pom.xml b/deployment-configs/pom.xml index ca2066df45..33dad88b11 100644 --- a/deployment-configs/pom.xml +++ b/deployment-configs/pom.xml @@ -5,7 +5,7 @@ org.onap.so so - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT deployment-configs deployment-configs diff --git a/graph-inventory/aai-client/pom.xml b/graph-inventory/aai-client/pom.xml index fefefa941c..f1ca136c76 100644 --- a/graph-inventory/aai-client/pom.xml +++ b/graph-inventory/aai-client/pom.xml @@ -4,7 +4,7 @@ org.onap.so graph-inventory - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT aai-client diff --git a/graph-inventory/fluent-builder-maven-plugin/pom.xml b/graph-inventory/fluent-builder-maven-plugin/pom.xml index 047edaa07f..3f369a4561 100644 --- a/graph-inventory/fluent-builder-maven-plugin/pom.xml +++ b/graph-inventory/fluent-builder-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.onap.so graph-inventory - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT fluent-builder-maven-plugin maven-plugin diff --git a/graph-inventory/pom.xml b/graph-inventory/pom.xml index 0ec3fd955f..56f561a7e5 100644 --- a/graph-inventory/pom.xml +++ b/graph-inventory/pom.xml @@ -4,7 +4,7 @@ org.onap.so so - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT graph-inventory pom diff --git a/mso-api-handlers/mso-api-handler-common/pom.xml b/mso-api-handlers/mso-api-handler-common/pom.xml index febfaef1f5..946818e8f0 100644 --- a/mso-api-handlers/mso-api-handler-common/pom.xml +++ b/mso-api-handlers/mso-api-handler-common/pom.xml @@ -4,7 +4,7 @@ org.onap.so mso-api-handlers - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT mso-api-handler-common mso-api-handler-common diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml index be58227c7a..5ce6e34411 100644 --- a/mso-api-handlers/mso-api-handler-infra/pom.xml +++ b/mso-api-handlers/mso-api-handler-infra/pom.xml @@ -4,7 +4,7 @@ org.onap.so mso-api-handlers - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT mso-api-handler-infra mso-api-handler-infra diff --git a/mso-api-handlers/mso-requests-db-repositories/pom.xml b/mso-api-handlers/mso-requests-db-repositories/pom.xml index 9055cdec3b..e4c6bd2c14 100644 --- a/mso-api-handlers/mso-requests-db-repositories/pom.xml +++ b/mso-api-handlers/mso-requests-db-repositories/pom.xml @@ -4,7 +4,7 @@ org.onap.so mso-api-handlers - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT mso-requests-db-repositories mso-requests-db-repositories diff --git a/mso-api-handlers/mso-requests-db/pom.xml b/mso-api-handlers/mso-requests-db/pom.xml index 77f03c029e..aa2a487403 100644 --- a/mso-api-handlers/mso-requests-db/pom.xml +++ b/mso-api-handlers/mso-requests-db/pom.xml @@ -4,7 +4,7 @@ org.onap.so mso-api-handlers - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT mso-requests-db mso-requests-db diff --git a/mso-api-handlers/pom.xml b/mso-api-handlers/pom.xml index 7ab0d887c4..a95bb5e476 100644 --- a/mso-api-handlers/pom.xml +++ b/mso-api-handlers/pom.xml @@ -5,7 +5,7 @@ org.onap.so so - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT mso-api-handlers diff --git a/mso-catalog-db/pom.xml b/mso-catalog-db/pom.xml index 89651ece46..496094f9a5 100644 --- a/mso-catalog-db/pom.xml +++ b/mso-catalog-db/pom.xml @@ -4,7 +4,7 @@ org.onap.so so - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT mso-catalog-db diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index d17fc7c396..559148d5dc 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -6,7 +6,7 @@ org.onap.so packages - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT pom diff --git a/packages/pom.xml b/packages/pom.xml index 6c09d2d53f..13553d4afc 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ org.onap.so so - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT packages diff --git a/pom.xml b/pom.xml index 66fc69cc61..32ee48248c 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.onap.so so pom - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT so This Maven project is responsible to build and package all child projects - contributions in the MSO project. This build can be configured to run Functional tests and to start/stop a jboss server + Mysql DB. @@ -67,6 +67,7 @@ 3.4.1 2.1 2.3.7.RELEASE + Hoxton.SR8 2.1.21 false true @@ -880,6 +881,14 @@ 2.4 test + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + @@ -1153,6 +1162,13 @@ import pom + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + diff --git a/so-optimization-clients/pom.xml b/so-optimization-clients/pom.xml index 2abcc656d3..1615491c59 100644 --- a/so-optimization-clients/pom.xml +++ b/so-optimization-clients/pom.xml @@ -3,7 +3,7 @@ org.onap.so so - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT 4.0.0 so-optimization-clients diff --git a/so-sdn-clients/pom.xml b/so-sdn-clients/pom.xml index a580233641..a37cf686c6 100644 --- a/so-sdn-clients/pom.xml +++ b/so-sdn-clients/pom.xml @@ -3,7 +3,7 @@ org.onap.so so - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT 4.0.0 so-sdn-clients diff --git a/so-simulator/pom.xml b/so-simulator/pom.xml index d87d9b0dd9..2cd7a93132 100644 --- a/so-simulator/pom.xml +++ b/so-simulator/pom.xml @@ -5,7 +5,7 @@ org.onap.so so - 1.15.0-SNAPSHOT + 1.15.1-SNAPSHOT 4.0.0 so-simulator diff --git a/version.properties b/version.properties index 19762386fd..f11c43b281 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1 minor=15 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} -- 2.16.6