Skip to content

Commit 4f9317c

Browse files
andrewlockSAY-5
andauthored
Fix typos occured -> occurred (#8473)
## Summary Fix 16 instances of `occured` → `occurred` across 10 files in the tracer, profiler, and shared native libraries. All are log messages, XML doc comments, and inline comments. No logic or API change. Ported from #8472 --------- Signed-off-by: SAY-5 <SAY-5@users.noreply.github.com> Co-authored-by: SAY-5 <SAY-5@users.noreply.github.com>
1 parent 396fec1 commit 4f9317c

10 files changed

Lines changed: 16 additions & 16 deletions

File tree

profiler/src/Demos/Samples.Computer01/OpenLdapCrash.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private void ConnectToLdapServer()
5555
}
5656
catch (Exception e)
5757
{
58-
Console.WriteLine($"[Error] An error occured while trying to connect to the LDAP server `{_serverHostname}:{_serverPort}`. Message: " + e.Message);
58+
Console.WriteLine($"[Error] An error occurred while trying to connect to the LDAP server `{_serverHostname}:{_serverPort}`. Message: " + e.Message);
5959
}
6060
}
6161
}

shared/src/native-src/dynamic_com_library.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ HRESULT datadog::shared::DynamicCOMLibrary::DllGetClassObject(REFCLSID clsid, RE
1717
return _dllGetClassObjectFn(clsid, iid, ptr);
1818
}
1919

20-
_logger->Warn("DynamicCOMLibrary::DllGetClassObject: cannot call to DllGetClassObject. An issue might have occured "
20+
_logger->Warn("DynamicCOMLibrary::DllGetClassObject: cannot call to DllGetClassObject. An issue might have occurred "
2121
"and we were enable to get a pointer to this function");
2222
return E_FAIL;
2323
}
@@ -29,7 +29,7 @@ HRESULT datadog::shared::DynamicCOMLibrary::DllCanUnloadNow()
2929
return _dllCanUnloadNowFn();
3030
}
3131

32-
_logger->Warn("DynamicCOMLibrary::DllCanUnloadNow: cannot call to DllCanUnloadNow. An issue might have occured "
32+
_logger->Warn("DynamicCOMLibrary::DllCanUnloadNow: cannot call to DllCanUnloadNow. An issue might have occurred "
3333
"and we were enable to get a pointer to this function");
3434
return E_FAIL;
3535
}

shared/src/native-src/dynamic_library_base.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ bool DynamicLibraryBase::Unload()
9797
if (_instance == nullptr)
9898
{
9999
_logger->Warn("Unload: Unable to unload dynamic library '", _filePath,
100-
". Reason: An issue occured while loading it. See previous message.");
100+
". Reason: An issue occurred while loading it. See previous message.");
101101
return false;
102102
}
103103

tracer/build/_build/Build.Profiler.Steps.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ private void BuildAndRunProfilerIntegrationTestsInternal(string filter)
381381
finally
382382
{
383383
CopyDumpsTo(ProfilerBuildDataDirectory);
384-
// A crashed occured on linux and the memory dump copy failed due a lack of permission.
384+
// A crashed occurred on linux and the memory dump copy failed due a lack of permission.
385385
Chmod.Value.Invoke("-R 777 " + ProfilerBuildDataDirectory);
386386
}
387387
}

tracer/src/Datadog.Trace.Tools.Shared/ProcessInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public static ProcessInfo GetProcessInfo(int pid)
117117
}
118118
catch (Exception ex)
119119
{
120-
throw new InvalidOperationException($"An error occured while parsing the configuration file {configPath}: {ex.Message}", ex);
120+
throw new InvalidOperationException($"An error occurred while parsing the configuration file {configPath}: {ex.Message}", ex);
121121
}
122122
}
123123

tracer/src/Datadog.Trace/Agent/AgentWriter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ private void SerializeTracesLoop()
592592
}
593593
catch (Exception ex)
594594
{
595-
Log.Error(ex, "An error occured in the serialization thread");
595+
Log.Error(ex, "An error occurred in the serialization thread");
596596
}
597597

598598
if (_processExit.Task.IsCompleted)

tracer/src/Datadog.Trace/AgentProcessManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ private static Task StartProcessWithKeepAlive(ProcessMetadata metadata)
278278
}
279279
catch (Exception ex)
280280
{
281-
Log.Error(ex, "Error occured in keep-alive for {Process}.", path);
281+
Log.Error(ex, "Error occurred in keep-alive for {Process}.", path);
282282
}
283283
finally
284284
{

tracer/src/Datadog.Trace/Telemetry/ITelemetryTransport.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ internal interface ITelemetryTransport
1414
/// </summary>
1515
/// <param name="data">The data to send</param>
1616
/// <returns><c>true</c> if the data was sent successfully, or a non-fatal error occurred
17-
/// <c>false</c> if a fatal error occured, and no further telemetry should be sent.</returns>
17+
/// <c>false</c> if a fatal error occurred, and no further telemetry should be sent.</returns>
1818
Task<TelemetryPushResult> PushTelemetry(TelemetryData data);
1919

2020
string GetTransportInfo();

tracer/src/Datadog.Trace/Util/EnvironmentHelpers.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static void SetEnvironmentVariable(string key, string? value)
4141
/// <summary>
4242
/// Safe wrapper around Environment.MachineName
4343
/// </summary>
44-
/// <returns>The value of <see cref="Environment.MachineName"/>, or null if an error occured</returns>
44+
/// <returns>The value of <see cref="Environment.MachineName"/>, or null if an error occurred</returns>
4545
public static string? GetMachineName()
4646
{
4747
try
@@ -62,7 +62,7 @@ public static void SetEnvironmentVariable(string key, string? value)
6262
/// </summary>
6363
/// <param name="key">Name of the environment variable to fetch</param>
6464
/// <param name="defaultValue">Value to return in case of error</param>
65-
/// <returns>The value of the environment variable, or the default value if an error occured</returns>
65+
/// <returns>The value of the environment variable, or the default value if an error occurred</returns>
6666
public static string? GetEnvironmentVariable(string key, string? defaultValue = null)
6767
{
6868
try
@@ -83,7 +83,7 @@ public static void SetEnvironmentVariable(string key, string? value)
8383
/// <summary>
8484
/// Safe wrapper around Environment.GetEnvironmentVariables
8585
/// </summary>
86-
/// <returns>A dictionary that contains all environment variables or an empty dictionary if an error occured</returns>
86+
/// <returns>A dictionary that contains all environment variables or an empty dictionary if an error occurred</returns>
8787
public static IDictionary GetEnvironmentVariables()
8888
{
8989
try

tracer/src/Datadog.Tracer.Native/cor_profiler.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3573,13 +3573,13 @@ HRESULT CorProfiler::GenerateVoidILStartupMethod(const ModuleID module_id, mdMet
35733573
}
35743574

35753575
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
3576-
// Create a string representing "An error occured in the managed loader: "
3576+
// Create a string representing "An error occurred in the managed loader: "
35773577

35783578
#ifdef _WIN32
3579-
LPCWSTR error_str = L"An error occured in the managed loader: ";
3579+
LPCWSTR error_str = L"An error occurred in the managed loader: ";
35803580
auto error_str_size = wcslen(error_str);
35813581
#else
3582-
char16_t error_str[] = u"An error occured in the managed loader: ";
3582+
char16_t error_str[] = u"An error occurred in the managed loader: ";
35833583
auto error_str_size = std::char_traits<char16_t>::length(error_str);
35843584
#endif
35853585

@@ -3777,7 +3777,7 @@ HRESULT CorProfiler::GenerateVoidILStartupMethod(const ModuleID module_id, mdMet
37773777
// Catch block
37783778
// catch (Exception ex)
37793779
// {
3780-
// var message = "An error occured in the managed loader: " + ex.ToString();
3780+
// var message = "An error occurred in the managed loader: " + ex.ToString();
37813781
// var chars = message.ToCharArray();
37823782
//
37833783
// fixed (char* p = chars)

0 commit comments

Comments
 (0)