Merge pull request #362 from holmes1412/master

Trace : make RPCTraceOpenTelemetry default path modifiable

WORKSPACE

@@ -18,7 +18,7 @@ rules_proto_toolchains()
 
 git_repository(
     name = "workflow",
-    commit = "3a8c14ce6bf328978d8dca3b3bb29bf5fd02a122",
+    commit = "b08ebcd02e11ea59f158ac34d4b9f4f226d6f326",
     remote = "https://github.com/sogou/workflow.git")
 
 new_git_repository(

src/module/rpc_trace_filter.cc

@@ -346,13 +346,29 @@ RPCTraceOpenTelemetry::RPCTraceOpenTelemetry(const std::string& url) :
 }
 
 RPCTraceOpenTelemetry::RPCTraceOpenTelemetry(const std::string& url,
+											 const std::string& path) :
+	RPCFilter(RPCModuleTypeTrace),
+	url(url + path),
+	redirect_max(OTLP_HTTP_REDIRECT_MAX),
+	retry_max(OTLP_HTTP_RETRY_MAX),
+	filter_policy(SPANS_PER_SECOND_DEFAULT,
+				  RPC_REPORT_THREHOLD_DEFAULT,
+				  RPC_REPORT_INTERVAL_DEFAULT),
+	report_status(false),
+	report_span_count(0)
+{
+	this->report_req = new TracesData;
+}
+
+RPCTraceOpenTelemetry::RPCTraceOpenTelemetry(const std::string& url,
+											 const std::string& path,
 											 int redirect_max,
 											 int retry_max,
 											 size_t spans_per_second,
 											 size_t report_threshold,
 											 size_t report_interval) :
 	RPCFilter(RPCModuleTypeTrace),
-	url(url + OTLP_TRACES_PATH),
+	url(url + path),
 	redirect_max(redirect_max),
 	retry_max(retry_max),
 	filter_policy(spans_per_second, report_threshold, report_interval),

src/module/rpc_trace_filter.h

@@ -277,7 +277,10 @@ private:
 public:
 	RPCTraceOpenTelemetry(const std::string& url);
 
+	RPCTraceOpenTelemetry(const std::string& url, const std::string& path);
+
 	RPCTraceOpenTelemetry(const std::string& url,
+						  const std::string& path,
 						  int redirect_max,
 						  int retry_max,
 						  size_t spans_per_second,

src/rpc_options.h

@@ -53,6 +53,7 @@ struct RPCServerParams : public WFServerParams
 {
 	RPCServerParams() :
 		WFServerParams({
+/*	.transport_type			=	*/	TT_TCP,
 /*	.max_connections		=	*/	2000,
 /*	.peer_response_timeout	=	*/	10 * 1000,
 /*	.receive_timeout		=	*/	-1,

workflow

@@ -1 +1 @@
-Subproject commit 3a8c14ce6bf328978d8dca3b3bb29bf5fd02a122
+Subproject commit b08ebcd02e11ea59f158ac34d4b9f4f226d6f326