[MINOR] Add trace switch (#812)

* update some docs Signed-off-by: qqeasonchen <qqeasonchen@gmail.com> * Update java sdk docs (#663) * Add files via upload add pluggable-protocols.png * add trace switch * fix typos * *fix CommonConfigurationTest Co-authored-by: qqeasonchen <qqeasonchen@gmail.com> Co-authored-by: Wenjun Ruan <wenjun@apache.org>
apache · Mar 13, 2022 · 5bc8638 · 5bc8638
1 parent fcfe5ac
commit 5bc8638
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 24 deletions.
diff --git a/docs/en/intro.md b/docs/en/intro.md
@@ -1,17 +1,17 @@
-![logo](../../docs/images/logo2.png)
-## Features
-
-### [SPI](features/spi.md)
-
-### [protocol](instructions/eventmesh-runtime-protocol.md)
-
-### [cloudevents](features/eventmesh-cloudevents-sdk-binding.md)
-
-### [trace](features/eventmesh-trace-design.md)
-
-### [metrics](features/eventmesh-metrics-export-design.md)
-
-### [SchemaRegistry](features/eventmesh-schemaregistry-design.md)
-
-
-### [Workflow](features/eventmesh-workflow-design.md)
+![logo](../../docs/images/logo2.png)
+## Features
+
+### [SPI](features/spi.md)
+
+### [protocol](instructions/eventmesh-runtime-protocol.md)
+
+### [cloudevents](features/eventmesh-cloudevents-sdk-binding.md)
+
+### [trace](features/eventmesh-trace-design.md)
+
+### [metrics](features/eventmesh-metrics-export-design.md)
+
+### [SchemaRegistry](features/eventmesh-schemaregistry-design.md)
+
+
+### [Workflow](features/eventmesh-workflow-design.md)
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java
@@ -47,6 +47,7 @@ public class CommonConfiguration {
     public    String               eventMeshServerIp                  = null;
     public    boolean              eventMeshServerSecurityEnable      = false;
     public    boolean              eventMeshServerRegistryEnable      = false;
+    public    boolean              eventMeshServerTraceEnable         = false;
     protected ConfigurationWrapper configurationWrapper;
 
     public String eventMeshWebhookOrigin = "eventmesh." + eventMeshIDC;
@@ -88,6 +89,7 @@ public void init() {
                     .collect(Collectors.toList());
             }
 
+            eventMeshServerTraceEnable = Boolean.parseBoolean(get(ConfKeys.KEYS_EVENTMESH_TRACE_ENABLED, () -> "false"));
             eventMeshTracePluginType = checkNotEmpty(ConfKeys.KEYS_EVENTMESH_TRACE_PLUGIN_TYPE);
         }
     }
@@ -147,8 +149,10 @@ static class ConfKeys {
 
         public static String KEYS_ENENTMESH_REGISTRY_PLUGIN_TYPE = "eventMesh.registry.plugin.type";
 
-        public static String KEYS_EVENTMESH_METRICS_PLUGIN_TYPE = "eventmesh.metrics.plugin";
+        public static String KEYS_EVENTMESH_METRICS_PLUGIN_TYPE = "eventMesh.metrics.plugin";
 
-        public static String KEYS_EVENTMESH_TRACE_PLUGIN_TYPE = "eventmesh.trace.plugin";
+        public static String KEYS_EVENTMESH_TRACE_ENABLED = "eventMesh.server.trace.enabled";
+
+        public static String KEYS_EVENTMESH_TRACE_PLUGIN_TYPE = "eventMesh.trace.plugin";
     }
 }
diff --git a/eventmesh-common/src/test/resources/configuration.properties b/eventmesh-common/src/test/resources/configuration.properties
@@ -23,4 +23,4 @@ eventMesh.server.hostIp=value6
 eventMesh.connector.plugin.type=rocketmq
 eventMesh.security.plugin.type=acl
 eventMesh.registry.plugin.type=namesrv
-eventmesh.trace.plugin=zipkin
+eventMesh.trace.plugin=zipkin
diff --git a/eventmesh-examples/src/main/java/org/apache/eventmesh/http/demo/sub/service/SubService.java b/eventmesh-examples/src/main/java/org/apache/eventmesh/http/demo/sub/service/SubService.java
@@ -54,7 +54,7 @@ public class SubService implements InitializingBean {
     final Properties properties = Utils.readPropertiesFile(ExampleConstants.CONFIG_FILE_NAME);
 
     final List<SubscriptionItem> topicList = Lists.newArrayList(
-            new SubscriptionItem(ExampleConstants.EVENTMESH_HTTP_SYNC_TEST_TOPIC, SubscriptionMode.CLUSTERING, SubscriptionType.ASYNC)
+            new SubscriptionItem(ExampleConstants.EVENTMESH_HTTP_ASYNC_TEST_TOPIC, SubscriptionMode.CLUSTERING, SubscriptionType.ASYNC)
     );
     final String localIp = IPUtils.getLocalAddress();
     final String localPort = properties.getProperty("server.port");

diff --git a/eventmesh-runtime/conf/eventmesh.properties b/eventmesh-runtime/conf/eventmesh.properties
@@ -82,7 +82,8 @@ eventMesh.server.registry.enabled=false
 eventMesh.registry.plugin.type=namesrv
 
 # metrics plugin, if you have multiple plugin, you can use ',' to split
-eventmesh.metrics.plugin=prometheus
+eventMesh.metrics.plugin=prometheus
 
 # trace plugin
-eventmesh.trace.plugin=zipkin
+eventMesh.server.trace.enabled=false
+eventMesh.trace.plugin=zipkin
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java
@@ -225,7 +225,7 @@ public void init() throws Exception {
         registerHTTPRequestProcessor();
 
         //get the trace-plugin
-        if (StringUtils.isNotEmpty(eventMeshHttpConfiguration.eventMeshTracePluginType)) {
+        if (StringUtils.isNotEmpty(eventMeshHttpConfiguration.eventMeshTracePluginType) && eventMeshHttpConfiguration.eventMeshServerTraceEnable) {
 
             traceService =
                 TracePluginFactory.getTraceService(eventMeshHttpConfiguration.eventMeshTracePluginType);