-
-
Notifications
You must be signed in to change notification settings - Fork 372
feat(metrics): Add integration with installation by SDK #6956
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
philprime
wants to merge
9
commits into
philprime/metrics
Choose a base branch
from
philprime/metrics-bootstrap
base: philprime/metrics
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
196c9aa
feat(metrics): Add integration with installation by SDK
philprime 81d9980
update changelog
philprime 420d68e
update changelog
philprime dcc65ff
change type of SUT in MetricsIntegrationTests
philprime 46e42f5
Add metrics to TestOptions.removeAllIntegrations
philprime 8dfb9e6
change default value in disableEverything
philprime 1210307
add missing test tear down
philprime e5611fb
Add enableMetrics to public header
philprime d3c3b47
Merge branch 'philprime/metrics' into philprime/metrics-bootstrap
philprime File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
Sources/Swift/Integrations/Metrics/MetricsIntegration.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| final class MetricsIntegration<Dependencies>: NSObject, SwiftIntegration { | ||
| init?(with options: Options, dependencies: Dependencies) { | ||
| guard options.enableMetrics else { return nil } | ||
|
|
||
| SentrySDKLog.debug("Integration initialized") | ||
| } | ||
|
|
||
| func uninstall() {} | ||
|
|
||
| static var name: String { | ||
| "SentryMetricsIntegration" | ||
| } | ||
| } | ||
cursor[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
Tests/SentryTests/Integrations/Metrics/MetricsIntegrationTests.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| import Foundation | ||
| @_spi(Private) @testable import Sentry | ||
| @_spi(Private) import SentryTestUtils | ||
| import XCTest | ||
|
|
||
| class MetricsIntegrationTests: XCTestCase { | ||
|
|
||
| override func tearDown() { | ||
| super.tearDown() | ||
| clearTestState() | ||
| } | ||
|
|
||
| // MARK: - Tests | ||
|
|
||
| func testStartSDK_whenIntegrationIsNotEnabled_shouldNotBeInstalled() { | ||
| // -- Act -- | ||
| startSDK(isEnabled: false) | ||
philprime marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| // -- Assert -- | ||
| XCTAssertEqual(SentrySDKInternal.currentHub().trimmedInstalledIntegrationNames().count, 0) | ||
| } | ||
|
|
||
| func testStartSDK_whenIntegrationIsEnabled_shouldBeInstalled() { | ||
| // -- Act -- | ||
| startSDK(isEnabled: true) | ||
|
|
||
| // -- Assert -- | ||
| XCTAssertEqual(SentrySDKInternal.currentHub().trimmedInstalledIntegrationNames().count, 1) | ||
| } | ||
|
|
||
| // MARK: - Helpers | ||
|
|
||
| private func startSDK(isEnabled: Bool, configure: ((Options) -> Void)? = nil) { | ||
| SentrySDK.start { | ||
| $0.dsn = TestConstants.dsnForTestCase(type: MetricsIntegrationTests.self) | ||
| $0.removeAllIntegrations() | ||
|
|
||
| $0.enableMetrics = isEnabled | ||
|
|
||
| configure?($0) | ||
| } | ||
| SentrySDKInternal.currentHub().startSession() | ||
| } | ||
|
|
||
| private func getSut() throws -> MetricsIntegration<SentryDependencyContainer> { | ||
| return try XCTUnwrap(SentrySDKInternal.currentHub().installedIntegrations().first as? MetricsIntegration) | ||
| } | ||
philprime marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
## 9.1.0.Consider moving the entry to the
## Unreleasedsection, please.