Merge "rename metrics as per global constants for prometheus"

diff --cc model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java
index 36df645,685aa0d..1420d1e
--- 1/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java
--- 2/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java
+++ b/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java
@@@ -46,31 -64,53 +47,32 @@@ public class AxEngineStats extends AxCo
      private static final long serialVersionUID = -6981129081962785368L;
      private static final int HASH_CODE_PRIME = 32;
      static final String ENGINE_INSTANCE_ID = "engine_instance_id";
-     static final Gauge ENGINE_EVENTS_EXECUTED_COUNT = Gauge.build().name("apex_engine_events_executed_count")
-             .labelNames(ENGINE_INSTANCE_ID)
-             .help("Total number of APEX events processed by the engine.").register();
-     static final Gauge ENGINE_UPTIME = Gauge.build().name("apex_engine_uptime")
-             .labelNames(ENGINE_INSTANCE_ID)
-             .help("Time elapsed since the engine was started.").register();
-     static final Gauge ENGINE_START_TIMESTAMP = Gauge.build().name("apex_engine_last_start_timestamp_epoch")
-             .labelNames(ENGINE_INSTANCE_ID)
-             .help("Epoch timestamp of the instance when engine was last started.").register();
-     static final Gauge ENGINE_AVG_EXECUTION_TIME = Gauge.build().name("apex_engine_average_execution_time_seconds")
-             .labelNames(ENGINE_INSTANCE_ID)
-             .help("Average time taken to execute an APEX policy in seconds.").register();
+     static final Gauge ENGINE_EVENT_EXECUTIONS = Gauge.build().name("engine_event_executions")
+         .namespace(PrometheusUtils.PdpType.PDPA.getNamespace()).labelNames(ENGINE_INSTANCE_ID)
+         .help("Total number of APEX events processed by the engine.").register();
+     static final Gauge ENGINE_UPTIME = Gauge.build().name("engine_uptime")
+         .namespace(PrometheusUtils.PdpType.PDPA.getNamespace()).labelNames(ENGINE_INSTANCE_ID)
+         .help("Time elapsed since the engine was started.").register();
+     static final Gauge ENGINE_START_TIMESTAMP = Gauge.build().name("engine_last_start_timestamp_epoch")
+         .namespace(PrometheusUtils.PdpType.PDPA.getNamespace()).labelNames(ENGINE_INSTANCE_ID)
+         .help("Epoch timestamp of the instance when engine was last started.").register();
+     static final Gauge ENGINE_AVG_EXECUTION_TIME = Gauge.build().name("engine_average_execution_time_seconds")
+         .namespace(PrometheusUtils.PdpType.PDPA.getNamespace()).labelNames(ENGINE_INSTANCE_ID)
+         .help("Average time taken to execute an APEX policy in seconds.").register();
      static final Histogram ENGINE_LAST_EXECUTION_TIME = Histogram.build()
-             .name("apex_engine_last_execution_time").labelNames(ENGINE_INSTANCE_ID)
-             .help("Time taken to execute the last APEX policy in seconds.").register();
+         .namespace(PrometheusUtils.PdpType.PDPA.getNamespace())
+         .name("engine_last_execution_time").labelNames(ENGINE_INSTANCE_ID)
+         .help("Time taken to execute the last APEX policy in seconds.").register();
  
 -    @EmbeddedId
 -    @XmlElement(name = "key", required = true)
      private AxReferenceKey key;
 -
 -    @Column
 -    @XmlElement(required = true)
      private long timeStamp;
 -
 -    @Column
 -    @XmlElement(required = true)
      private long eventCount;
 -
 -    @Column
 -    @XmlElement(required = true)
      private long lastExecutionTime;
 -
 -    @Column
 -    @XmlElement(required = true)
      private double averageExecutionTime;
 -
 -    @Column
 -    @XmlElement(required = true)
      private long upTime;
  
 -    @Transient
      @Getter
      private transient long lastEnterTime;
 -
 -    @Column
 -    @XmlElement(required = true)
      private long lastStart;
  
      /**