From c36adcf7eaf09b548ada784cbb97d40f6b9d6519 Mon Sep 17 00:00:00 2001 From: Craig Ringer Date: Fri, 2 Feb 2018 03:03:45 +1300 Subject: [PATCH] Document that the Thrift generated files are patched (#50) Signed-off-by: Craig Ringer --- README.md | 18 ++++++++++++++++++ .../thrift-gen/tracetest_types.cpp | 6 +++--- src/jaegertracing/thrift-gen/tracetest_types.h | 6 +++--- .../thrift-gen/zipkincore_constants.cpp | 6 +++--- .../thrift-gen/zipkincore_constants.h | 6 +++--- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 540aa105..3e415b99 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,24 @@ # cpp-client C++ OpenTracing binding for Jaeger +## Generated files + +This project uses Apache Thrift for wire-format protocol support code +generation. It currently requires exactly Thrift 0.9.2 or 0.9.3. Patches have +been applied to the generated code so it cannot be directly re-generated from +the IDL in the `idl` submodule + +(see https://github.com/jaegertracing/cpp-client/issues/45) + +The code can be re-generated with + + git submodule init + git submodule update + find idl/thrift/ -type f -name \*.thrift -exec thrift -gen cpp -out src/jaegertracing/thrift-gen {} \; + +but at time of writing (Thrift 0.11.0) the resulting code is invalid due to +https://issues.apache.org/jira/browse/THRIFT-4484 + [ci-img]: https://travis-ci.org/jaegertracing/cpp-client.svg?branch=master [ci]: https://travis-ci.org/jaegertracing/cpp-client [cov-img]: https://codecov.io/gh/jaegertracing/cpp-client/branch/master/graph/badge.svg diff --git a/src/jaegertracing/thrift-gen/tracetest_types.cpp b/src/jaegertracing/thrift-gen/tracetest_types.cpp index 38f8650e..206004e0 100644 --- a/src/jaegertracing/thrift-gen/tracetest_types.cpp +++ b/src/jaegertracing/thrift-gen/tracetest_types.cpp @@ -1,8 +1,8 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * MODIFIED from code autogenerated by Thrift Compiler (0.9.2) * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated + * WARNING WARNING WARNING + * This file has been hand-patched. See https://github.com/jaegertracing/cpp-client/issues/45 . */ #include "tracetest_types.h" diff --git a/src/jaegertracing/thrift-gen/tracetest_types.h b/src/jaegertracing/thrift-gen/tracetest_types.h index 24a7a74f..71981c19 100644 --- a/src/jaegertracing/thrift-gen/tracetest_types.h +++ b/src/jaegertracing/thrift-gen/tracetest_types.h @@ -1,8 +1,8 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * MODIFIED from code autogenerated by Thrift Compiler (0.9.2) * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated + * WARNING WARNING WARNING + * This file has been hand-patched. See https://github.com/jaegertracing/cpp-client/issues/45 . */ #ifndef tracetest_TYPES_H #define tracetest_TYPES_H diff --git a/src/jaegertracing/thrift-gen/zipkincore_constants.cpp b/src/jaegertracing/thrift-gen/zipkincore_constants.cpp index 1872dddd..1c0c5704 100644 --- a/src/jaegertracing/thrift-gen/zipkincore_constants.cpp +++ b/src/jaegertracing/thrift-gen/zipkincore_constants.cpp @@ -1,8 +1,8 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * MODIFIED from code autogenerated by Thrift Compiler (0.9.2) * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated + * WARNING WARNING WARNING + * This file has been hand-patched. See https://github.com/jaegertracing/cpp-client/issues/45 . */ #include "zipkincore_constants.h" diff --git a/src/jaegertracing/thrift-gen/zipkincore_constants.h b/src/jaegertracing/thrift-gen/zipkincore_constants.h index 2d0cab3a..4e8084d5 100644 --- a/src/jaegertracing/thrift-gen/zipkincore_constants.h +++ b/src/jaegertracing/thrift-gen/zipkincore_constants.h @@ -1,8 +1,8 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * MODIFIED from code autogenerated by Thrift Compiler (0.9.2) * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated + * WARNING WARNING WARNING + * This file has been hand-patched. See https://github.com/jaegertracing/cpp-client/issues/45 . */ #ifndef zipkincore_CONSTANTS_H #define zipkincore_CONSTANTS_H