[ISSUE apache#696] Add metrics plugin (apache#709)

1. Add Metrics plugin module 2. Implement opentelemetry metrics module related issue apache#696
xwm1992 · Feb 16, 2022 · 153c52e · 153c52e
1 parent 8442b94
commit 153c52e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/...in/java/org/apache/eventmesh/metrics/opentelemetry/config/OpenTelemetryConfiguration.java b/...in/java/org/apache/eventmesh/metrics/opentelemetry/config/OpenTelemetryConfiguration.java
@@ -17,8 +17,8 @@
 
 package org.apache.eventmesh.metrics.opentelemetry.config;
 
-import org.apache.eventmesh.common.Constants;
 
+import org.apache.eventmesh.common.Constants;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.BufferedReader;
@@ -56,6 +56,7 @@ private void initializeConfig() {
         }
     }
 
+
     /**
      * Load properties file from classpath and conf home.
      * The properties defined in conf home will override classpath.
@@ -70,6 +71,7 @@ private void loadProperties() {
         }
         try {
             String configPath = Constants.EVENTMESH_CONF_HOME + File.separator + CONFIG_FILE;
+
             if (new File(configPath).exists()) {
                 properties.load(new BufferedReader(new FileReader(configPath)));
             }

diff --git a/eventmesh-runtime/build.gradle b/eventmesh-runtime/build.gradle
@@ -52,6 +52,14 @@ dependencies {
     compileOnly 'org.projectlombok:lombok:1.18.22'
     annotationProcessor 'org.projectlombok:lombok:1.18.22'
 
+<<<<<<< HEAD
+=======
+    // for debug only, can be removed
+    implementation project(":eventmesh-protocol-plugin:eventmesh-protocol-cloudevents")
+    implementation project(":eventmesh-protocol-plugin:eventmesh-protocol-meshmessage")
+    implementation project(":eventmesh-protocol-plugin:eventmesh-protocol-openmessage")
+
+>>>>>>> [ISSUE #696] Add metrics plugin (#709)
     implementation project(":eventmesh-metrics-plugin:eventmesh-metrics-api")
     implementation project(":eventmesh-metrics-plugin:eventmesh-metrics-opentelemetry")
 

diff --git a/settings.gradle b/settings.gradle
@@ -44,5 +44,8 @@ include 'eventmesh-metrics-plugin:eventmesh-metrics-opentelemetry'
 include 'eventmesh-protocol-plugin:eventmesh-protocol-grpc'
 include 'eventmesh-protocol-plugin:eventmesh-protocol-grpcmessage'
 findProject(':eventmesh-protocol-plugin:eventmesh-protocol-grpcmessage')?.name = 'eventmesh-protocol-grpcmessage'
+include 'eventmesh-metrics-plugin'
+include 'eventmesh-metrics-plugin:eventmesh-metrics-api'
+include 'eventmesh-metrics-plugin:eventmesh-metrics-opentelemetry'