1
0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-28 10:52:03 +08:00

Integrate JsonTraceLogFormatter into build system + more.

Where more is:
* Changed the default format to xml, so that all traces don't suddenly
  change as of this commit.  Someone is going to need to start passing a
  flag to all their servers, but let's worry about that later.
* Changed the copyright headers to be the correct filename.
* Include paths should be specified from the root.
This commit is contained in:
Alex Miller 2018-12-13 21:50:51 -08:00
parent 2389cf65f3
commit a5401b834b
4 changed files with 8 additions and 6 deletions

@ -1,5 +1,5 @@
/*
* XmlTraceLogFormatter.h
* JsonTraceLogFormatter.cpp
*
* This source file is part of the FoundationDB open source project
*
@ -19,7 +19,7 @@
*/
#include "flow/flow.h"
#include "JsonTraceLogFormatter.h"
#include "flow/JsonTraceLogFormatter.h"
#include <sstream>

@ -1,5 +1,5 @@
/*
* XmlTraceLogFormatter.h
* JsonTraceLogFormatter.h
*
* This source file is part of the FoundationDB open source project
*
@ -18,8 +18,8 @@
* limitations under the License.
*/
#include "FastRef.h"
#include "Trace.h"
#include "flow/FastRef.h"
#include "flow/Trace.h"
struct JsonTraceLogFormatter : public ITraceLogFormatter, ReferenceCounted<JsonTraceLogFormatter> {
const char* getExtension() override;

@ -123,7 +123,7 @@ FlowKnobs::FlowKnobs(bool randomize, bool isSimulated) {
init( TRACE_EVENT_METRIC_UNITS_PER_SAMPLE, 500 );
init( TRACE_EVENT_THROTTLER_SAMPLE_EXPIRY, 1800.0 ); // 30 mins
init( TRACE_EVENT_THROTTLER_MSG_LIMIT, 20000 );
init( TRACE_FORMAT, "json" );
init( TRACE_FORMAT, "xml" );
//TDMetrics
init( MAX_METRICS, 600 );

@ -20,8 +20,10 @@
<ClCompile Include="FaultInjection.cpp" />
<ClCompile Include="FileTraceLogWriter.cpp" />
<ClCompile Include="XmlTraceLogFormatter.cpp" />
<ClCompile Include="JsonTraceLogFormatter.cpp" />
<ClInclude Include="FileTraceLogWriter.h" />
<ClInclude Include="XmlTraceLogFormatter.h" />
<ClInclude Include="JsonTraceLogFormatter.h" />
<ClInclude Include="MetricSample.h" />
<ClInclude Include="Profiler.h" />
<ActorCompiler Include="Profiler.actor.cpp" />