Activate prometheus metrics for perf tests - pom.xml fix

Issue-ID: DCAEGEN2-608
Signed-off-by: Edyta Krukowska <edyta.krukowska@nokia.com>
Change-Id: Iaa0f32e99ab46e8e4646109d15c63513b8a269f4

diff --git a/Changelog.md b/Changelog.md
new file mode 100644 (file)
index 0000000..c750f13
--- /dev/null
+++ b/Changelog.md
@@ -0,0 +1,8 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [1.6.0] - 13/05/2020
+        - [DCAEGEN2-608](https://jira.onap.org/browse/DCAEGEN2-608) - Expose Prometheus API for performance tests

diff --git a/pom.xml b/pom.xml
index e826ea8..3b7280b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   </parent>\r
   <groupId>org.onap.dcaegen2.collectors.ves</groupId>\r
   <artifactId>VESCollector</artifactId>\r
-  <version>1.5.4-SNAPSHOT</version>\r
+  <version>1.6.0-SNAPSHOT</version>\r
   <name>dcaegen2-collectors-ves</name>\r
   <description>VESCollector</description>\r
   <properties>\r
@@ -50,6 +50,8 @@
        ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml\r
     </sonar.coverage.jacoco.xmlReportPaths>\r
     <crypt-password.version>1.3.5</crypt-password.version>\r
+    <micrometer.version>1.4.2</micrometer.version>\r
+    <spring.version>2.2.2.RELEASE</spring.version>\r
   </properties>\r
   <build>\r
     <pluginManagement>\r
@@ -233,6 +235,30 @@
     </plugins>\r
   </build>\r
   <profiles>\r
+    <profile>\r
+      <id>buildForPerfTests</id>\r
+      <activation>\r
+        <activeByDefault>false</activeByDefault>\r
+      </activation>\r
+      <dependencies>\r
+        <!-- Libraries related with performance tests-->\r
+        <dependency>\r
+          <groupId>org.springframework.boot</groupId>\r
+          <artifactId>spring-boot-starter-actuator</artifactId>\r
+          <version>${spring.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+          <groupId>io.micrometer</groupId>\r
+          <artifactId>micrometer-registry-prometheus</artifactId>\r
+          <version>${micrometer.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+          <groupId>io.micrometer</groupId>\r
+          <artifactId>micrometer-core</artifactId>\r
+          <version>${micrometer.version}</version>\r
+        </dependency>\r
+      </dependencies>\r
+    </profile>\r
     <profile>\r
       <id>with-system-proxy</id>\r
       <build>\r
@@ -285,7 +311,7 @@
         <!-- Import dependency management from Spring Boot -->\r
         <groupId>org.springframework.boot</groupId>\r
         <artifactId>spring-boot-dependencies</artifactId>\r
-        <version>2.2.2.RELEASE</version>\r
+        <version>${spring.version}</version>\r
         <type>pom</type>\r
         <scope>import</scope>\r
       </dependency>\r

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
new file mode 100644 (file)
index 0000000..48ba86d
--- /dev/null
+++ b/src/main/resources/application.properties
@@ -0,0 +1,4 @@
+management.endpoint.metrics.enabled=true
+management.endpoints.web.exposure.include=metrics, prometheus
+management.endpoint.prometheus.enabled=true
+management.metrics.export.prometheus.enabled=true

diff --git a/version.properties b/version.properties
index b53fce2..eabef1f 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
-minor=5
-patch=4
+minor=6
+patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT