Skip to content
This repository was archived by the owner on Aug 30, 2022. It is now read-only.

Commit c36adcf

Browse files
ringercisaachier
authored andcommitted
Document that the Thrift generated files are patched (#50)
Signed-off-by: Craig Ringer <[email protected]>
1 parent 2e22904 commit c36adcf

File tree

5 files changed

+30
-12
lines changed

5 files changed

+30
-12
lines changed

README.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,24 @@
33
# cpp-client
44
C++ OpenTracing binding for Jaeger
55

6+
## Generated files
7+
8+
This project uses Apache Thrift for wire-format protocol support code
9+
generation. It currently requires exactly Thrift 0.9.2 or 0.9.3. Patches have
10+
been applied to the generated code so it cannot be directly re-generated from
11+
the IDL in the `idl` submodule
12+
13+
(see https://github.com/jaegertracing/cpp-client/issues/45)
14+
15+
The code can be re-generated with
16+
17+
git submodule init
18+
git submodule update
19+
find idl/thrift/ -type f -name \*.thrift -exec thrift -gen cpp -out src/jaegertracing/thrift-gen {} \;
20+
21+
but at time of writing (Thrift 0.11.0) the resulting code is invalid due to
22+
https://issues.apache.org/jira/browse/THRIFT-4484
23+
624
[ci-img]: https://travis-ci.org/jaegertracing/cpp-client.svg?branch=master
725
[ci]: https://travis-ci.org/jaegertracing/cpp-client
826
[cov-img]: https://codecov.io/gh/jaegertracing/cpp-client/branch/master/graph/badge.svg

src/jaegertracing/thrift-gen/tracetest_types.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
2-
* Autogenerated by Thrift Compiler (0.9.2)
2+
* MODIFIED from code autogenerated by Thrift Compiler (0.9.2)
33
*
4-
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
5-
* @generated
4+
* WARNING WARNING WARNING
5+
* This file has been hand-patched. See https://github.com/jaegertracing/cpp-client/issues/45 .
66
*/
77
#include "tracetest_types.h"
88

src/jaegertracing/thrift-gen/tracetest_types.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
2-
* Autogenerated by Thrift Compiler (0.9.2)
2+
* MODIFIED from code autogenerated by Thrift Compiler (0.9.2)
33
*
4-
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
5-
* @generated
4+
* WARNING WARNING WARNING
5+
* This file has been hand-patched. See https://github.com/jaegertracing/cpp-client/issues/45 .
66
*/
77
#ifndef tracetest_TYPES_H
88
#define tracetest_TYPES_H

src/jaegertracing/thrift-gen/zipkincore_constants.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
2-
* Autogenerated by Thrift Compiler (0.9.2)
2+
* MODIFIED from code autogenerated by Thrift Compiler (0.9.2)
33
*
4-
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
5-
* @generated
4+
* WARNING WARNING WARNING
5+
* This file has been hand-patched. See https://github.com/jaegertracing/cpp-client/issues/45 .
66
*/
77
#include "zipkincore_constants.h"
88

src/jaegertracing/thrift-gen/zipkincore_constants.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
2-
* Autogenerated by Thrift Compiler (0.9.2)
2+
* MODIFIED from code autogenerated by Thrift Compiler (0.9.2)
33
*
4-
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
5-
* @generated
4+
* WARNING WARNING WARNING
5+
* This file has been hand-patched. See https://github.com/jaegertracing/cpp-client/issues/45 .
66
*/
77
#ifndef zipkincore_CONSTANTS_H
88
#define zipkincore_CONSTANTS_H

0 commit comments

Comments
 (0)