Skip to content

Commit 99c9958

Browse files
ajbeamonajbeamon
committed
Some more trace event normalization
1 parent 943dfa2 commit 99c9958

27 files changed

+46
-47
lines changed

‎fdbclient/BackupAgentBase.actor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Version getVersionFromString(std::string const& value) {
6262
Version version(-1);
6363
int n = 0;
6464
if (sscanf(value.c_str(), "%lld%n", (long long*)&version, &n) != 1 || n != value.size()) {
65-
TraceEvent(SevWarnAlways, "getVersionFromString").detail("InvalidVersion", value);
65+
TraceEvent(SevWarnAlways, "GetVersionFromString").detail("InvalidVersion", value);
6666
throw restore_invalid_version();
6767
}
6868
return version;
@@ -430,7 +430,7 @@ ACTOR Future<Void> readCommitted(Database cx, PromiseStream<RCGroup> results, Fu
430430
rcGroup.groupKey = groupKey;
431431
}
432432
else if (rcGroup.groupKey != groupKey) {
433-
//TraceEvent("Log_ReadCommitted").detail("SendGroup0", rcGroup.groupKey).detail("ItemSize", rcGroup.items.size()).detail("Data_length",rcGroup.items[0].value.size());
433+
//TraceEvent("Log_ReadCommitted").detail("SendGroup0", rcGroup.groupKey).detail("ItemSize", rcGroup.items.size()).detail("DataLength",rcGroup.items[0].value.size());
434434
//state uint32_t len(0);
435435
//for (size_t j = 0; j < rcGroup.items.size(); ++j) {
436436
// len += rcGroup.items[j].value.size();

‎fdbclient/ClientLogEvents.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,15 @@ namespace FdbClientLogEvents {
124124

125125
void logEvent(std::string id) const {
126126
for (auto &read_range : req.transaction.read_conflict_ranges) {
127-
TraceEvent("TransactionTrace_Commit_ReadConflictRange").detail("TransactionID", id).detail("Begin", printable(read_range.begin)).detail("End", printable(read_range.end));
127+
TraceEvent("TransactionTrace_CommitReadConflictRange").detail("TransactionID", id).detail("Begin", printable(read_range.begin)).detail("End", printable(read_range.end));
128128
}
129129

130130
for (auto &write_range : req.transaction.write_conflict_ranges) {
131-
TraceEvent("TransactionTrace_Commit_WriteConflictRange").detail("TransactionID", id).detail("Begin", printable(write_range.begin)).detail("End", printable(write_range.end));
131+
TraceEvent("TransactionTrace_CommitWriteConflictRange").detail("TransactionID", id).detail("Begin", printable(write_range.begin)).detail("End", printable(write_range.end));
132132
}
133133

134134
for (auto &mutation : req.transaction.mutations) {
135-
TraceEvent("TransactionTrace_Commit_Mutation").detail("TransactionID", id).detail("Mutation", mutation.toString());
135+
TraceEvent("TransactionTrace_CommitMutation").detail("TransactionID", id).detail("Mutation", mutation.toString());
136136
}
137137

138138
TraceEvent("TransactionTrace_Commit").detail("TransactionID", id).detail("Latency", latency).detail("NumMutations", numMutations).detail("CommitSizeBytes", commitBytes);
@@ -194,15 +194,15 @@ namespace FdbClientLogEvents {
194194

195195
void logEvent(std::string id) const {
196196
for (auto &read_range : req.transaction.read_conflict_ranges) {
197-
TraceEvent("TransactionTrace_CommitError_ReadConflictRange").detail("TransactionID", id).detail("Begin", printable(read_range.begin)).detail("End", printable(read_range.end));
197+
TraceEvent("TransactionTrace_CommitErrorReadConflictRange").detail("TransactionID", id).detail("Begin", printable(read_range.begin)).detail("End", printable(read_range.end));
198198
}
199199

200200
for (auto &write_range : req.transaction.write_conflict_ranges) {
201-
TraceEvent("TransactionTrace_CommitError_WriteConflictRange").detail("TransactionID", id).detail("Begin", printable(write_range.begin)).detail("End", printable(write_range.end));
201+
TraceEvent("TransactionTrace_CommitErrorWriteConflictRange").detail("TransactionID", id).detail("Begin", printable(write_range.begin)).detail("End", printable(write_range.end));
202202
}
203203

204204
for (auto &mutation : req.transaction.mutations) {
205-
TraceEvent("TransactionTrace_CommitError_Mutation").detail("TransactionID", id).detail("Mutation", mutation.toString());
205+
TraceEvent("TransactionTrace_CommitErrorMutation").detail("TransactionID", id).detail("Mutation", mutation.toString());
206206
}
207207

208208
TraceEvent("TransactionTrace_CommitError").detail("TransactionID", id).detail("ErrCode", errCode);

‎fdbclient/DatabaseBackupAgent.actor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ namespace dbBackup {
109109
Future<Void> checkTaskVersion(Tr tr, Reference<Task> task, StringRef name, uint32_t version) {
110110
uint32_t taskVersion = task->getVersion();
111111
if (taskVersion > version) {
112-
TraceEvent(SevError, "BA_BackupRangeTaskFunc_execute").detail("TaskVersion", taskVersion).detail("Name", printable(name)).detail("Version", version);
112+
TraceEvent(SevError, "BA_BackupRangeTaskFuncExecute").detail("TaskVersion", taskVersion).detail("Name", printable(name)).detail("Version", version);
113113
Void _ = wait(logError(tr, Subspace(databaseBackupPrefixRange.begin).get(BackupAgentBase::keyErrors).pack(task->params[BackupAgentBase::keyConfigLogUid]),
114114
format("ERROR: %s task version `%lu' is greater than supported version `%lu'", task->params[Task::reservedTaskParamKeyType].toString().c_str(), (unsigned long)taskVersion, (unsigned long)version)));
115115

@@ -1335,7 +1335,7 @@ namespace dbBackup {
13351335
state Reference<TaskFuture> onDone = futureBucket->unpack(task->params[Task::reservedTaskParamKeyDone]);
13361336

13371337
if (task->params[BackupAgentBase::destUid].size() == 0) {
1338-
TraceEvent("DBA_CopyDiffLogsUpgradeTaskFunc_abort_in_upgrade");
1338+
TraceEvent("DBA_CopyDiffLogsUpgradeTaskFuncAbortInUpgrade");
13391339
Key _ = wait(AbortOldBackupTaskFunc::addTask(tr, taskBucket, task, TaskCompletionKey::signal(onDone)));
13401340
} else {
13411341
Version beginVersion = BinaryReader::fromStringRef<Version>(task->params[DatabaseBackupAgent::keyBeginVersion], Unversioned());

‎fdbclient/FileBackupAgent.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ namespace fileBackup {
705705
if (taskVersion > version) {
706706
state Error err = task_invalid_version();
707707

708-
TraceEvent(SevWarn, "BA_BackupRangeTaskFunc_Execute").detail("TaskVersion", taskVersion).detail("Name", printable(name)).detail("Version", version);
708+
TraceEvent(SevWarn, "BA_BackupRangeTaskFuncExecute").detail("TaskVersion", taskVersion).detail("Name", printable(name)).detail("Version", version);
709709
if (KeyBackedConfig::TaskParams.uid().exists(task)) {
710710
std::string msg = format("%s task version `%lu' is greater than supported version `%lu'", task->params[Task::reservedTaskParamKeyType].toString().c_str(), (unsigned long)taskVersion, (unsigned long)version);
711711
Void _ = wait(BackupConfig(task).logError(cx, err, msg));

‎fdbclient/NativeAPI.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2690,7 +2690,7 @@ ACTOR Future<GetReadVersionReply> getConsistentReadVersion( DatabaseContext *cx,
26902690
}
26912691
} catch (Error& e) {
26922692
if( e.code() != error_code_broken_promise && e.code() != error_code_actor_cancelled )
2693-
TraceEvent(SevError, "getConsistentReadVersionError").error(e);
2693+
TraceEvent(SevError, "GetConsistentReadVersionError").error(e);
26942694
throw;
26952695
}
26962696
}

‎fdbrpc/Platform.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ int eraseDirectoryRecursive(std::string const& dir) {
101101
the directory we're deleting doesn't exist in the first
102102
place */
103103
if (error && errno != ENOENT) {
104-
TraceEvent(SevError, "nftw").detail("Directory", dir).GetLastError();
104+
TraceEvent(SevError, "EraseDirectoryRecursiveError").detail("Directory", dir).GetLastError();
105105
throw platform_error();
106106
}
107107
#else

‎fdbserver/KeyValueStoreSQLite.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,7 @@ void SQLiteDB::createFromScratch() {
13921392
ASSERT( freetable == table+1 );
13931393
endTransaction();
13941394
} else {
1395-
TraceEvent("pgnoRoot").detail("Value", pgnoRoot);
1395+
TraceEvent("PgnoRoot").detail("Value", pgnoRoot);
13961396
checkError("CheckTables", SQLITE_CORRUPT);
13971397
}
13981398
}

‎fdbserver/LogSystem.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ class LogSet : NonCopyable, public ReferenceCounted<LogSet> {
156156
for (auto entry : resultEntries) {
157157
locations.push_back(locationOffset + *logServerMap->getObject(entry));
158158
}
159-
//TraceEvent("getPushLocations").detail("Policy", tLogPolicy->info())
159+
//TraceEvent("GetPushLocations").detail("Policy", tLogPolicy->info())
160160
// .detail("Results", locations.size()).detail("Selection", logServerSet->size())
161161
// .detail("Included", alsoServers.size()).detail("Duration", timer() - t);
162162
}

‎fdbserver/OldTLogServer.actor.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ namespace oldTLog {
843843
if(it->first != currentVersion) {
844844
if (messages.getLength() >= SERVER_KNOBS->DESIRED_TOTAL_BYTES) {
845845
endVersion = it->first;
846-
//TraceEvent("tLogPeekMessagesReached2", self->dbgid);
846+
//TraceEvent("TLogPeekMessagesReached2", self->dbgid);
847847
break;
848848
}
849849

@@ -897,7 +897,7 @@ namespace oldTLog {
897897
return Void();
898898
}
899899

900-
//TraceEvent("tLogPeekMessages0", self->dbgid).detail("ReqBeginEpoch", req.begin.epoch).detail("ReqBeginSeq", req.begin.sequence).detail("Epoch", self->epoch()).detail("PersistentDataSeq", self->persistentDataSequence).detail("Tag1", printable(req.tag1)).detail("Tag2", printable(req.tag2));
900+
//TraceEvent("TLogPeekMessages0", self->dbgid).detail("ReqBeginEpoch", req.begin.epoch).detail("ReqBeginSeq", req.begin.sequence).detail("Epoch", self->epoch()).detail("PersistentDataSeq", self->persistentDataSequence).detail("Tag1", printable(req.tag1)).detail("Tag2", printable(req.tag2));
901901
// Wait until we have something to return that the caller doesn't already have
902902
if( logData->version.get() < req.begin ) {
903903
Void _ = wait( logData->version.whenAtLeast( req.begin ) );
@@ -907,7 +907,7 @@ namespace oldTLog {
907907
state Version endVersion = logData->version.get() + 1;
908908

909909
//grab messages from disk
910-
//TraceEvent("tLogPeekMessages", self->dbgid).detail("ReqBeginEpoch", req.begin.epoch).detail("ReqBeginSeq", req.begin.sequence).detail("Epoch", self->epoch()).detail("PersistentDataSeq", self->persistentDataSequence).detail("Tag1", printable(req.tag1)).detail("Tag2", printable(req.tag2));
910+
//TraceEvent("TLogPeekMessages", self->dbgid).detail("ReqBeginEpoch", req.begin.epoch).detail("ReqBeginSeq", req.begin.sequence).detail("Epoch", self->epoch()).detail("PersistentDataSeq", self->persistentDataSequence).detail("Tag1", printable(req.tag1)).detail("Tag2", printable(req.tag2));
911911
if( req.begin <= logData->persistentDataDurableVersion ) {
912912
// Just in case the durable version changes while we are waiting for the read, we grab this data from memory. We may or may not actually send it depending on
913913
// whether we get enough data from disk.

‎fdbserver/SimulatedCluster.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,7 @@ ACTOR void setupAndRun(std::string dataFolder, const char *testFile, bool reboot
11801180
writeFile(joinPath(clusterFileDir, "fdb.cluster"), connFile.get().toString());
11811181
Void _ = wait(timeoutError(runTests(Reference<ClusterConnectionFile>(new ClusterConnectionFile(joinPath(clusterFileDir, "fdb.cluster"))), TEST_TYPE_FROM_FILE, TEST_ON_TESTERS, testerCount, testFile, startingConfiguration), buggifyActivated ? 36000.0 : 5400.0));
11821182
} catch (Error& e) {
1183-
TraceEvent(SevError, "setupAndRunError").error(e);
1183+
TraceEvent(SevError, "SetupAndRunError").error(e);
11841184
}
11851185

11861186
TraceEvent("SimulatedSystemDestruct");

‎fdbserver/Status.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ struct RolesInfo {
527527
obj["query_queue_max"] = parseInt(extractAttribute(metrics, "QueryQueueMax"));
528528
obj["finished_queries"] = parseCounter(extractAttribute(metrics, "FinishedQueries"));
529529

530-
Version version = parseInt64(extractAttribute(metrics, "version"));
530+
Version version = parseInt64(extractAttribute(metrics, "Version"));
531531
obj["data_version"] = version;
532532

533533
if(maxTLogVersion > 0) {

‎fdbserver/VFSAsync.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ static int asyncSleep(sqlite3_vfs *pVfs, int microseconds){
700700
waitFor( g_network->delay( microseconds*1e-6, TaskDefaultDelay ) || simCancel );
701701
return microseconds;
702702
} catch( Error &e ) {
703-
TraceEvent(SevError, "asyncSleepError").error(e,true);
703+
TraceEvent(SevError, "AsyncSleepError").error(e,true);
704704
return 0;
705705
}
706706
}

‎fdbserver/WaitFailure.actor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ ACTOR Future<Void> waitFailureClient(RequestStream<ReplyPromise<Void>> waitFailu
5050
} catch (Error &e){
5151
if (e.code() == error_code_actor_cancelled)
5252
throw;
53-
TraceEvent(SevError, "waitFailureClientError").error(e);
53+
TraceEvent(SevError, "WaitFailureClientError").error(e);
5454
ASSERT(false); // unknown error from waitFailureServer
5555
}
5656
}
@@ -74,7 +74,7 @@ ACTOR Future<Void> waitFailureTracker(RequestStream<ReplyPromise<Void>> waitFail
7474
} catch (Error &e){
7575
if (e.code() == error_code_actor_cancelled)
7676
throw;
77-
TraceEvent(SevError, "waitFailureClientError").error(e);
77+
TraceEvent(SevError, "WaitFailureClientError").error(e);
7878
ASSERT(false); // unknown error from waitFailureServer
7979
}
8080
}

‎fdbserver/fdbserver.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ ACTOR Future<Void> dumpDatabase( Database cx, std::string outputFilename, KeyRan
538538
}
539539
}
540540
} catch (Error& e) {
541-
TraceEvent(SevError,"dumpDatabaseError").error(e).detail("Filename", outputFilename);
541+
TraceEvent(SevError,"DumpDatabaseError").error(e).detail("Filename", outputFilename);
542542
throw;
543543
}
544544
}

‎fdbserver/storageserver.actor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@ ACTOR Future<GetKeyValuesReply> readRange( StorageServer* data, Version version,
10171017
// all but the last item are less than *pLimitBytes
10181018
ASSERT( result.data.size() == 0 || *pLimitBytes + result.data.end()[-1].expectedSize() + sizeof(KeyValueRef) > 0 );
10191019
/*if (*pLimitBytes <= 0)
1020-
TraceEvent(SevWarn, "readRangeLimitExceeded")
1020+
TraceEvent(SevWarn, "ReadRangeLimitExceeded")
10211021
.detail("Version", version)
10221022
.detail("Begin", printable(range.begin) )
10231023
.detail("End", printable(range.end) )
@@ -2510,7 +2510,7 @@ ACTOR Future<Void> update( StorageServer* data, bool* pReceivedUpdate )
25102510

25112511
//TraceEvent("StorageServerUpdated", data->thisServerID).detail("Ver", ver).detail("DataVersion", data->version.get())
25122512
// .detail("LastTLogVersion", data->lastTLogVersion).detail("NewOldest", updater.newOldestVersion).detail("DesiredOldest",data->desiredOldestVersion.get())
2513-
// .detail("MAX_READ_TRANSACTION_LIFE_VERSIONS", SERVER_KNOBS->MAX_READ_TRANSACTION_LIFE_VERSIONS);
2513+
// .detail("MaxReadTransactionLifeVersions", SERVER_KNOBS->MAX_READ_TRANSACTION_LIFE_VERSIONS);
25142514

25152515
// Trigger updateStorage if necessary
25162516
ASSERT(updater.newOldestVersion <= data->version.get());

‎fdbserver/worker.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ ACTOR Future<Void> workerServer( Reference<ClusterConnectionFile> connFile, Refe
815815
recruited.initEndpoints();
816816

817817
std::map<std::string, std::string> details;
818-
startRole( recruited.id(), interf.id(), "logRouter", details );
818+
startRole( recruited.id(), interf.id(), "LogRouter", details );
819819

820820
DUMPTOKEN( recruited.peekMessages );
821821
DUMPTOKEN( recruited.popMessages );

‎fdbserver/workloads/DDMetrics.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ struct DDMetricsWorkload : TestWorkload {
4040
ACTOR Future<int> getHighPriorityRelocationsInFlight( Database cx, DDMetricsWorkload *self ) {
4141
WorkerInterface masterWorker = wait(getMasterWorker(cx, self->dbInfo));
4242

43-
TraceEvent("getHighPriorityReliocationsInFlight").detail("Database", printable(cx->dbName)).detail("Stage", "ContactingMaster");
43+
TraceEvent("GetHighPriorityReliocationsInFlight").detail("Database", printable(cx->dbName)).detail("Stage", "ContactingMaster");
4444
Standalone<StringRef> md = wait( timeoutError(masterWorker.eventLogRequest.getReply(
4545
EventLogRequest( StringRef( cx->dbName.toString() + "/MovingData" ) ) ), 1.0 ) );
4646
int relocations;

‎fdbserver/workloads/Performance.actor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ struct PerformanceWorkload : TestWorkload {
9595
TraceEvent start("PerformaceSetupStarting");
9696
for(int i = 0; i < options.size(); i++) {
9797
for(int j = 0; j < options[i].size(); j++) {
98-
start.detail(format("option-%d-%d", i, j).c_str(),
98+
start.detail(format("Option-%d-%d", i, j).c_str(),
9999
printable( options[i][j].key ) + "=" + printable( options[i][j].value ) );
100100
}
101101
}
@@ -157,7 +157,7 @@ struct PerformanceWorkload : TestWorkload {
157157
start.detail("RateTarget", tps);
158158
for(int i = 0; i < options.size(); i++) {
159159
for(int j = 0; j < options[i].size(); j++) {
160-
start.detail(format("option-%d-%d", i, j).c_str(),
160+
start.detail(format("Option-%d-%d", i, j).c_str(),
161161
printable( options[i][j].key ) + "=" + printable( options[i][j].value ) );
162162
}
163163
}

‎fdbserver/workloads/StatusWorkload.actor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ struct StatusWorkload : TestWorkload {
109109
}
110110
}
111111
} catch (std::exception& e) {
112-
TraceEvent(SevError,"schemaCoverageRequirementsException").detail("What", e.what());
112+
TraceEvent(SevError,"SchemaCoverageRequirementsException").detail("What", e.what());
113113
throw unknown_error();
114114
} catch (...) {
115-
TraceEvent(SevError,"schemaCoverageRequirementsException");
115+
TraceEvent(SevError,"SchemaCoverageRequirementsException");
116116
throw unknown_error();
117117
}
118118
}

‎fdbserver/workloads/TaskBucketCorrectness.actor.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -271,19 +271,19 @@ struct TaskBucketCorrectnessWorkload : TestWorkload {
271271

272272
Standalone<RangeResultRef> values = wait(tr->getRange(KeyRangeRef(LiteralStringRef("Hello_\x00"), LiteralStringRef("Hello_\xff")), CLIENT_KNOBS->TOO_MANY));
273273
if (values.size() != data.size()){
274-
TraceEvent(SevError, "checkSayHello").detail("CountNotMatch_Is", values.size()).detail("ShouldBe", data.size());
274+
TraceEvent(SevError, "CheckSayHello").detail("CountNotMatchIs", values.size()).detail("ShouldBe", data.size());
275275
for (auto & s : values) {
276-
TraceEvent("checkSayHello").detail("Item", printable(s)).detail("Value", printable(s.value));
276+
TraceEvent("CheckSayHello").detail("Item", printable(s)).detail("Value", printable(s.value));
277277
}
278278
return false;
279279
}
280280

281281
for (auto & s : values) {
282-
// TraceEvent("checkSayHello").detail("Item", printable(s)).detail("Value", printable(s.value));
282+
// TraceEvent("CheckSayHello").detail("Item", printable(s)).detail("Value", printable(s.value));
283283
data.erase(s.value.toString());
284284
}
285285
if (data.size() != 0){
286-
TraceEvent(SevError, "checkSayHello").detail("DataNotMatch", data.size());
286+
TraceEvent(SevError, "CheckSayHello").detail("DataNotMatch", data.size());
287287
return false;
288288
}
289289

‎fdbserver/workloads/WatchAndWait.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ struct WatchAndWaitWorkload : TestWorkload {
125125
}
126126
}
127127
} catch( Error &e ) {
128-
TraceEvent(SevError, "watchAndWaitError").error(e);
128+
TraceEvent(SevError, "WatchAndWaitError").error(e);
129129
throw e;
130130
}
131131
}

‎flow/AsioReactor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class ASIOReactor {
7575
int open() {
7676
fd = eventfd(0, EFD_NONBLOCK);
7777
if (fd<0) {
78-
TraceEvent(SevError, "eventfdError").GetLastError();
78+
TraceEvent(SevError, "EventfdError").GetLastError();
7979
throw platform_error();
8080
}
8181
return fd;

‎flow/DeterministicRandom.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class DeterministicRandom : public IRandom {
3535
uint64_t gen64() {
3636
uint64_t curr = next;
3737
next = (uint64_t(random()) << 32) ^ random();
38-
if (TRACE_SAMPLE()) TraceEvent(SevSample, "random");
38+
if (TRACE_SAMPLE()) TraceEvent(SevSample, "Random");
3939
return curr;
4040
}
4141

‎flow/Net2.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ void Net2::run() {
549549

550550
#ifdef WIN32
551551
if (timeBeginPeriod(1) != TIMERR_NOERROR)
552-
TraceEvent(SevError, "timeBeginPeriodError");
552+
TraceEvent(SevError, "TimeBeginPeriodError");
553553
#endif
554554

555555
timeOffsetLogger = logTimeOffset();

‎flow/Platform.cpp

+3-4
Original file line numberDiff line numberDiff line change
@@ -1741,11 +1741,10 @@ bool createDirectory( std::string const& directory ) {
17411741
if (errno == EEXIST)
17421742
continue;
17431743

1744-
TraceEvent(SevError, "mkdir").detail("Directory", directory).GetLastError();
1744+
TraceEvent(SevError, "CreateDirectory").detail("Directory", directory).GetLastError();
17451745
if (errno == EACCES)
17461746
throw file_not_writable();
17471747
else {
1748-
TraceEvent(SevError, "CreateDirectory").detail("Directory", directory).GetLastError();
17491748
throw platform_error();
17501749
}
17511750
}
@@ -2074,15 +2073,15 @@ void writeFileBytes(std::string const& filename, const uint8_t* data, size_t cou
20742073
FILE* f = fopen(filename.c_str(), "wb");
20752074
if (!f)
20762075
{
2077-
TraceEvent(SevError, "writeFileBytes").detail("Filename", filename).GetLastError();
2076+
TraceEvent(SevError, "WriteFileBytes").detail("Filename", filename).GetLastError();
20782077
throw file_not_writable();
20792078
}
20802079

20812080
try {
20822081
size_t length = fwrite(data, sizeof(uint8_t), count, f);
20832082
if (length != count)
20842083
{
2085-
TraceEvent(SevError, "writeFileBytes").detail("Filename", filename).detail("WrittenLength", length).GetLastError();
2084+
TraceEvent(SevError, "WriteFileBytes").detail("Filename", filename).detail("WrittenLength", length).GetLastError();
20862085
throw file_not_writable();
20872086
}
20882087
}

‎flow/SystemMonitor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ SystemStatistics customSystemMonitor(std::string eventName, StatisticsState *sta
127127

128128
for (int i = 0; i<NetworkMetrics::SLOW_EVENT_BINS; i++)
129129
if (int c = g_network->networkMetrics.countSlowEvents[i] - statState->networkMetricsState.countSlowEvents[i])
130-
n.detail(format("N2_SlowTask%dM", 1 << i).c_str(), c);
130+
n.detail(format("SlowTask%dM", 1 << i).c_str(), c);
131131
for (int i = 0; i<NetworkMetrics::PRIORITY_BINS; i++)
132132
if (double x = g_network->networkMetrics.secSquaredPriorityBlocked[i] - statState->networkMetricsState.secSquaredPriorityBlocked[i])
133-
n.detail(format("N2_S2Pri%d", g_network->networkMetrics.priorityBins[i]).c_str(), x);
133+
n.detail(format("S2Pri%d", g_network->networkMetrics.priorityBins[i]).c_str(), x);
134134
}
135135

136136
if(machineMetrics) {

0 commit comments

Comments
 (0)