Skip to content

Commit ed60599

Browse files
Revert: Implement process and instance isolation (#4787)
* Revert: Implement process and instance isolation Resolves #4775 - #4775 * Fix broken changelog
1 parent b186caa commit ed60599

21 files changed

+71
-933
lines changed

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
- QOL features for Unity
7676
- The SDK now provides a `IsSessionActive` to allow checking the session state ([#4662](https://github.com/getsentry/sentry-dotnet/pull/4662))
7777
- The SDK now makes use of the new SessionEndStatus `Unhandled` when capturing an unhandled but non-terminal exception, i.e. through the UnobservedTaskExceptionIntegration ([#4633](https://github.com/getsentry/sentry-dotnet/pull/4633), [#4653](https://github.com/getsentry/sentry-dotnet/pull/4653))
78-
- Implemented instance isolation so that multiple instances of the Sentry SDK can be instantiated inside the same process when using the Caching Transport ([#4498](https://github.com/getsentry/sentry-dotnet/pull/4498))
7978
- Extended the App context by `app_memory` that can hold the amount of memory used by the application in bytes. ([#4707](https://github.com/getsentry/sentry-dotnet/pull/4707))
8079
- Add support for W3C traceparent header for outgoing requests ([#4661](https://github.com/getsentry/sentry-dotnet/pull/4661))
8180
- This feature is disabled by default. Set `PropagateTraceparent = true` when initializing the SDK if to include the W3C traceparent header on outgoing requests.

src/Sentry/GlobalSessionManager.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ public GlobalSessionManager(
3333
_clock = clock ?? SystemClock.Clock;
3434
_persistedSessionProvider = persistedSessionProvider
3535
?? (filePath => Json.Load(_options.FileSystem, filePath, PersistedSessionUpdate.FromJson));
36-
_persistenceDirectoryPath = options.GetIsolatedCacheDirectoryPath();
36+
37+
// TODO: session file should really be process-isolated, but we
38+
// don't have a proper mechanism for that right now.
39+
_persistenceDirectoryPath = options.TryGetDsnSpecificCacheDirectoryPath();
3740
}
3841

3942
// Take pause timestamp directly instead of referencing _lastPauseTimestamp to avoid

src/Sentry/Internal/CacheDirectoryCoordinator.cs

Lines changed: 0 additions & 146 deletions
This file was deleted.

src/Sentry/Internal/FileSystemBase.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ namespace Sentry.Internal;
22

33
internal abstract class FileSystemBase : IFileSystem
44
{
5-
public IEnumerable<string> EnumerateDirectories(string path, string searchPattern) =>
6-
Directory.EnumerateDirectories(path, searchPattern);
7-
85
public IEnumerable<string> EnumerateFiles(string path) => Directory.EnumerateFiles(path);
96

107
public IEnumerable<string> EnumerateFiles(string path, string searchPattern) =>
@@ -26,7 +23,6 @@ public IEnumerable<string> EnumerateFiles(string path, string searchPattern, Sea
2623
public abstract bool CreateDirectory(string path);
2724
public abstract bool DeleteDirectory(string path, bool recursive = false);
2825
public abstract bool CreateFileForWriting(string path, out Stream fileStream);
29-
public abstract bool TryCreateLockFile(string path, out Stream fileStream);
3026
public abstract bool WriteAllTextToFile(string path, string contents);
3127
public abstract bool MoveFile(string sourceFileName, string destFileName, bool overwrite = false);
3228
public abstract bool DeleteFile(string path);

0 commit comments

Comments
 (0)