From 0383d494c4fd0c97a113359348d5136b641c789f Mon Sep 17 00:00:00 2001
From: Alistair Veitch <aveitch@google.com>
Date: Sun, 26 Jul 2015 15:29:00 -0700
Subject: [PATCH] version 1
---
BUILD | 3 +++
Makefile | 2 ++
build.json | 3 ++-
gRPC.podspec | 3 ++-
include/grpc/census.h | 4 ++--
tools/doxygen/Doxyfile.core.internal | 1 +
tools/run_tests/sources_and_headers.json | 2 ++
vsprojects/grpc/grpc.vcxproj | 2 ++
vsprojects/grpc/grpc.vcxproj.filters | 3 +++
vsprojects/grpc_unsecure/grpc_unsecure.vcxproj | 2 ++
vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters | 3 +++
11 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/BUILD b/BUILD
index a19631e6df..a958922e46 100644
--- a/BUILD
+++ b/BUILD
@@ -383,6 +383,7 @@ cc_library(
"src/core/census/context.c",
"src/core/census/initialize.c",
"src/core/census/record_stat.c",
+ "src/core/census/tracing.c",
],
hdrs = [
"include/grpc/grpc_security.h",
@@ -618,6 +619,7 @@ cc_library(
"src/core/census/context.c",
"src/core/census/initialize.c",
"src/core/census/record_stat.c",
+ "src/core/census/tracing.c",
],
hdrs = [
"include/grpc/byte_buffer.h",
@@ -1101,6 +1103,7 @@ objc_library(
"src/core/census/context.c",
"src/core/census/initialize.c",
"src/core/census/record_stat.c",
+ "src/core/census/tracing.c",
],
hdrs = [
"include/grpc/grpc_security.h",
diff --git a/Makefile b/Makefile
index 996fcfa1fc..65840bb591 100644
--- a/Makefile
+++ b/Makefile
@@ -3615,6 +3615,7 @@ LIBGRPC_SRC = \
src/core/census/context.c \
src/core/census/initialize.c \
src/core/census/record_stat.c \
+ src/core/census/tracing.c \
PUBLIC_HEADERS_C += \
include/grpc/grpc_security.h \
@@ -3880,6 +3881,7 @@ LIBGRPC_UNSECURE_SRC = \
src/core/census/context.c \
src/core/census/initialize.c \
src/core/census/record_stat.c \
+ src/core/census/tracing.c \
PUBLIC_HEADERS_C += \
include/grpc/byte_buffer.h \
diff --git a/build.json b/build.json
index dd633070ff..b053e47ae0 100644
--- a/build.json
+++ b/build.json
@@ -24,7 +24,8 @@
"src": [
"src/core/census/context.c",
"src/core/census/initialize.c",
- "src/core/census/record_stat.c"
+ "src/core/census/record_stat.c",
+ "src/core/census/tracing.c"
]
},
{
diff --git a/gRPC.podspec b/gRPC.podspec
index f47b44fe9d..63394dbd39 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -391,7 +391,8 @@ Pod::Spec.new do |s|
'src/core/transport/transport_op_string.c',
'src/core/census/context.c',
'src/core/census/initialize.c',
- 'src/core/census/record_stat.c'
+ 'src/core/census/record_stat.c',
+ 'src/core/census/tracing.c'
ss.private_header_files = 'src/core/support/env.h',
'src/core/support/file.h',
diff --git a/include/grpc/census.h b/include/grpc/census.h
index 6baad53f15..4c6263ec86 100644
--- a/include/grpc/census.h
+++ b/include/grpc/census.h
@@ -103,8 +103,8 @@ void census_context_destroy(census_context *context);
/* Distributed traces can have a number of options. */
enum census_trace_mask_values {
- CENSUS_TRACE_MASK_NONE = 0, /* Default, empty flags */
- CENSUS_TRACE_MASK_IS_SAMPLED = 1, /* RPC tracing enabled for this context. */
+ CENSUS_TRACE_MASK_NONE = 0, /* Default, empty flags */
+ CENSUS_TRACE_MASK_IS_SAMPLED = 1 /* RPC tracing enabled for this context. */
};
/** Get the current trace mask associated with this context. The value returned
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 3e578c171b..e2c206cfd2 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1018,6 +1018,7 @@ src/core/transport/transport_op_string.c \
src/core/census/context.c \
src/core/census/initialize.c \
src/core/census/record_stat.c \
+src/core/census/tracing.c \
include/grpc/support/alloc.h \
include/grpc/support/atm.h \
include/grpc/support/atm_gcc_atomic.h \
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 84c1099a2a..57665336b3 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -9995,6 +9995,7 @@
"src/core/census/initialize.c",
"src/core/census/record_stat.c",
"src/core/census/rpc_stat_id.h",
+ "src/core/census/tracing.c",
"src/core/channel/census_filter.h",
"src/core/channel/channel_args.c",
"src/core/channel/channel_args.h",
@@ -10442,6 +10443,7 @@
"src/core/census/initialize.c",
"src/core/census/record_stat.c",
"src/core/census/rpc_stat_id.h",
+ "src/core/census/tracing.c",
"src/core/channel/census_filter.h",
"src/core/channel/channel_args.c",
"src/core/channel/channel_args.h",
diff --git a/vsprojects/grpc/grpc.vcxproj b/vsprojects/grpc/grpc.vcxproj
index 744627e388..a826402ed0 100644
--- a/vsprojects/grpc/grpc.vcxproj
+++ b/vsprojects/grpc/grpc.vcxproj
@@ -545,6 +545,8 @@
</ClCompile>
<ClCompile Include="..\..\src\core\census\record_stat.c">
</ClCompile>
+ <ClCompile Include="..\..\src\core\census\tracing.c">
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\gpr\gpr.vcxproj">
diff --git a/vsprojects/grpc/grpc.vcxproj.filters b/vsprojects/grpc/grpc.vcxproj.filters
index 84a7823b2d..f7e163adc9 100644
--- a/vsprojects/grpc/grpc.vcxproj.filters
+++ b/vsprojects/grpc/grpc.vcxproj.filters
@@ -409,6 +409,9 @@
<ClCompile Include="..\..\src\core\census\record_stat.c">
<Filter>src\core\census</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\core\census\tracing.c">
+ <Filter>src\core\census</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\grpc\grpc_security.h">
diff --git a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj
index a5730235fb..7ac0ba89a0 100644
--- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj
+++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj
@@ -480,6 +480,8 @@
</ClCompile>
<ClCompile Include="..\..\src\core\census\record_stat.c">
</ClCompile>
+ <ClCompile Include="..\..\src\core\census\tracing.c">
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\gpr\gpr.vcxproj">
diff --git a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters
index c7790431df..c79a37f059 100644
--- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters
@@ -340,6 +340,9 @@
<ClCompile Include="..\..\src\core\census\record_stat.c">
<Filter>src\core\census</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\core\census\tracing.c">
+ <Filter>src\core\census</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\grpc\byte_buffer.h">
--
GitLab