Browse Source

update bazel for opentelemetry proto files

holmes1412 2 years ago
parent
commit
fb9f830735

+ 18 - 0
BUILD

@@ -19,6 +19,23 @@ cc_proto_library(
     deps = [":message_proto"],
 )
 
+proto_library(
+    name = "module_proto",
+    srcs = [
+        'src/module/opentelemetry_common.proto',
+        'src/module/opentelemetry_resource.proto',
+        'src/module/opentelemetry_trace.proto',
+        'src/module/opentelemetrytrace_service.proto',
+    ],
+    strip_import_prefix = "src/module",
+)
+
+cc_proto_library(
+    name = "ModuleProto",
+    deps = [":module_proto"],
+)
+
+
 cc_library(
     name = 'srpc_hdrs',
     hdrs = glob(['src/include/srpc/*']),
@@ -44,6 +61,7 @@ cc_library(
         '@lz4//:lz4',
         '@snappy//:snappy',
         ':MessageProto',
+        ':ModuleProto',
     ],
     visibility = ["//visibility:public"],
 )

+ 2 - 2
WORKSPACE

@@ -22,11 +22,11 @@ git_repository(
 new_git_repository(
     name = "lz4",
     build_file = "@//third_party:lz4.BUILD",
-    tag = "v1.9.3"
+    tag = "v1.9.3",
     remote = "https://github.com/lz4/lz4.git")
 
 new_git_repository(
     name = "snappy",
     build_file = "@//third_party:snappy.BUILD",
-    tag = "1.1.9"
+    tag = "1.1.9",
     remote = "https://github.com/google/snappy.git")

+ 6 - 1
src/module/CMakeLists.txt

@@ -3,7 +3,12 @@ project(module)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-set(PROTO_LIST common.proto resource.proto trace.proto trace_service.proto)
+set(PROTO_LIST
+	opentelemetry_common.proto
+	opentelemetry_resource.proto
+	opentelemetry_trace.proto
+	opentelemetry_trace_service.proto)
+
 protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${PROTO_LIST})
 
 set(SRC

+ 0 - 0
src/module/common.proto → src/module/opentelemetry_common.proto


+ 1 - 1
src/module/resource.proto → src/module/opentelemetry_resource.proto

@@ -16,7 +16,7 @@ syntax = "proto3";
 
 package opentelemetry.proto.resource.v1;
 
-import "common.proto";
+import "opentelemetry_common.proto";
 
 // Resource information.
 message Resource {

+ 2 - 2
src/module/trace.proto → src/module/opentelemetry_trace.proto

@@ -16,8 +16,8 @@ syntax = "proto3";
 
 package opentelemetry.proto.trace.v1;
 
-import "common.proto";
-import "resource.proto";
+import "opentelemetry_common.proto";
+import "opentelemetry_resource.proto";
 
 // A collection of InstrumentationLibrarySpans from a Resource.
 message ResourceSpans {

+ 1 - 1
src/module/trace_service.proto → src/module/opentelemetry_trace_service.proto

@@ -16,7 +16,7 @@ syntax = "proto3";
 
 package opentelemetry.proto.collector.trace.v1;
 
-import "trace.proto";
+import "opentelemetry_trace.proto";
 
 // Service that can be used to push spans between one Application instrumented with
 // OpenTelemetry and a collector, or between a collector and a central collector (in this

+ 1 - 1
src/module/rpc_span_policies.cc

@@ -3,7 +3,7 @@
 #include "workflow/WFTask.h"
 #include "workflow/HttpUtil.h"
 #include "rpc_span_policies.h"
-#include "trace_service.pb.h"
+#include "opentelemetry_trace_service.pb.h"
 
 namespace srpc
 {