diff --git a/ANRDemoApp/ANRDemoApp.xcodeproj/project.pbxproj b/ANRDemoApp/ANRDemoApp.xcodeproj/project.pbxproj index e8588b0d..83b58421 100644 --- a/ANRDemoApp/ANRDemoApp.xcodeproj/project.pbxproj +++ b/ANRDemoApp/ANRDemoApp.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 56; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ @@ -15,8 +15,8 @@ 5264EE6E2B76F5F900F25C86 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5264EE692B76F5F900F25C86 /* Preview Assets.xcassets */; }; 5264EE6F2B76F5F900F25C86 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5264EE6A2B76F5F900F25C86 /* ContentView.swift */; }; 5264EE702B76F5F900F25C86 /* ANRDemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5264EE6B2B76F5F900F25C86 /* ANRDemoApp.swift */; }; - 526E2D752B5B4BF300A7CEA4 /* CiscoRUM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 526E2D742B5B4BF300A7CEA4 /* CiscoRUM.framework */; }; - 526E2D762B5B4BF300A7CEA4 /* CiscoRUM.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 526E2D742B5B4BF300A7CEA4 /* CiscoRUM.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 526E2D752B5B4BF300A7CEA4 /* SplunkAgent.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 526E2D742B5B4BF300A7CEA4 /* SplunkAgent.framework */; }; + 526E2D762B5B4BF300A7CEA4 /* SplunkAgent.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 526E2D742B5B4BF300A7CEA4 /* SplunkAgent.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -26,7 +26,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 526E2D762B5B4BF300A7CEA4 /* CiscoRUM.framework in Embed Frameworks */, + 526E2D762B5B4BF300A7CEA4 /* SplunkAgent.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -43,7 +43,7 @@ 5264EE6A2B76F5F900F25C86 /* ContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; 5264EE6B2B76F5F900F25C86 /* ANRDemoApp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ANRDemoApp.swift; sourceTree = ""; }; 526D7E8C2B5A0E8B001183B8 /* ANRDemoApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ANRDemoApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 526E2D742B5B4BF300A7CEA4 /* CiscoRUM.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CiscoRUM.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 526E2D742B5B4BF300A7CEA4 /* SplunkAgent.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SplunkAgent.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -51,7 +51,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 526E2D752B5B4BF300A7CEA4 /* CiscoRUM.framework in Frameworks */, + 526E2D752B5B4BF300A7CEA4 /* SplunkAgent.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -101,7 +101,7 @@ 526E2D732B5B4BF300A7CEA4 /* Frameworks */ = { isa = PBXGroup; children = ( - 526E2D742B5B4BF300A7CEA4 /* CiscoRUM.framework */, + 526E2D742B5B4BF300A7CEA4 /* SplunkAgent.framework */, ); name = Frameworks; sourceTree = ""; @@ -154,7 +154,7 @@ ); mainGroup = 526D7E832B5A0E8B001183B8; packageReferences = ( - 526E2D782B5B4C6300A7CEA4 /* XCLocalSwiftPackageReference "../MRUMANRReporter" */, + 526E2D782B5B4C6300A7CEA4 /* XCLocalSwiftPackageReference "../SplunkANRReporter" */, ); productRefGroup = 526D7E8D2B5A0E8B001183B8 /* Products */; projectDirPath = ""; @@ -321,7 +321,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"ANRDemoApp/Preview Content\""; - DEVELOPMENT_TEAM = CGE964ZX4K; + DEVELOPMENT_TEAM = 9J84E5CFM9; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; @@ -334,7 +334,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.appdynamics.ANRDemoApp; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.ANRDemoApp; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -350,7 +350,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"ANRDemoApp/Preview Content\""; - DEVELOPMENT_TEAM = CGE964ZX4K; + DEVELOPMENT_TEAM = 9J84E5CFM9; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; @@ -363,7 +363,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.appdynamics.ANRDemoApp; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.ANRDemoApp; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -395,9 +395,9 @@ /* End XCConfigurationList section */ /* Begin XCLocalSwiftPackageReference section */ - 526E2D782B5B4C6300A7CEA4 /* XCLocalSwiftPackageReference "../MRUMANRReporter" */ = { + 526E2D782B5B4C6300A7CEA4 /* XCLocalSwiftPackageReference "../SplunkANRReporter" */ = { isa = XCLocalSwiftPackageReference; - relativePath = ../MRUMANRReporter; + relativePath = ../SplunkANRReporter; }; /* End XCLocalSwiftPackageReference section */ }; diff --git a/ANRDemoApp/ANRDemoApp/ANRDemoApp.swift b/ANRDemoApp/ANRDemoApp/ANRDemoApp.swift index 83f6d412..3e54ae86 100644 --- a/ANRDemoApp/ANRDemoApp/ANRDemoApp.swift +++ b/ANRDemoApp/ANRDemoApp/ANRDemoApp.swift @@ -15,13 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -import CiscoRUM -import MRUMANRReporter +import SplunkAgent +import SplunkANRReporter import SwiftUI @main struct ANRDemoApp: App { - @StateObject var agent = CiscoRUMAgent.install(with: + @StateObject var agent = SplunkRum.install(with: Configuration(url: URL(string: "https://smartlookdev2.saas.appd-test.com")!) .appName("smartlook-ios") .appVersion("1.0.0") diff --git a/AgentTestApp/AgentTestApp.xcodeproj/project.pbxproj b/AgentTestApp/AgentTestApp.xcodeproj/project.pbxproj index da6eb36d..4d1a5664 100644 --- a/AgentTestApp/AgentTestApp.xcodeproj/project.pbxproj +++ b/AgentTestApp/AgentTestApp.xcodeproj/project.pbxproj @@ -13,8 +13,8 @@ BA188B212BA0C91B00DACB15 /* Crashes.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA188B1F2BA0C91B00DACB15 /* Crashes.swift */; }; BA338B462B9A610600D2F3B6 /* TestApiCalls.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA338B452B9A610600D2F3B6 /* TestApiCalls.swift */; }; BA338B482B9A612400D2F3B6 /* TestApiCallsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA338B472B9A612400D2F3B6 /* TestApiCallsViewController.swift */; }; - BA4F272C2BA3A37200052600 /* CiscoRUM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BA4F272B2BA3A37200052600 /* CiscoRUM.framework */; }; - BA4F272D2BA3A37200052600 /* CiscoRUM.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BA4F272B2BA3A37200052600 /* CiscoRUM.framework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + BA4F272C2BA3A37200052600 /* SplunkAgent.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BA4F272B2BA3A37200052600 /* SplunkAgent.framework */; }; + BA4F272D2BA3A37200052600 /* SplunkAgent.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BA4F272B2BA3A37200052600 /* SplunkAgent.framework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; BA5E5A442B6859BC0022CEB2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5E5A432B6859BC0022CEB2 /* AppDelegate.swift */; }; BA5E5A462B6859BC0022CEB2 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5E5A452B6859BC0022CEB2 /* SceneDelegate.swift */; }; BA5E5A482B6859BC0022CEB2 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5E5A472B6859BC0022CEB2 /* ViewController.swift */; }; @@ -32,7 +32,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - BA4F272D2BA3A37200052600 /* CiscoRUM.framework in Embed Frameworks */, + BA4F272D2BA3A37200052600 /* SplunkAgent.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -46,7 +46,7 @@ BA188B1F2BA0C91B00DACB15 /* Crashes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Crashes.swift; sourceTree = ""; }; BA338B452B9A610600D2F3B6 /* TestApiCalls.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestApiCalls.swift; sourceTree = ""; }; BA338B472B9A612400D2F3B6 /* TestApiCallsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestApiCallsViewController.swift; sourceTree = ""; }; - BA4F272B2BA3A37200052600 /* CiscoRUM.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CiscoRUM.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BA4F272B2BA3A37200052600 /* SplunkAgent.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SplunkAgent.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BA5E5A402B6859BC0022CEB2 /* AgentTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AgentTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; BA5E5A432B6859BC0022CEB2 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; BA5E5A452B6859BC0022CEB2 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; @@ -64,7 +64,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BA4F272C2BA3A37200052600 /* CiscoRUM.framework in Frameworks */, + BA4F272C2BA3A37200052600 /* SplunkAgent.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -74,7 +74,7 @@ BA4F272A2BA3A37200052600 /* Frameworks */ = { isa = PBXGroup; children = ( - BA4F272B2BA3A37200052600 /* CiscoRUM.framework */, + BA4F272B2BA3A37200052600 /* SplunkAgent.framework */, ); name = Frameworks; sourceTree = ""; @@ -363,7 +363,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9J84E5CFM9; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = AgentTestApp/Info.plist; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; @@ -376,7 +376,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.AppDynamics.AgentTestApp; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.AgentTestApp; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -394,7 +394,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9J84E5CFM9; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = AgentTestApp/Info.plist; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; @@ -407,7 +407,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.AppDynamics.AgentTestApp; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.AgentTestApp; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; diff --git a/AgentTestApp/AgentTestApp/AppDelegate.swift b/AgentTestApp/AgentTestApp/AppDelegate.swift index 0069788f..6b100c93 100644 --- a/AgentTestApp/AgentTestApp/AppDelegate.swift +++ b/AgentTestApp/AgentTestApp/AppDelegate.swift @@ -16,7 +16,7 @@ limitations under the License. */ import UIKit -import CiscoRUM +import SplunkAgent @main class AppDelegate: UIResponder, UIApplicationDelegate { @@ -25,7 +25,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. - var agent = CiscoRUMAgent.install(with: + var agent = SplunkRum.install(with: Configuration(url: URL(string: "https://eum2-c0.saas.appd-test.com")!) .appName("AgentTestApp") .appVersion("1.0.0") diff --git a/AgentTestApp/AgentTestApp/Base.lproj/Main.storyboard b/AgentTestApp/AgentTestApp/Base.lproj/Main.storyboard index da772641..801b4a6d 100644 --- a/AgentTestApp/AgentTestApp/Base.lproj/Main.storyboard +++ b/AgentTestApp/AgentTestApp/Base.lproj/Main.storyboard @@ -24,7 +24,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/AgentTestApp/AgentTestApp/Features/SlowFrameBeatingHeartView.swift b/AgentTestApp/AgentTestApp/Features/SlowFrameBeatingHeartView.swift index 43153334..e90ad877 100644 --- a/AgentTestApp/AgentTestApp/Features/SlowFrameBeatingHeartView.swift +++ b/AgentTestApp/AgentTestApp/Features/SlowFrameBeatingHeartView.swift @@ -1,6 +1,19 @@ // -// MRUM SDK, © 2024 CISCO -// +/* +Copyright 2024 Splunk Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ import UIKit diff --git a/AgentTestApp/AgentTestApp/Features/SlowFrameDetectorViewController.swift b/AgentTestApp/AgentTestApp/Features/SlowFrameDetectorViewController.swift index a00e9f82..98c48e74 100644 --- a/AgentTestApp/AgentTestApp/Features/SlowFrameDetectorViewController.swift +++ b/AgentTestApp/AgentTestApp/Features/SlowFrameDetectorViewController.swift @@ -1,6 +1,19 @@ // -// MRUM SDK, © 2024 CISCO -// +/* +Copyright 2024 Splunk Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ import SwiftUI import UIKit diff --git a/DevelApp/DevelApp.xcodeproj/project.pbxproj b/DevelApp/DevelApp.xcodeproj/project.pbxproj index 1adb001a..7efbc400 100644 --- a/DevelApp/DevelApp.xcodeproj/project.pbxproj +++ b/DevelApp/DevelApp.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ - 2A3A86852B56ACC00020CE80 /* CiscoRUM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A3A86842B56ACC00020CE80 /* CiscoRUM.framework */; }; - 2A3A86862B56ACC00020CE80 /* CiscoRUM.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 2A3A86842B56ACC00020CE80 /* CiscoRUM.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 2A3A86852B56ACC00020CE80 /* SplunkAgent.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A3A86842B56ACC00020CE80 /* SplunkAgent.framework */; }; + 2A3A86862B56ACC00020CE80 /* SplunkAgent.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 2A3A86842B56ACC00020CE80 /* SplunkAgent.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3384F28A2AC8795800512D79 /* DevelAppApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3384F2892AC8795800512D79 /* DevelAppApp.swift */; }; 3384F28C2AC8795800512D79 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3384F28B2AC8795800512D79 /* ContentView.swift */; }; 3384F28E2AC8795800512D79 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3384F28D2AC8795800512D79 /* Assets.xcassets */; }; @@ -22,7 +22,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 2A3A86862B56ACC00020CE80 /* CiscoRUM.framework in Embed Frameworks */, + 2A3A86862B56ACC00020CE80 /* SplunkAgent.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -30,7 +30,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 2A3A86842B56ACC00020CE80 /* CiscoRUM.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CiscoRUM.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 2A3A86842B56ACC00020CE80 /* SplunkAgent.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SplunkAgent.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3384F2862AC8795800512D79 /* DevelApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DevelApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; 3384F2892AC8795800512D79 /* DevelAppApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DevelAppApp.swift; sourceTree = ""; }; 3384F28B2AC8795800512D79 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; @@ -45,7 +45,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2A3A86852B56ACC00020CE80 /* CiscoRUM.framework in Frameworks */, + 2A3A86852B56ACC00020CE80 /* SplunkAgent.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -93,7 +93,7 @@ 3384F2AF2AC87A4300512D79 /* Frameworks */ = { isa = PBXGroup; children = ( - 2A3A86842B56ACC00020CE80 /* CiscoRUM.framework */, + 2A3A86842B56ACC00020CE80 /* SplunkAgent.framework */, ); name = Frameworks; sourceTree = ""; @@ -301,7 +301,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"DevelApp/Preview Content\""; - DEVELOPMENT_TEAM = CGE964ZX4K; + DEVELOPMENT_TEAM = 9J84E5CFM9; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; @@ -321,7 +321,7 @@ "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 13.5; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.appdynamics.DevelApp; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.DevelApp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator xros xrsimulator"; @@ -345,7 +345,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"DevelApp/Preview Content\""; - DEVELOPMENT_TEAM = CGE964ZX4K; + DEVELOPMENT_TEAM = 9J84E5CFM9; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; @@ -365,7 +365,7 @@ "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 13.5; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.appdynamics.DevelApp; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.DevelApp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator xros xrsimulator"; diff --git a/DevelApp/DevelApp/ContentView.swift b/DevelApp/DevelApp/ContentView.swift index bbc829de..e1d51fa7 100644 --- a/DevelApp/DevelApp/ContentView.swift +++ b/DevelApp/DevelApp/ContentView.swift @@ -6,25 +6,25 @@ // import SwiftUI -import CiscoRUM +import SplunkAgent struct ContentView: View { // MARK: - Versions - let agentVersion = CiscoRUMAgent.version - let agentAppVersion = CiscoRUMAgent.instance?.state.appVersion ?? "nil" + let agentVersion = SplunkRum.version + let agentAppVersion = SplunkRum.instance?.state.appVersion ?? "nil" // MARK: - Identifiers - let userId = CiscoRUMAgent.instance?.user.identifier ?? "nil" - @State private var sessionId = CiscoRUMAgent.instance?.session.currentSessionId ?? "nil" - @State private var agentStatus = CiscoRUMAgent.instance?.state.status ?? .notRunning(.notEnabled) + let userId = SplunkRum.instance?.user.identifier ?? "nil" + @State private var sessionId = SplunkRum.instance?.session.currentSessionId ?? "nil" + @State private var agentStatus = SplunkRum.instance?.state.status ?? .notRunning(.notEnabled) let sessionPublisher = NotificationCenter.default .publisher( - for: NSNotification.Name("com.cisco.mrum.session-did-reset") + for: NSNotification.Name("com.splunk.rum.session-did-reset") ) .receive(on: DispatchQueue.main) diff --git a/DevelApp/DevelApp/DevelAppApp.swift b/DevelApp/DevelApp/DevelAppApp.swift index accf5d13..b5ba6d57 100644 --- a/DevelApp/DevelApp/DevelAppApp.swift +++ b/DevelApp/DevelApp/DevelAppApp.swift @@ -6,11 +6,11 @@ // import SwiftUI -import CiscoRUM +import SplunkAgent @main struct DevelAppApp: App { - @StateObject var agent = CiscoRUMAgent.install(with: + @StateObject var agent = SplunkRum.install(with: Configuration(url: vanityUrl()) .appName("smartlook-ios") .appVersion("1.0.0") diff --git a/MRUMANRReporter/.swiftpm/xcode/xcshareddata/xcschemes/MRUMANRReporter.xcscheme b/MRUMANRReporter/.swiftpm/xcode/xcshareddata/xcschemes/MRUMANRReporter.xcscheme deleted file mode 100644 index ae3c4061..00000000 --- a/MRUMANRReporter/.swiftpm/xcode/xcshareddata/xcschemes/MRUMANRReporter.xcscheme +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MRUMANRReporter/Package.swift b/MRUMANRReporter/Package.swift deleted file mode 100644 index db7cbaae..00000000 --- a/MRUMANRReporter/Package.swift +++ /dev/null @@ -1,29 +0,0 @@ -// swift-tools-version: 5.9 - -import PackageDescription - -let package = Package( - name: "MRUMANRReporter", - platforms: [ - .iOS(.v13), - .tvOS(.v13) - ], - products: [ - .library( - name: "MRUMANRReporter", - targets: ["MRUMANRReporter"]) - ], - dependencies: [ - .package(name: "MRUMSharedProtocols", path: "../MRUMSharedProtocols") - ], - targets: [ - .target( - name: "MRUMANRReporter", - dependencies: [ - "MRUMSharedProtocols" - ]), - .testTarget( - name: "MRUMANRReporterTests", - dependencies: ["MRUMANRReporter"]) - ] -) diff --git a/MRUMAgent/Configurations/Debug-mh_dylib.xcconfig b/MRUMAgent/Configurations/Debug-mh_dylib.xcconfig deleted file mode 100644 index 77bfd406..00000000 --- a/MRUMAgent/Configurations/Debug-mh_dylib.xcconfig +++ /dev/null @@ -1,5 +0,0 @@ -// -// MRUM SDK, © 2024 CISCO -// - -MACH_O_TYPE=mh_dylib diff --git a/MRUMAgent/Configurations/Debug-staticlib.xcconfig b/MRUMAgent/Configurations/Debug-staticlib.xcconfig deleted file mode 100644 index 833e5168..00000000 --- a/MRUMAgent/Configurations/Debug-staticlib.xcconfig +++ /dev/null @@ -1,5 +0,0 @@ -// -// MRUM SDK, © 2024 CISCO -// - -MACH_O_TYPE=staticlib diff --git a/MRUMAgent/Configurations/Release-mh_dylib.xcconfig b/MRUMAgent/Configurations/Release-mh_dylib.xcconfig deleted file mode 100644 index 77bfd406..00000000 --- a/MRUMAgent/Configurations/Release-mh_dylib.xcconfig +++ /dev/null @@ -1,5 +0,0 @@ -// -// MRUM SDK, © 2024 CISCO -// - -MACH_O_TYPE=mh_dylib diff --git a/MRUMAgent/Configurations/Release-staticlib.xcconfig b/MRUMAgent/Configurations/Release-staticlib.xcconfig deleted file mode 100644 index 833e5168..00000000 --- a/MRUMAgent/Configurations/Release-staticlib.xcconfig +++ /dev/null @@ -1,5 +0,0 @@ -// -// MRUM SDK, © 2024 CISCO -// - -MACH_O_TYPE=staticlib diff --git a/MRUMCrashReports/.swiftpm/xcode/xcshareddata/xcschemes/MRUMCrashReports.xcscheme b/MRUMCrashReports/.swiftpm/xcode/xcshareddata/xcschemes/MRUMCrashReports.xcscheme deleted file mode 100644 index 443083fb..00000000 --- a/MRUMCrashReports/.swiftpm/xcode/xcshareddata/xcschemes/MRUMCrashReports.xcscheme +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MRUMLogger/.swiftpm/xcode/xcshareddata/xcschemes/MRUMLogger.xcscheme b/MRUMLogger/.swiftpm/xcode/xcshareddata/xcschemes/MRUMLogger.xcscheme deleted file mode 100644 index 2ea3ac34..00000000 --- a/MRUMLogger/.swiftpm/xcode/xcshareddata/xcschemes/MRUMLogger.xcscheme +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MRUMNetwork/.swiftpm/xcode/xcshareddata/xcschemes/MRUMNetwork.xcscheme b/MRUMNetwork/.swiftpm/xcode/xcshareddata/xcschemes/MRUMNetwork.xcscheme deleted file mode 100644 index 29d81a15..00000000 --- a/MRUMNetwork/.swiftpm/xcode/xcshareddata/xcschemes/MRUMNetwork.xcscheme +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MRUMOTel/.swiftpm/xcode/xcshareddata/xcschemes/MRUMOTel.xcscheme b/MRUMOTel/.swiftpm/xcode/xcshareddata/xcschemes/MRUMOTel.xcscheme deleted file mode 100644 index 9e03d01e..00000000 --- a/MRUMOTel/.swiftpm/xcode/xcshareddata/xcschemes/MRUMOTel.xcscheme +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MRUMOTel/Sources/MRUMOTel/API/ApiPaths.swift b/MRUMOTel/Sources/MRUMOTel/API/ApiPaths.swift deleted file mode 100644 index b86d6b13..00000000 --- a/MRUMOTel/Sources/MRUMOTel/API/ApiPaths.swift +++ /dev/null @@ -1,10 +0,0 @@ -// -// MRUM SDK, © 2024 CISCO -// - -import Foundation - -enum ApiPaths: String { - case logs = "eum/v1/logs" - case traces = "eum/v1/traces" -} diff --git a/MRUMOTelBackgroundExporter/.swiftpm/xcode/xcshareddata/xcschemes/MRUMOTelBackgroundExporter.xcscheme b/MRUMOTelBackgroundExporter/.swiftpm/xcode/xcshareddata/xcschemes/MRUMOTelBackgroundExporter.xcscheme deleted file mode 100644 index fe08268e..00000000 --- a/MRUMOTelBackgroundExporter/.swiftpm/xcode/xcshareddata/xcschemes/MRUMOTelBackgroundExporter.xcscheme +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MRUMSessionReplayProxy/Tests/MRUMSessionReplayProxyTests/MRUMSessionReplayProxyTests.swift b/MRUMSessionReplayProxy/Tests/MRUMSessionReplayProxyTests/MRUMSessionReplayProxyTests.swift deleted file mode 100644 index f88a5a51..00000000 --- a/MRUMSessionReplayProxy/Tests/MRUMSessionReplayProxyTests/MRUMSessionReplayProxyTests.swift +++ /dev/null @@ -1,12 +0,0 @@ -@testable import MRUMSessionReplayProxy -import XCTest - -final class MRUMSessionReplayProxyTests: XCTestCase { - func testExample() throws { - // XCTest Documentation - // https://developer.apple.com/documentation/xctest - - // Defining Test Cases and Test Methods - // https://developer.apple.com/documentation/xctest/defining_test_cases_and_test_methods - } -} diff --git a/MRUMSlowFrameDetector/Package.swift b/MRUMSlowFrameDetector/Package.swift deleted file mode 100644 index ec87f094..00000000 --- a/MRUMSlowFrameDetector/Package.swift +++ /dev/null @@ -1,40 +0,0 @@ -// swift-tools-version: 5.9 - -import PackageDescription - -let package = Package( - name: "MRUMSlowFrameDetector", - platforms: [ - .iOS(.v13), - .tvOS(.v13) - ], - products: [ - .library( - name: "MRUMSlowFrameDetector", - targets: [ - "MRUMSlowFrameDetector" - ] - ) - ], - dependencies: [ - .package(name: "MRUMSharedProtocols", - path: "../MRUMSharedProtocols"), - .package(name: "MRUMOTel", - path: "../MRUMOTel") - ], - targets: [ - .target( - name: "MRUMSlowFrameDetector", - dependencies: [ - .product(name: "MRUMSharedProtocols", - package: "MRUMSharedProtocols"), - .product(name: "MRUMOTel", - package: "MRUMOTel") - ] - ), - .testTarget( - name: "MRUMSlowFrameDetectorTests", - dependencies: ["MRUMSlowFrameDetector"] - ) - ] -) diff --git a/MRUMSlowFrameDetector/Tests/MRUMSlowFrameDetectorTests/MRUMSlowFrameDetectorTests.swift b/MRUMSlowFrameDetector/Tests/MRUMSlowFrameDetectorTests/MRUMSlowFrameDetectorTests.swift deleted file mode 100644 index 74e85290..00000000 --- a/MRUMSlowFrameDetector/Tests/MRUMSlowFrameDetectorTests/MRUMSlowFrameDetectorTests.swift +++ /dev/null @@ -1,12 +0,0 @@ -@testable import MRUMSlowFrameDetector -import XCTest - -final class MRUMSlowFrameDetectorTests: XCTestCase { - func testExample() throws { - // XCTest Documentation - // https://developer.apple.com/documentation/xctest - - // Defining Test Cases and Test Methods - // https://developer.apple.com/documentation/xctest/defining_test_cases_and_test_methods - } -} diff --git a/MRUM.xcworkspace/contents.xcworkspacedata b/Splunk.xcworkspace/contents.xcworkspacedata similarity index 59% rename from MRUM.xcworkspace/contents.xcworkspacedata rename to Splunk.xcworkspace/contents.xcworkspacedata index 7e46a0b0..90c549bd 100644 --- a/MRUM.xcworkspace/contents.xcworkspacedata +++ b/Splunk.xcworkspace/contents.xcworkspacedata @@ -11,37 +11,37 @@ location = "group:DevelApp/DevelApp.xcodeproj"> + location = "group:SplunkAgent/SplunkAgent.xcodeproj"> + location = "group:SplunkSharedProtocols"> + location = "group:SplunkCrashReports"> + location = "group:SplunkSessionReplayProxy"> + location = "group:SplunkNetwork"> + location = "group:SplunkOpenTelemetry"> + location = "group:SplunkLogger"> + location = "group:SplunkOpenTelemetryBackgroundExporter"> + location = "group:SplunkANRReporter"> + location = "group:SplunkSlowFrameDetector"> diff --git a/MRUM.xcworkspace/xcshareddata/IDETemplateMacros.plist b/Splunk.xcworkspace/xcshareddata/IDETemplateMacros.plist similarity index 100% rename from MRUM.xcworkspace/xcshareddata/IDETemplateMacros.plist rename to Splunk.xcworkspace/xcshareddata/IDETemplateMacros.plist diff --git a/MRUM.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Splunk.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from MRUM.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to Splunk.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/MRUM.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Splunk.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from MRUM.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to Splunk.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/MRUM.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Splunk.xcworkspace/xcshareddata/swiftpm/Package.resolved similarity index 100% rename from MRUM.xcworkspace/xcshareddata/swiftpm/Package.resolved rename to Splunk.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/MRUMANRReporter/.gitignore b/SplunkANRReporter/.gitignore similarity index 100% rename from MRUMANRReporter/.gitignore rename to SplunkANRReporter/.gitignore diff --git a/SplunkANRReporter/Package.swift b/SplunkANRReporter/Package.swift new file mode 100644 index 00000000..cc69f0d3 --- /dev/null +++ b/SplunkANRReporter/Package.swift @@ -0,0 +1,29 @@ +// swift-tools-version: 5.9 + +import PackageDescription + +let package = Package( + name: "SplunkANRReporter", + platforms: [ + .iOS(.v13), + .tvOS(.v13) + ], + products: [ + .library( + name: "SplunkANRReporter", + targets: ["SplunkANRReporter"]) + ], + dependencies: [ + .package(name: "SplunkSharedProtocols", path: "../SplunkSharedProtocols") + ], + targets: [ + .target( + name: "SplunkANRReporter", + dependencies: [ + "SplunkSharedProtocols" + ]), + .testTarget( + name: "SplunkANRReporterTests", + dependencies: ["SplunkANRReporter"]) + ] +) diff --git a/MRUMANRReporter/Sources/MRUMANRReporter/ANRReporter+Module.swift b/SplunkANRReporter/Sources/SplunkANRReporter/ANRReporter+Module.swift similarity index 98% rename from MRUMANRReporter/Sources/MRUMANRReporter/ANRReporter+Module.swift rename to SplunkANRReporter/Sources/SplunkANRReporter/ANRReporter+Module.swift index b6976e51..dea3739c 100644 --- a/MRUMANRReporter/Sources/MRUMANRReporter/ANRReporter+Module.swift +++ b/SplunkANRReporter/Sources/SplunkANRReporter/ANRReporter+Module.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols // `Data` can be used as an event type that the module produces. extension Data: ModuleEventData {} diff --git a/MRUMANRReporter/Sources/MRUMANRReporter/ANRReporter.swift b/SplunkANRReporter/Sources/SplunkANRReporter/ANRReporter.swift similarity index 98% rename from MRUMANRReporter/Sources/MRUMANRReporter/ANRReporter.swift rename to SplunkANRReporter/Sources/SplunkANRReporter/ANRReporter.swift index c897f558..c4af95f0 100644 --- a/MRUMANRReporter/Sources/MRUMANRReporter/ANRReporter.swift +++ b/SplunkANRReporter/Sources/SplunkANRReporter/ANRReporter.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols final public class ANRReporter { @@ -25,7 +25,7 @@ final public class ANRReporter { // MARK: - Private properties private let tuning = ANRTunableValues() - private let detectionQueue = DispatchQueue(label: "com.cisco.mrum.anr.background", qos: .background) + private let detectionQueue = DispatchQueue(label: "com.splunk.rum.anr.background", qos: .background) private var config: ANRReporterConfiguration = ANRReporterConfiguration(enabled: true) private var isMainThreadResponsive: Bool = false private var heartbeatTimer: Timer? diff --git a/MRUMANRReporter/Sources/MRUMANRReporter/ANRReporterConfiguration.swift b/SplunkANRReporter/Sources/SplunkANRReporter/ANRReporterConfiguration.swift similarity index 96% rename from MRUMANRReporter/Sources/MRUMANRReporter/ANRReporterConfiguration.swift rename to SplunkANRReporter/Sources/SplunkANRReporter/ANRReporterConfiguration.swift index 57b21822..fdf50053 100644 --- a/MRUMANRReporter/Sources/MRUMANRReporter/ANRReporterConfiguration.swift +++ b/SplunkANRReporter/Sources/SplunkANRReporter/ANRReporterConfiguration.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols public struct ANRReporterConfiguration: ModuleConfiguration { diff --git a/MRUMANRReporter/Sources/MRUMANRReporter/ANRReporterRemoteConfiguration.swift b/SplunkANRReporter/Sources/SplunkANRReporter/ANRReporterRemoteConfiguration.swift similarity index 96% rename from MRUMANRReporter/Sources/MRUMANRReporter/ANRReporterRemoteConfiguration.swift rename to SplunkANRReporter/Sources/SplunkANRReporter/ANRReporterRemoteConfiguration.swift index 9c090981..d9808a5e 100644 --- a/MRUMANRReporter/Sources/MRUMANRReporter/ANRReporterRemoteConfiguration.swift +++ b/SplunkANRReporter/Sources/SplunkANRReporter/ANRReporterRemoteConfiguration.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols public struct ANRReporterRemoteConfiguration: RemoteModuleConfiguration { diff --git a/MRUMANRReporter/Sources/MRUMANRReporter/ANRTunableValues.swift b/SplunkANRReporter/Sources/SplunkANRReporter/ANRTunableValues.swift similarity index 100% rename from MRUMANRReporter/Sources/MRUMANRReporter/ANRTunableValues.swift rename to SplunkANRReporter/Sources/SplunkANRReporter/ANRTunableValues.swift diff --git a/MRUMANRReporter/Sources/MRUMANRReporter/EventMetadataANR.swift b/SplunkANRReporter/Sources/SplunkANRReporter/EventMetadataANR.swift similarity index 100% rename from MRUMANRReporter/Sources/MRUMANRReporter/EventMetadataANR.swift rename to SplunkANRReporter/Sources/SplunkANRReporter/EventMetadataANR.swift diff --git a/MRUMCrashReports/Tests/MRUMCrashReportsTests/MRUMCrashReportsTests.swift b/SplunkANRReporter/Tests/SplunkANRReporterTests/SplunkANRReporterTests.swift similarity index 77% rename from MRUMCrashReports/Tests/MRUMCrashReportsTests/MRUMCrashReportsTests.swift rename to SplunkANRReporter/Tests/SplunkANRReporterTests/SplunkANRReporterTests.swift index 9895e016..f339309c 100644 --- a/MRUMCrashReports/Tests/MRUMCrashReportsTests/MRUMCrashReportsTests.swift +++ b/SplunkANRReporter/Tests/SplunkANRReporterTests/SplunkANRReporterTests.swift @@ -1,7 +1,7 @@ import XCTest -@testable import MRUMCrashReports +@testable import SplunkANRReporter -final class MRUMCrashReportsTests: XCTestCase { +final class SplunkANRReporterTests: XCTestCase { func testExample() throws { // XCTest Documentation // https://developer.apple.com/documentation/xctest diff --git a/SplunkAgent/Configurations/Debug-mh_dylib.xcconfig b/SplunkAgent/Configurations/Debug-mh_dylib.xcconfig new file mode 100644 index 00000000..3f546c0e --- /dev/null +++ b/SplunkAgent/Configurations/Debug-mh_dylib.xcconfig @@ -0,0 +1,16 @@ +// +// Copyright 2024 Splunk Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +MACH_O_TYPE=mh_dylib diff --git a/SplunkAgent/Configurations/Debug-staticlib.xcconfig b/SplunkAgent/Configurations/Debug-staticlib.xcconfig new file mode 100644 index 00000000..be862fe0 --- /dev/null +++ b/SplunkAgent/Configurations/Debug-staticlib.xcconfig @@ -0,0 +1,15 @@ +// +// Copyright 2024 Splunk Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +MACH_O_TYPE=staticlib diff --git a/SplunkAgent/Configurations/Release-mh_dylib.xcconfig b/SplunkAgent/Configurations/Release-mh_dylib.xcconfig new file mode 100644 index 00000000..3f546c0e --- /dev/null +++ b/SplunkAgent/Configurations/Release-mh_dylib.xcconfig @@ -0,0 +1,16 @@ +// +// Copyright 2024 Splunk Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +MACH_O_TYPE=mh_dylib diff --git a/SplunkAgent/Configurations/Release-staticlib.xcconfig b/SplunkAgent/Configurations/Release-staticlib.xcconfig new file mode 100644 index 00000000..930bf76e --- /dev/null +++ b/SplunkAgent/Configurations/Release-staticlib.xcconfig @@ -0,0 +1,16 @@ +// +// Copyright 2024 Splunk Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +MACH_O_TYPE=staticlib diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/AppState/AgentAppStateManager.swift b/SplunkAgent/Sources/SplunkAgent/Agent/AppState/AgentAppStateManager.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/AppState/AgentAppStateManager.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/AppState/AgentAppStateManager.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/AppState/AppStateManager.swift b/SplunkAgent/Sources/SplunkAgent/Agent/AppState/AppStateManager.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/AppState/AppStateManager.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/AppState/AppStateManager.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/AppState/Model/AppState.swift b/SplunkAgent/Sources/SplunkAgent/Agent/AppState/Model/AppState.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/AppState/Model/AppState.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/AppState/Model/AppState.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/AppState/Model/AppStateEvent.swift b/SplunkAgent/Sources/SplunkAgent/Agent/AppState/Model/AppStateEvent.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/AppState/Model/AppStateEvent.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/AppState/Model/AppStateEvent.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/AppState/Model/AppStateModel.swift b/SplunkAgent/Sources/SplunkAgent/Agent/AppState/Model/AppStateModel.swift similarity index 98% rename from MRUMAgent/Sources/CiscoRUM/Agent/AppState/Model/AppStateModel.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/AppState/Model/AppStateModel.swift index 1ecffacd..3ad32a33 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/AppState/Model/AppStateModel.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/AppState/Model/AppStateModel.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -@_implementationOnly import MRUMLogger +@_implementationOnly import SplunkLogger class AppStateModel { diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Configuration/ConfigurationDefaults.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Configuration/ConfigurationDefaults.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Configuration/ConfigurationDefaults.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Configuration/ConfigurationDefaults.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/AgentConfigurationHandler.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/AgentConfigurationHandler.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/AgentConfigurationHandler.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/AgentConfigurationHandler.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/ConfigurationHandler+LoadRemote.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/ConfigurationHandler+LoadRemote.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/ConfigurationHandler+LoadRemote.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/ConfigurationHandler+LoadRemote.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/ConfigurationHandler+RequestErrorHandling.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/ConfigurationHandler+RequestErrorHandling.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/ConfigurationHandler+RequestErrorHandling.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/ConfigurationHandler+RequestErrorHandling.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/ConfigurationHandler+Storage.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/ConfigurationHandler+Storage.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/ConfigurationHandler+Storage.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/ConfigurationHandler+Storage.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/ConfigurationHandler.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/ConfigurationHandler.swift similarity index 98% rename from MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/ConfigurationHandler.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/ConfigurationHandler.swift index 7ac0fecb..e27bfa5a 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/ConfigurationHandler.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/ConfigurationHandler.swift @@ -17,7 +17,7 @@ limitations under the License. import Combine import Foundation -@_implementationOnly import MRUMLogger +@_implementationOnly import SplunkLogger final class ConfigurationHandler: AgentConfigurationHandler, ObservableObject { diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/ConfigurationHandlerError.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/ConfigurationHandlerError.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/ConfigurationHandlerError.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/ConfigurationHandlerError.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/Endpoints/RemoteConfigurationEndpoint.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/Endpoints/RemoteConfigurationEndpoint.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/Endpoints/RemoteConfigurationEndpoint.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/Endpoints/RemoteConfigurationEndpoint.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/Non-Operational/ConfigurationHandlerNonOperational.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/Non-Operational/ConfigurationHandlerNonOperational.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Handler/Non-Operational/ConfigurationHandlerNonOperational.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Handler/Non-Operational/ConfigurationHandlerNonOperational.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Models/AgentConfiguration+MergeRemote.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Models/AgentConfiguration+MergeRemote.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Models/AgentConfiguration+MergeRemote.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Models/AgentConfiguration+MergeRemote.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Models/AgentConfiguration.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Models/AgentConfiguration.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Models/AgentConfiguration.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Models/AgentConfiguration.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Models/RemoteConfiguration.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Models/RemoteConfiguration.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Configuration/Models/RemoteConfiguration.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Configuration/Models/RemoteConfiguration.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Event Manager/AgentEventManager.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Event Manager/AgentEventManager.swift similarity index 93% rename from MRUMAgent/Sources/CiscoRUM/Agent/Events/Event Manager/AgentEventManager.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Events/Event Manager/AgentEventManager.swift index 3ea2b14d..7625b097 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Event Manager/AgentEventManager.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Event Manager/AgentEventManager.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -@_implementationOnly import MRUMSharedProtocols +@_implementationOnly import SplunkSharedProtocols /// Event manager publishes Module data, sends other events to exporters. /// @@ -41,7 +41,7 @@ protocol AgentEventManager { /// - configuration: Agent Configuration object. /// - agent: Agent object, used to obtain Session information and User information. /// - eventsModel: Events model object to store persisted events metadata. - init(with configuration: AgentConfiguration, agent: CiscoRUMAgent, eventsModel: EventsModel) + init(with configuration: AgentConfiguration, agent: SplunkRum, eventsModel: EventsModel) // MARK: - Module Events diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Event Manager/DefaultEventManager.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Event Manager/DefaultEventManager.swift similarity index 95% rename from MRUMAgent/Sources/CiscoRUM/Agent/Events/Event Manager/DefaultEventManager.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Events/Event Manager/DefaultEventManager.swift index d97aa6f5..310ce586 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Event Manager/DefaultEventManager.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Event Manager/DefaultEventManager.swift @@ -16,11 +16,11 @@ limitations under the License. */ import Foundation -@_implementationOnly import MRUMCrashReports -@_implementationOnly import MRUMLogger -@_implementationOnly import MRUMOTel +@_implementationOnly import SplunkCrashReports +@_implementationOnly import SplunkLogger +@_implementationOnly import SplunkOpenTelemetry @_implementationOnly import CiscoSessionReplay -@_implementationOnly import MRUMSharedProtocols +@_implementationOnly import SplunkSharedProtocols /// Default Event Manager instantiates LogEventProcessor for sending logs, instantiates TraceProcessor for sending traces. /// @@ -42,7 +42,7 @@ class DefaultEventManager: AgentEventManager { var traceProcesssor: TraceProcessor // Agent reference - private unowned let agent: CiscoRUMAgent + private unowned let agent: SplunkRum // Logger private let logger = InternalLogger(configuration: .agent(category: "EventManager")) @@ -56,7 +56,7 @@ class DefaultEventManager: AgentEventManager { // MARK: - Initialization - required init(with configuration: AgentConfiguration, agent: CiscoRUMAgent, eventsModel: EventsModel = EventsModel()) { + required init(with configuration: AgentConfiguration, agent: SplunkRum, eventsModel: EventsModel = EventsModel()) { self.agent = agent self.eventsModel = eventsModel @@ -67,7 +67,7 @@ class DefaultEventManager: AgentEventManager { // Will be used later by hybrid agents let hybridType: String? = nil - let agentVersion = CiscoRUMAgent.version + let agentVersion = SplunkRum.version // Build resources let resources = DefaultResources( diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Events/AgentEvent.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Events/AgentEvent.swift similarity index 91% rename from MRUMAgent/Sources/CiscoRUM/Agent/Events/Events/AgentEvent.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Events/Events/AgentEvent.swift index ad4bd8bb..128bd7af 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Events/AgentEvent.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Events/AgentEvent.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -@_implementationOnly import MRUMSharedProtocols +@_implementationOnly import SplunkSharedProtocols /// Base Event class. Holds base event data, attributes and metadata. Subclasses should fill in all necessary data and attributes. class AgentEvent: Event { @@ -30,8 +30,8 @@ class AgentEvent: Event { var name: String = "mobile_event" /// Instrumentation scope, defines a module from which the event was generated. - /// Default value `com.cisco.mrum`, subclasses can override. - var instrumentationScope: String = "com.cisco.mrum" + /// Default value `com.splunk.rum`, subclasses can override. + var instrumentationScope: String = "com.splunk.rum" // MARK: - Event Properties diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Events/CrashReportsDataEvent.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Events/CrashReportsDataEvent.swift similarity index 89% rename from MRUMAgent/Sources/CiscoRUM/Agent/Events/Events/CrashReportsDataEvent.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Events/Events/CrashReportsDataEvent.swift index df8092af..7cd84d82 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Events/CrashReportsDataEvent.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Events/CrashReportsDataEvent.swift @@ -16,8 +16,8 @@ limitations under the License. */ import Foundation -@_implementationOnly import MRUMCrashReports -@_implementationOnly import MRUMSharedProtocols +@_implementationOnly import SplunkCrashReports +@_implementationOnly import SplunkSharedProtocols /// Crash Reports data event. Represents stringified Crash Report with metadata. class CrashReportsDataEvent: AgentEvent { @@ -36,7 +36,7 @@ class CrashReportsDataEvent: AgentEvent { // Event identification name = metadata.eventName - instrumentationScope = "com.cisco.mrum.crashreports" + instrumentationScope = "com.splunk.rum.crashreports" if let sessionID { self.sessionID = sessionID diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Events/SessionPulseEvent.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Events/SessionPulseEvent.swift similarity index 90% rename from MRUMAgent/Sources/CiscoRUM/Agent/Events/Events/SessionPulseEvent.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Events/Events/SessionPulseEvent.swift index 49d8a60a..d426d841 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Events/SessionPulseEvent.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Events/SessionPulseEvent.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -@_implementationOnly import MRUMSharedProtocols +@_implementationOnly import SplunkSharedProtocols /// Session Pulse Event. Sent in constant intervals to keep a session alive. class SessionPulseEvent: AgentEvent { @@ -28,7 +28,7 @@ class SessionPulseEvent: AgentEvent { // Event identification name = "session_pulse" - instrumentationScope = "com.cisco.mrum.agent" + instrumentationScope = "com.splunk.rum.agent" // Event properties self.sessionID = sessionID diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Events/SessionReplayDataEvent.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Events/SessionReplayDataEvent.swift similarity index 94% rename from MRUMAgent/Sources/CiscoRUM/Agent/Events/Events/SessionReplayDataEvent.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Events/Events/SessionReplayDataEvent.swift index baaaf710..77c373ce 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Events/SessionReplayDataEvent.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Events/SessionReplayDataEvent.swift @@ -17,7 +17,7 @@ limitations under the License. import Foundation @_implementationOnly import CiscoSessionReplay -@_implementationOnly import MRUMSharedProtocols +@_implementationOnly import SplunkSharedProtocols /// Session Replay data events. Sends session replay blob with metadata. class SessionReplayDataEvent: AgentEvent { @@ -35,7 +35,7 @@ class SessionReplayDataEvent: AgentEvent { // Event identification name = "session_replay_data" - instrumentationScope = "com.cisco.mrum.sessionreplay" + instrumentationScope = "com.splunk.rum.sessionreplay" // Event properties let timestamp = metadata.timestamp diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Events/SessionStartEvent.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Events/SessionStartEvent.swift similarity index 91% rename from MRUMAgent/Sources/CiscoRUM/Agent/Events/Events/SessionStartEvent.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Events/Events/SessionStartEvent.swift index 3c9e7768..83d45d4e 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Events/SessionStartEvent.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Events/SessionStartEvent.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -@_implementationOnly import MRUMSharedProtocols +@_implementationOnly import SplunkSharedProtocols /// Session Start Event. Sent when a session starts. class SessionStartEvent: AgentEvent { @@ -28,7 +28,7 @@ class SessionStartEvent: AgentEvent { // Event identification name = "session_start" - instrumentationScope = "com.cisco.mrum.agent" + instrumentationScope = "com.splunk.rum.agent" // Event properties self.sessionID = sessionID diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Model/EventsModel.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Model/EventsModel.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Events/Model/EventsModel.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Events/Model/EventsModel.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Events/Utils/TimeInterval+Nanoseconds.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Events/Utils/TimeInterval+Nanoseconds.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Events/Utils/TimeInterval+Nanoseconds.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Events/Utils/TimeInterval+Nanoseconds.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Modules/Manager/AgentModulesManager.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Modules/Manager/AgentModulesManager.swift similarity index 98% rename from MRUMAgent/Sources/CiscoRUM/Agent/Modules/Manager/AgentModulesManager.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Modules/Manager/AgentModulesManager.swift index 00ccfb5b..096648dc 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/Modules/Manager/AgentModulesManager.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/Modules/Manager/AgentModulesManager.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -@_implementationOnly import MRUMSharedProtocols +@_implementationOnly import SplunkSharedProtocols /// Defines the basic properties and behavior of the modules manager. /// diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Modules/Manager/DefaultModulesManager.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Modules/Manager/DefaultModulesManager.swift similarity index 99% rename from MRUMAgent/Sources/CiscoRUM/Agent/Modules/Manager/DefaultModulesManager.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Modules/Manager/DefaultModulesManager.swift index 0923e917..9eb4eac4 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/Modules/Manager/DefaultModulesManager.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/Modules/Manager/DefaultModulesManager.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -@_implementationOnly import MRUMSharedProtocols +@_implementationOnly import SplunkSharedProtocols class DefaultModulesManager: AgentModulesManager { diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Modules/Manager/Module+AcceptsHelpers.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Modules/Manager/Module+AcceptsHelpers.swift similarity index 96% rename from MRUMAgent/Sources/CiscoRUM/Agent/Modules/Manager/Module+AcceptsHelpers.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Modules/Manager/Module+AcceptsHelpers.swift index 7f067f7e..6c0c4d6c 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/Modules/Manager/Module+AcceptsHelpers.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/Modules/Manager/Module+AcceptsHelpers.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@_implementationOnly import MRUMSharedProtocols +@_implementationOnly import SplunkSharedProtocols extension Module { diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Modules/Pool/AgentModulesPool.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Modules/Pool/AgentModulesPool.swift similarity index 94% rename from MRUMAgent/Sources/CiscoRUM/Agent/Modules/Pool/AgentModulesPool.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Modules/Pool/AgentModulesPool.swift index 086dd929..3d26f670 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/Modules/Pool/AgentModulesPool.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/Modules/Pool/AgentModulesPool.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@_implementationOnly import MRUMSharedProtocols +@_implementationOnly import SplunkSharedProtocols /// Defines the pool of available modules in the current run environment. protocol AgentModulesPool { diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Modules/Pool/DefaultModulesPool.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Modules/Pool/DefaultModulesPool.swift similarity index 73% rename from MRUMAgent/Sources/CiscoRUM/Agent/Modules/Pool/DefaultModulesPool.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Modules/Pool/DefaultModulesPool.swift index 5c684fbd..f84a912c 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/Modules/Pool/DefaultModulesPool.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/Modules/Pool/DefaultModulesPool.swift @@ -15,23 +15,23 @@ See the License for the specific language governing permissions and limitations under the License. */ -@_implementationOnly import MRUMSharedProtocols +@_implementationOnly import SplunkSharedProtocols -#if canImport(MRUMCrashReports) - @_implementationOnly import MRUMCrashReports +#if canImport(SplunkCrashReports) + @_implementationOnly import SplunkCrashReports #endif -#if canImport(MRUMNetwork) - @_implementationOnly import MRUMNetwork +#if canImport(SplunkNetwork) + @_implementationOnly import SplunkNetwork #endif #if canImport(CiscoSessionReplay) @_implementationOnly import CiscoSessionReplay - @_implementationOnly import MRUMSessionReplayProxy + @_implementationOnly import SplunkSessionReplayProxy #endif -#if canImport(MRUMSlowFrameDetector) - @_implementationOnly import MRUMSlowFrameDetector +#if canImport(SplunkSlowFrameDetector) + @_implementationOnly import SplunkSlowFrameDetector #endif @@ -42,7 +42,7 @@ class DefaultModulesPool: AgentModulesPool { var knownModules = [any Module.Type]() // Crash reports - #if canImport(MRUMCrashReports) + #if canImport(SplunkCrashReports) knownModules.append(CrashReports.self) #endif @@ -52,12 +52,12 @@ class DefaultModulesPool: AgentModulesPool { #endif // Network Instrumentation - #if canImport(MRUMNetwork) + #if canImport(SplunkNetwork) knownModules.append(NetworkInstrumentation.self) #endif // Network Instrumentation - #if canImport(MRUMSlowFrameDetector) + #if canImport(SplunkSlowFrameDetector) knownModules.append(SlowFrameDetector.self) #endif diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Resources/DefaultResources.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Resources/DefaultResources.swift similarity index 95% rename from MRUMAgent/Sources/CiscoRUM/Agent/Resources/DefaultResources.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Resources/DefaultResources.swift index 81b601dd..fb3aceea 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/Resources/DefaultResources.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/Resources/DefaultResources.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -@_implementationOnly import MRUMSharedProtocols +@_implementationOnly import SplunkSharedProtocols struct DefaultResources: AgentResources { diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/ScreenContent/ScreenName.swift b/SplunkAgent/Sources/SplunkAgent/Agent/ScreenContent/ScreenName.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/ScreenContent/ScreenName.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/ScreenContent/ScreenName.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Session/AgentSession.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Session/AgentSession.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Session/AgentSession.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Session/AgentSession.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Session/DefaultSession.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Session/DefaultSession.swift similarity index 99% rename from MRUMAgent/Sources/CiscoRUM/Agent/Session/DefaultSession.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Session/DefaultSession.swift index 5f4b1043..fc323c01 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/Session/DefaultSession.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/Session/DefaultSession.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -@_implementationOnly import MRUMLogger +@_implementationOnly import SplunkLogger #if os(iOS) || os(tvOS) || os(visionOS) import UIKit @@ -49,7 +49,7 @@ class DefaultSession: AgentSession { // MARK: - Public /// The agent instance to which the session belongs. - public unowned var owner: CiscoRUMAgent? + public unowned var owner: SplunkRum? /// Defines the minimum session refresh interval (defined in seconds). Default value is 1 second. public var sessionRefreshInterval: Double = 1 diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Session/Model/SessionItem.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Session/Model/SessionItem.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Session/Model/SessionItem.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Session/Model/SessionItem.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/Session/Model/SessionsModel.swift b/SplunkAgent/Sources/SplunkAgent/Agent/Session/Model/SessionsModel.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/Session/Model/SessionsModel.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/Session/Model/SessionsModel.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/State/AgentState.swift b/SplunkAgent/Sources/SplunkAgent/Agent/State/AgentState.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/State/AgentState.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/State/AgentState.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/State/DefaultSharedState.swift b/SplunkAgent/Sources/SplunkAgent/Agent/State/DefaultSharedState.swift similarity index 89% rename from MRUMAgent/Sources/CiscoRUM/Agent/State/DefaultSharedState.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/State/DefaultSharedState.swift index f6c4a836..e6b467be 100644 --- a/MRUMAgent/Sources/CiscoRUM/Agent/State/DefaultSharedState.swift +++ b/SplunkAgent/Sources/SplunkAgent/Agent/State/DefaultSharedState.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -@_implementationOnly import MRUMSharedProtocols +@_implementationOnly import SplunkSharedProtocols /// A shared state is a representation of view on current internal information. /// @@ -25,7 +25,7 @@ class DefaultSharedState: AgentSharedState { // MARK: - Internal - private unowned let owner: CiscoRUMAgent + private unowned let owner: SplunkRum // MARK: - General state @@ -41,7 +41,7 @@ class DefaultSharedState: AgentSharedState { // MARK: - Initialization - init(for owner: CiscoRUMAgent) { + init(for owner: SplunkRum) { self.owner = owner } } diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/User/AgentUser.swift b/SplunkAgent/Sources/SplunkAgent/Agent/User/AgentUser.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/User/AgentUser.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/User/AgentUser.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Agent/User/DefaultUser.swift b/SplunkAgent/Sources/SplunkAgent/Agent/User/DefaultUser.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Agent/User/DefaultUser.swift rename to SplunkAgent/Sources/SplunkAgent/Agent/User/DefaultUser.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Extensions/String+NanoID.swift b/SplunkAgent/Sources/SplunkAgent/Extensions/String+NanoID.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Extensions/String+NanoID.swift rename to SplunkAgent/Sources/SplunkAgent/Extensions/String+NanoID.swift diff --git a/MRUMAgent/Sources/CiscoRUM/NOTICES b/SplunkAgent/Sources/SplunkAgent/NOTICES similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/NOTICES rename to SplunkAgent/Sources/SplunkAgent/NOTICES diff --git a/MRUMAgent/Sources/CiscoRUM/PrivacyInfo.xcprivacy b/SplunkAgent/Sources/SplunkAgent/PrivacyInfo.xcprivacy similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/PrivacyInfo.xcprivacy rename to SplunkAgent/Sources/SplunkAgent/PrivacyInfo.xcprivacy diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/API-1.0-Configuration.swift b/SplunkAgent/Sources/SplunkAgent/Public API/API-1.0-Configuration.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/API-1.0-Configuration.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/API-1.0-Configuration.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/API-1.0-Session.swift b/SplunkAgent/Sources/SplunkAgent/Public API/API-1.0-Session.swift similarity index 94% rename from MRUMAgent/Sources/CiscoRUM/Public API/API-1.0-Session.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/API-1.0-Session.swift index f6358f81..5e64706d 100644 --- a/MRUMAgent/Sources/CiscoRUM/Public API/API-1.0-Session.swift +++ b/SplunkAgent/Sources/SplunkAgent/Public API/API-1.0-Session.swift @@ -22,12 +22,12 @@ public final class Session { // MARK: - Internal - private unowned let owner: CiscoRUMAgent + private unowned let owner: SplunkRum // MARK: - Initialization - init(for owner: CiscoRUMAgent) { + init(for owner: SplunkRum) { self.owner = owner } } diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/API-1.0-State.swift b/SplunkAgent/Sources/SplunkAgent/Public API/API-1.0-State.swift similarity index 95% rename from MRUMAgent/Sources/CiscoRUM/Public API/API-1.0-State.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/API-1.0-State.swift index 7436f1e1..01dbfea1 100644 --- a/MRUMAgent/Sources/CiscoRUM/Public API/API-1.0-State.swift +++ b/SplunkAgent/Sources/SplunkAgent/Public API/API-1.0-State.swift @@ -35,12 +35,12 @@ public final class RuntimeState: AgentState, ObservableObject { // MARK: - Internal - private unowned let owner: CiscoRUMAgent + private unowned let owner: SplunkRum // MARK: - Initialization - init(for owner: CiscoRUMAgent) { + init(for owner: SplunkRum) { self.owner = owner } } diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/API-1.0-User.swift b/SplunkAgent/Sources/SplunkAgent/Public API/API-1.0-User.swift similarity index 91% rename from MRUMAgent/Sources/CiscoRUM/Public API/API-1.0-User.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/API-1.0-User.swift index f7e26c0f..56f3135d 100644 --- a/MRUMAgent/Sources/CiscoRUM/Public API/API-1.0-User.swift +++ b/SplunkAgent/Sources/SplunkAgent/Public API/API-1.0-User.swift @@ -20,12 +20,12 @@ public final class User { // MARK: - Internal - private unowned let owner: CiscoRUMAgent + private unowned let owner: SplunkRum // MARK: - Initialization - init(for owner: CiscoRUMAgent) { + init(for owner: SplunkRum) { self.owner = owner } } diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Model/API-1.0-Status.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Model/API-1.0-Status.swift similarity index 95% rename from MRUMAgent/Sources/CiscoRUM/Public API/Model/API-1.0-Status.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Model/API-1.0-Status.swift index 32baf6d3..90dd37a1 100644 --- a/MRUMAgent/Sources/CiscoRUM/Public API/Model/API-1.0-Status.swift +++ b/SplunkAgent/Sources/SplunkAgent/Public API/Model/API-1.0-Status.swift @@ -29,7 +29,7 @@ public enum Status: Equatable { /// The cause why the recording is currently not running. public enum Cause { - /// The CiscoRUM agent is not supported on the current platform. + /// The SplunkAgent agent is not supported on the current platform. case unsupportedPlatform /// Disabled by remote configuration. diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Internal/Sensitivity/SensitivityModifier.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Internal/Sensitivity/SensitivityModifier.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Internal/Sensitivity/SensitivityModifier.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Internal/Sensitivity/SensitivityModifier.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Model Conversions/Preferences+Conversions.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Model Conversions/Preferences+Conversions.swift similarity index 88% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Model Conversions/Preferences+Conversions.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Model Conversions/Preferences+Conversions.swift index f4b4fd12..bdd6d842 100644 --- a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Model Conversions/Preferences+Conversions.swift +++ b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Model Conversions/Preferences+Conversions.swift @@ -18,11 +18,11 @@ limitations under the License. import Foundation @_implementationOnly import CiscoSessionReplay -typealias MRUMSessionReplayPreferences = CiscoSessionReplay.Preferences +typealias SplunkSessionReplayPreferences = CiscoSessionReplay.Preferences // Internal extensions to convert `SessionReplayModulePreferences` proxy model to // the underlying SessionReplay's `Preferences` model and vice versa. -extension MRUMSessionReplayPreferences { +extension SplunkSessionReplayPreferences { // MARK: - Initialization conversion @@ -40,7 +40,7 @@ extension SessionReplayModulePreferences { // MARK: - Initialization conversion - init(srPreferences: MRUMSessionReplayPreferences) { + init(srPreferences: SplunkSessionReplayPreferences) { let renderingMode = RenderingMode(with: srPreferences.renderingMode) self.init(renderingMode: renderingMode) diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Model Conversions/RecordingMask+Conversions.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Model Conversions/RecordingMask+Conversions.swift similarity index 75% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Model Conversions/RecordingMask+Conversions.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Model Conversions/RecordingMask+Conversions.swift index 0783c487..17c31892 100644 --- a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Model Conversions/RecordingMask+Conversions.swift +++ b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Model Conversions/RecordingMask+Conversions.swift @@ -18,13 +18,13 @@ limitations under the License. import Foundation @_implementationOnly import CiscoSessionReplay -// MARK: - MRUMSessionReplay RecordingMask-related type conversions +// MARK: - SplunkSessionReplay RecordingMask-related type conversions -typealias MRUMSessionReplayRecordingMask = CiscoSessionReplay.RecordingMask -typealias MRUMSessionReplayMaskElement = CiscoSessionReplay.MaskElement -typealias MRUMSessionReplayMaskType = CiscoSessionReplay.MaskElement.MaskType +typealias SplunkSessionReplayRecordingMask = CiscoSessionReplay.RecordingMask +typealias SplunkSessionReplayMaskElement = CiscoSessionReplay.MaskElement +typealias SplunkSessionReplayMaskType = CiscoSessionReplay.MaskElement.MaskType -extension MRUMSessionReplayMaskType { +extension SplunkSessionReplayMaskType { // MARK: - MaskType conversion initialization @@ -40,19 +40,19 @@ extension MRUMSessionReplayMaskType { } } -extension MRUMSessionReplayMaskElement { +extension SplunkSessionReplayMaskElement { // MARK: - MaskElement conversion initialization init(from maskElement: MaskElement) { let rect = maskElement.rect - let type = MRUMSessionReplayMaskType(from: maskElement.type) + let type = SplunkSessionReplayMaskType(from: maskElement.type) self.init(rect: rect, type: type) } } -extension MRUMSessionReplayRecordingMask { +extension SplunkSessionReplayRecordingMask { // MARK: - RecordingMasks conversion @@ -66,7 +66,7 @@ extension MRUMSessionReplayRecordingMask { // Converts all contained elements let elements = recordingMask.elements.map { maskElement in - MRUMSessionReplayMaskElement(from: maskElement) + SplunkSessionReplayMaskElement(from: maskElement) } self.init(elements: elements) @@ -77,7 +77,7 @@ extension MaskElement.MaskType { // MARK: - MaskType initialization - init(from maskType: MRUMSessionReplayMaskType) { + init(from maskType: SplunkSessionReplayMaskType) { switch maskType { case .erasing: @@ -96,7 +96,7 @@ extension MaskElement { // MARK: - MaskElement initialization - init(from maskElement: MRUMSessionReplayMaskElement) { + init(from maskElement: SplunkSessionReplayMaskElement) { rect = maskElement.rect type = MaskType(from: maskElement.type) } @@ -107,7 +107,7 @@ extension RecordingMask { // MARK: - RecordingMasks conversion - init?(from recordingMask: MRUMSessionReplayRecordingMask?) { + init?(from recordingMask: SplunkSessionReplayRecordingMask?) { guard let recordingMask = recordingMask, !recordingMask.elements.isEmpty diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Model Conversions/RenderingMode+Conversions.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Model Conversions/RenderingMode+Conversions.swift similarity index 86% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Model Conversions/RenderingMode+Conversions.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Model Conversions/RenderingMode+Conversions.swift index 6eb1c461..a9a4d4a5 100644 --- a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Model Conversions/RenderingMode+Conversions.swift +++ b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Model Conversions/RenderingMode+Conversions.swift @@ -18,14 +18,14 @@ limitations under the License. import Foundation @_implementationOnly import CiscoSessionReplay -typealias MRUMSessionReplayRenderingMode = CiscoSessionReplay.RenderingMode +typealias SplunkSessionReplayRenderingMode = CiscoSessionReplay.RenderingMode // Internal extension to convert `RenderingMode` proxy model to the underlying SessionReplay's `RenderingMode` model extension RenderingMode { // MARK: - Computed properties - var srRenderingMode: MRUMSessionReplayRenderingMode { + var srRenderingMode: SplunkSessionReplayRenderingMode { switch self { case .native: @@ -42,7 +42,7 @@ extension RenderingMode { // MARK: - Conversion init - init(with renderingMode: MRUMSessionReplayRenderingMode?) { + init(with renderingMode: SplunkSessionReplayRenderingMode?) { switch renderingMode { case .native: diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Model Conversions/Status+Conversions.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Model Conversions/Status+Conversions.swift similarity index 94% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Model Conversions/Status+Conversions.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Model Conversions/Status+Conversions.swift index 080012f2..a890cb7f 100644 --- a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Model Conversions/Status+Conversions.swift +++ b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Model Conversions/Status+Conversions.swift @@ -18,14 +18,14 @@ limitations under the License. import Foundation @_implementationOnly import CiscoSessionReplay -typealias MRUMSessionReplayStatus = CiscoSessionReplay.Status +typealias SplunkSessionReplayStatus = CiscoSessionReplay.Status // Internal extension to convert `Status` proxy model to the underlying SessionReplay's `Status` model extension SessionReplayStatus { // MARK: - Computed properties - var srStatus: MRUMSessionReplayStatus { + var srStatus: SplunkSessionReplayStatus { switch self { case .recording: @@ -62,7 +62,7 @@ extension SessionReplayStatus { extension SessionReplayStatus { - init(srStatus: MRUMSessionReplayStatus) { + init(srStatus: SplunkSessionReplayStatus) { switch srStatus { case .recording: diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Module/SessionReplay+Recording.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Module/SessionReplay+Recording.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Module/SessionReplay+Recording.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Module/SessionReplay+Recording.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Module/SessionReplay+RecordingMask.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Module/SessionReplay+RecordingMask.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Module/SessionReplay+RecordingMask.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Module/SessionReplay+RecordingMask.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Module/SessionReplay.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Module/SessionReplay.swift similarity index 96% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Module/SessionReplay.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Module/SessionReplay.swift index 645649d2..ba191190 100644 --- a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Module/SessionReplay.swift +++ b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Module/SessionReplay.swift @@ -17,7 +17,7 @@ limitations under the License. import Foundation -@_implementationOnly import MRUMLogger +@_implementationOnly import SplunkLogger @_implementationOnly import CiscoSessionReplay /// The class implementing Session Replay public API. @@ -66,7 +66,7 @@ final class SessionReplay: SessionReplayModule { (preferences as? SessionReplayPreferences)?.module = module // Pass changes into the module - module.preferences = MRUMSessionReplayPreferences(preferences: preferences) + module.preferences = SplunkSessionReplayPreferences(preferences: preferences) } } diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Module/SessionReplayPreferences.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Module/SessionReplayPreferences.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Module/SessionReplayPreferences.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Module/SessionReplayPreferences.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Module/SessionReplaySensitivity.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Module/SessionReplaySensitivity.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Module/SessionReplaySensitivity.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Module/SessionReplaySensitivity.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Module/SessionReplayState.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Module/SessionReplayState.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Module/SessionReplayState.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Module/SessionReplayState.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational+Preferences.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational+Preferences.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational+Preferences.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational+Preferences.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational+Recording.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational+Recording.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational+Recording.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational+Recording.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational+RecordingMask.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational+RecordingMask.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational+RecordingMask.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational+RecordingMask.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational.swift similarity index 97% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational.swift index 497cfec5..822e02c6 100644 --- a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational.swift +++ b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperational.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@_implementationOnly import MRUMLogger +@_implementationOnly import SplunkLogger /// The class implementing Session Replay public API in non-operational mode. /// diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperationalSensitivity.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperationalSensitivity.swift similarity index 98% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperationalSensitivity.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperationalSensitivity.swift index b4cd9278..d6932fed 100644 --- a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperationalSensitivity.swift +++ b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperationalSensitivity.swift @@ -16,7 +16,7 @@ limitations under the License. */ -@_implementationOnly import MRUMLogger +@_implementationOnly import SplunkLogger import UIKit /// The class implementing public API for the view element's sensitivity in non-operational mode. diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperationalState.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperationalState.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperationalState.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Proxies/Non-Operational/SessionReplayNonOperationalState.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/API-1.0-Sensitivity+SwiftUI.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/API-1.0-Sensitivity+SwiftUI.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/API-1.0-Sensitivity+SwiftUI.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/API-1.0-Sensitivity+SwiftUI.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/API-1.0-Sensitivity+UIView.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/API-1.0-Sensitivity+UIView.swift similarity index 85% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/API-1.0-Sensitivity+UIView.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/API-1.0-Sensitivity+UIView.swift index e81c5b97..6f448bca 100644 --- a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/API-1.0-Sensitivity+UIView.swift +++ b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/API-1.0-Sensitivity+UIView.swift @@ -26,10 +26,10 @@ public extension UIView { /// Assigning `nil` removes previously assigned explicit sensitivity. var srSensitive: Bool? { get { - CiscoRUMAgent.instance?.sessionReplay.sensitivity[self] + SplunkRum.instance?.sessionReplay.sensitivity[self] } set { - CiscoRUMAgent.instance?.sessionReplay.sensitivity[self] = newValue + SplunkRum.instance?.sessionReplay.sensitivity[self] = newValue } } } diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModule.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModule.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModule.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModule.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModulePreferences.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModulePreferences.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModulePreferences.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModulePreferences.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModuleSensitivity.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModuleSensitivity.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModuleSensitivity.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModuleSensitivity.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModuleState.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModuleState.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModuleState.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/API-1.0-SessionReplayModuleState.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/Model/API-1.0-RecordingMask.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/Model/API-1.0-RecordingMask.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/Model/API-1.0-RecordingMask.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/Model/API-1.0-RecordingMask.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/Model/API-1.0-RenderingMode.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/Model/API-1.0-RenderingMode.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/Model/API-1.0-RenderingMode.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/Model/API-1.0-RenderingMode.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/Model/API-1.0-SessionReplayStatus.swift b/SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/Model/API-1.0-SessionReplayStatus.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Public API/Modules/Session Replay/Public API/Model/API-1.0-SessionReplayStatus.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/Modules/Session Replay/Public API/Model/API-1.0-SessionReplayStatus.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Public API/CiscoRUMAgent.swift b/SplunkAgent/Sources/SplunkAgent/Public API/SplunkRum.swift similarity index 89% rename from MRUMAgent/Sources/CiscoRUM/Public API/CiscoRUMAgent.swift rename to SplunkAgent/Sources/SplunkAgent/Public API/SplunkRum.swift index c0180ef6..61f09c34 100644 --- a/MRUMAgent/Sources/CiscoRUM/Public API/CiscoRUMAgent.swift +++ b/SplunkAgent/Sources/SplunkAgent/Public API/SplunkRum.swift @@ -19,17 +19,17 @@ import Combine import Foundation -#if canImport(MRUMCrashReports) - @_implementationOnly import MRUMCrashReports +#if canImport(SplunkCrashReports) + @_implementationOnly import SplunkCrashReports #endif -@_implementationOnly import MRUMLogger -@_implementationOnly import MRUMNetwork -@_implementationOnly import MRUMOTel +@_implementationOnly import SplunkLogger +@_implementationOnly import SplunkNetwork +@_implementationOnly import SplunkOpenTelemetry @_implementationOnly import CiscoSessionReplay -@_implementationOnly import MRUMSharedProtocols +@_implementationOnly import SplunkSharedProtocols -/// The class implementing MRUM Agent public API. -public class CiscoRUMAgent: ObservableObject { +/// The class implementing Splunk Agent public API. +public class SplunkRum: ObservableObject { // MARK: - Internal properties @@ -49,7 +49,7 @@ public class CiscoRUMAgent: ObservableObject { let appStateManager: AgentAppStateManager lazy var sharedState: AgentSharedState = DefaultSharedState(for: self) - let logger = InternalLogger(configuration: .default(subsystem: "Cisco RUM Agent")) + let logger = InternalLogger(configuration: .default(subsystem: "Splunk RUM Agent")) // MARK: - Internal (Modules Proxy) @@ -69,7 +69,7 @@ public class CiscoRUMAgent: ObservableObject { /// An singleton instance of the Agent library. /// /// This instance is used to access all the SDK functions. - public private(set) static var instance: CiscoRUMAgent? + public private(set) static var instance: SplunkRum? // MARK: - Public API @@ -117,8 +117,8 @@ public class CiscoRUMAgent: ObservableObject { /// - configuration: A configuration for the initial SDK setup. /// - moduleConfigurations: An array of individual module-specific configurations. /// - /// - Returns: A newly initialized `CiscoRUMAgent` instance. - public static func install(with configuration: Configuration, moduleConfigurations: [Any]? = nil) -> CiscoRUMAgent { + /// - Returns: A newly initialized `SplunkRum` instance. + public static func install(with configuration: Configuration, moduleConfigurations: [Any]? = nil) -> SplunkRum { // Only one instance is allowed if let sharedInstance = instance { return sharedInstance @@ -128,7 +128,7 @@ public class CiscoRUMAgent: ObservableObject { let configurationHandler = createConfigurationHandler(for: configuration) // Builds agent with default logic - let agent = CiscoRUMAgent( + let agent = SplunkRum( configurationHandler: configurationHandler, user: DefaultUser(), session: DefaultSession(), @@ -154,7 +154,7 @@ public class CiscoRUMAgent: ObservableObject { // Initialize Event manager agent.eventManager = DefaultEventManager(with: configuration, agent: agent) - // Send session start event immediately as the session already started in the CiscoRUMAgent init method. + // Send session start event immediately as the session already started in the SplunkRum init method. agent.eventManager?.sendSessionStartEvent() // Starts connecting available modules to agent @@ -178,7 +178,7 @@ public class CiscoRUMAgent: ObservableObject { agent.customizeModules() agent.logger.log { - "Cisco RUM Agent v\(Self.version)." + "Splunk RUM Agent v\(Self.version)." } return agent @@ -221,7 +221,7 @@ public class CiscoRUMAgent: ObservableObject { /// Configure Network module with shared state. private func customizeNetwork() { - let networkModule = modulesManager?.module(ofType: MRUMNetwork.NetworkInstrumentation.self) + let networkModule = modulesManager?.module(ofType: SplunkNetwork.NetworkInstrumentation.self) // Assign an object providing the current state of the agent instance. // We need to do this because we need to read `sessionID` from the agent continuously. @@ -234,8 +234,8 @@ public class CiscoRUMAgent: ObservableObject { /// Configure Crash Reports module with shared state. private func customizeCrashReports() { // swiftformat:disable indent - #if canImport(MRUMCrashReports) - let crashReportsModule = modulesManager?.module(ofType: MRUMCrashReports.CrashReports.self) + #if canImport(SplunkCrashReports) + let crashReportsModule = modulesManager?.module(ofType: SplunkCrashReports.CrashReports.self) // Assign an object providing the current state of the agent instance. // We need to do this because we need to read `appState` from the agent in the instance of a crash. diff --git a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Documentation.md b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Documentation.md similarity index 96% rename from MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Documentation.md rename to SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Documentation.md index 9ae90ba3..791bbef9 100644 --- a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Documentation.md +++ b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Documentation.md @@ -1,4 +1,4 @@ -# ``CiscoRUM`` +# ``SplunkAgent`` Create better mobile app experiences for your users. @@ -6,7 +6,7 @@ Create better mobile app experiences for your users. ### Essentials -- ``CiscoRUMAgent`` +- ``SplunkRum`` - ``Configuration`` diff --git a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/Configuration.md b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/Configuration.md similarity index 86% rename from MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/Configuration.md rename to SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/Configuration.md index d5478e66..7fb17469 100644 --- a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/Configuration.md +++ b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/Configuration.md @@ -1,4 +1,4 @@ -# ``CiscoRUM/Configuration`` +# ``SplunkAgent/Configuration`` ## Topics diff --git a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/RuntimeState.md b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/RuntimeState.md similarity index 76% rename from MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/RuntimeState.md rename to SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/RuntimeState.md index 02e700fe..5ede63fe 100644 --- a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/RuntimeState.md +++ b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/RuntimeState.md @@ -1,4 +1,4 @@ -# ``CiscoRUM/RuntimeState`` +# ``SplunkAgent/RuntimeState`` ## Topics diff --git a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/Session Replay/SessionReplayModule.md b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/Session Replay/SessionReplayModule.md similarity index 89% rename from MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/Session Replay/SessionReplayModule.md rename to SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/Session Replay/SessionReplayModule.md index 7361895a..4fd96f23 100644 --- a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/Session Replay/SessionReplayModule.md +++ b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/Session Replay/SessionReplayModule.md @@ -1,4 +1,4 @@ -# ``CiscoRUM/SessionReplayModule`` +# ``SplunkAgent/SessionReplayModule`` ## Topics diff --git a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/Session.md b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/Session.md similarity index 73% rename from MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/Session.md rename to SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/Session.md index 2eed3a85..94bf44ea 100644 --- a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/Session.md +++ b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/Session.md @@ -1,4 +1,4 @@ -# ``CiscoRUM/Session`` +# ``SplunkAgent/Session`` ## Topics diff --git a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/CiscoRUMAgent.md b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/SplunkRum.md similarity index 93% rename from MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/CiscoRUMAgent.md rename to SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/SplunkRum.md index dbfe4ec5..3b34f5ad 100644 --- a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/CiscoRUMAgent.md +++ b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/SplunkRum.md @@ -1,4 +1,4 @@ -# ``CiscoRUM/CiscoRUMAgent`` +# ``SplunkAgent/SplunkRum`` ## Overview diff --git a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/Status.md b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/Status.md similarity index 70% rename from MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/Status.md rename to SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/Status.md index 9e46dcaa..acdf038f 100644 --- a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/Status.md +++ b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/Status.md @@ -1,4 +1,4 @@ -# ``CiscoRUM/Status`` +# ``SplunkAgent/Status`` ## Topics diff --git a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/User.md b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/User.md similarity index 68% rename from MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/User.md rename to SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/User.md index e7d5db4e..606fbbe0 100644 --- a/MRUMAgent/Sources/CiscoRUM/CiscoRUM.docc/Extensions/User.md +++ b/SplunkAgent/Sources/SplunkAgent/SplunkAgent.docc/Extensions/User.md @@ -1,4 +1,4 @@ -# ``CiscoRUM/User`` +# ``SplunkAgent/User`` ## Topics diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/APIClient/APIClient.swift b/SplunkAgent/Sources/SplunkAgent/Utils/APIClient/APIClient.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/APIClient/APIClient.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/APIClient/APIClient.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/APIClient/APIClientError.swift b/SplunkAgent/Sources/SplunkAgent/Utils/APIClient/APIClientError.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/APIClient/APIClientError.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/APIClient/APIClientError.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/APIClient/APIClientHeaders.swift b/SplunkAgent/Sources/SplunkAgent/Utils/APIClient/APIClientHeaders.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/APIClient/APIClientHeaders.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/APIClient/APIClientHeaders.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/APIClient/AgentAPIClient.swift b/SplunkAgent/Sources/SplunkAgent/Utils/APIClient/AgentAPIClient.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/APIClient/AgentAPIClient.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/APIClient/AgentAPIClient.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/APIClient/Endpoints/Endpoint.swift b/SplunkAgent/Sources/SplunkAgent/Utils/APIClient/Endpoints/Endpoint.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/APIClient/Endpoints/Endpoint.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/APIClient/Endpoints/Endpoint.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/APIClient/Endpoints/Service.swift b/SplunkAgent/Sources/SplunkAgent/Utils/APIClient/Endpoints/Service.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/APIClient/Endpoints/Service.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/APIClient/Endpoints/Service.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/Info/AppInfo.swift b/SplunkAgent/Sources/SplunkAgent/Utils/Info/AppInfo.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/Info/AppInfo.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/Info/AppInfo.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/Info/CompileInfo.swift b/SplunkAgent/Sources/SplunkAgent/Utils/Info/CompileInfo.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/Info/CompileInfo.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/Info/CompileInfo.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/Info/DeviceInfo.swift b/SplunkAgent/Sources/SplunkAgent/Utils/Info/DeviceInfo.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/Info/DeviceInfo.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/Info/DeviceInfo.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/Info/SystemInfo.swift b/SplunkAgent/Sources/SplunkAgent/Utils/Info/SystemInfo.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/Info/SystemInfo.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/Info/SystemInfo.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/KeyValue Storage/KeyValueStorage.swift b/SplunkAgent/Sources/SplunkAgent/Utils/KeyValue Storage/KeyValueStorage.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/KeyValue Storage/KeyValueStorage.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/KeyValue Storage/KeyValueStorage.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/KeyValue Storage/UserDefaultsStorage.swift b/SplunkAgent/Sources/SplunkAgent/Utils/KeyValue Storage/UserDefaultsStorage.swift similarity index 98% rename from MRUMAgent/Sources/CiscoRUM/Utils/KeyValue Storage/UserDefaultsStorage.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/KeyValue Storage/UserDefaultsStorage.swift index 5fd2e733..6c19d66d 100644 --- a/MRUMAgent/Sources/CiscoRUM/Utils/KeyValue Storage/UserDefaultsStorage.swift +++ b/SplunkAgent/Sources/SplunkAgent/Utils/KeyValue Storage/UserDefaultsStorage.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -@_implementationOnly import MRUMLogger +@_implementationOnly import SplunkLogger /// The class implements a single persistent key-value store /// using standard `UserDefaults` database services. diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/PackageIdentification/PackageIdentification.swift b/SplunkAgent/Sources/SplunkAgent/Utils/PackageIdentification/PackageIdentification.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/PackageIdentification/PackageIdentification.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/PackageIdentification/PackageIdentification.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/PackageIdentification/PackageIdentifier.swift b/SplunkAgent/Sources/SplunkAgent/Utils/PackageIdentification/PackageIdentifier.swift similarity index 95% rename from MRUMAgent/Sources/CiscoRUM/Utils/PackageIdentification/PackageIdentifier.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/PackageIdentification/PackageIdentifier.swift index c242fd1c..29019f42 100644 --- a/MRUMAgent/Sources/CiscoRUM/Utils/PackageIdentification/PackageIdentifier.swift +++ b/SplunkAgent/Sources/SplunkAgent/Utils/PackageIdentification/PackageIdentifier.swift @@ -22,7 +22,7 @@ struct PackageIdentifier: PackageIdentification { // MARK: - Package identification - static var `default` = "com.cisco.mrum" + static var `default` = "com.splunk.rum" // MARK: - Package identification methods diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/Platform Support/Model/PlatformSupportScope.swift b/SplunkAgent/Sources/SplunkAgent/Utils/Platform Support/Model/PlatformSupportScope.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/Platform Support/Model/PlatformSupportScope.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/Platform Support/Model/PlatformSupportScope.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/Platform Support/PlatformSupport.swift b/SplunkAgent/Sources/SplunkAgent/Utils/Platform Support/PlatformSupport.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/Platform Support/PlatformSupport.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/Platform Support/PlatformSupport.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/Platform Support/PlatformSupporting.swift b/SplunkAgent/Sources/SplunkAgent/Utils/Platform Support/PlatformSupporting.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/Platform Support/PlatformSupporting.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/Platform Support/PlatformSupporting.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/Repeating jobs/AgentRepeatingJob.swift b/SplunkAgent/Sources/SplunkAgent/Utils/Repeating jobs/AgentRepeatingJob.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/Repeating jobs/AgentRepeatingJob.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/Repeating jobs/AgentRepeatingJob.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/Repeating jobs/LifecycleRepeatingJob.swift b/SplunkAgent/Sources/SplunkAgent/Utils/Repeating jobs/LifecycleRepeatingJob.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/Repeating jobs/LifecycleRepeatingJob.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/Repeating jobs/LifecycleRepeatingJob.swift diff --git a/MRUMAgent/Sources/CiscoRUM/Utils/Repeating jobs/RepeatingJob.swift b/SplunkAgent/Sources/SplunkAgent/Utils/Repeating jobs/RepeatingJob.swift similarity index 100% rename from MRUMAgent/Sources/CiscoRUM/Utils/Repeating jobs/RepeatingJob.swift rename to SplunkAgent/Sources/SplunkAgent/Utils/Repeating jobs/RepeatingJob.swift diff --git a/MRUMAgent/CiscoRUM.xcodeproj/project.pbxproj b/SplunkAgent/SplunkAgent.xcodeproj/project.pbxproj similarity index 92% rename from MRUMAgent/CiscoRUM.xcodeproj/project.pbxproj rename to SplunkAgent/SplunkAgent.xcodeproj/project.pbxproj index 693f92c0..5292fc5e 100644 --- a/MRUMAgent/CiscoRUM.xcodeproj/project.pbxproj +++ b/SplunkAgent/SplunkAgent.xcodeproj/project.pbxproj @@ -27,12 +27,12 @@ 2AE43B492B861325002C4A98 /* AgentEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE43B442B861325002C4A98 /* AgentEvent.swift */; }; 2AE43B4A2B861325002C4A98 /* SessionPulseEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE43B452B861325002C4A98 /* SessionPulseEvent.swift */; }; 2AE43B4B2B861325002C4A98 /* SessionStartEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE43B462B861325002C4A98 /* SessionStartEvent.swift */; }; - 3384F2AD2AC879FD00512D79 /* CiscoRUMAgent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3384F2AC2AC879FD00512D79 /* CiscoRUMAgent.swift */; }; - 4B1B15162BB584D300BEFC4B /* MRUMSharedProtocols in Frameworks */ = {isa = PBXBuildFile; productRef = 4B1B15152BB584D300BEFC4B /* MRUMSharedProtocols */; }; - 4B1B15192BB584E300BEFC4B /* MRUMSessionReplayProxy in Frameworks */ = {isa = PBXBuildFile; productRef = 4B1B15182BB584E300BEFC4B /* MRUMSessionReplayProxy */; }; - 4B1B151F2BB5858600BEFC4B /* MRUMOTel in Frameworks */ = {isa = PBXBuildFile; productRef = 4B1B151E2BB5858600BEFC4B /* MRUMOTel */; }; - 4B1B15222BB5859B00BEFC4B /* MRUMLogger in Frameworks */ = {isa = PBXBuildFile; productRef = 4B1B15212BB5859A00BEFC4B /* MRUMLogger */; }; - 4B1B15252BB585AC00BEFC4B /* MRUMCrashReports in Frameworks */ = {isa = PBXBuildFile; productRef = 4B1B15242BB585AC00BEFC4B /* MRUMCrashReports */; }; + 3384F2AD2AC879FD00512D79 /* SplunkRum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3384F2AC2AC879FD00512D79 /* SplunkRum.swift */; }; + 4B1B15162BB584D300BEFC4B /* SplunkSharedProtocols in Frameworks */ = {isa = PBXBuildFile; productRef = 4B1B15152BB584D300BEFC4B /* SplunkSharedProtocols */; }; + 4B1B15192BB584E300BEFC4B /* SplunkSessionReplayProxy in Frameworks */ = {isa = PBXBuildFile; productRef = 4B1B15182BB584E300BEFC4B /* SplunkSessionReplayProxy */; }; + 4B1B151F2BB5858600BEFC4B /* SplunkOpenTelemetry in Frameworks */ = {isa = PBXBuildFile; productRef = 4B1B151E2BB5858600BEFC4B /* SplunkOpenTelemetry */; }; + 4B1B15222BB5859B00BEFC4B /* SplunkLogger in Frameworks */ = {isa = PBXBuildFile; productRef = 4B1B15212BB5859A00BEFC4B /* SplunkLogger */; }; + 4B1B15252BB585AC00BEFC4B /* SplunkCrashReports in Frameworks */ = {isa = PBXBuildFile; productRef = 4B1B15242BB585AC00BEFC4B /* SplunkCrashReports */; }; 4B2C8BBB2BCBE4A200C6E72F /* CrashReportsDataEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2C8BBA2BCBE4A200C6E72F /* CrashReportsDataEvent.swift */; }; 4B6878C12B9F3B420024479A /* ConfigurationHandler+RequestErrorHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6878C02B9F3B420024479A /* ConfigurationHandler+RequestErrorHandling.swift */; }; 4BB680E52B7940C0000A54D4 /* SensitivityModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB680CE2B7940C0000A54D4 /* SensitivityModifier.swift */; }; @@ -47,9 +47,9 @@ 4BB680F62B7940C0000A54D4 /* API-1.0-SessionReplayModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB680E22B7940C0000A54D4 /* API-1.0-SessionReplayModule.swift */; }; 4BB680FF2B7A7A53000A54D4 /* API-1.0-ModuleProxyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB680FD2B7A7A04000A54D4 /* API-1.0-ModuleProxyTests.swift */; }; 52286CB52CD5404A001F8A31 /* ScreenName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52286CB42CD54045001F8A31 /* ScreenName.swift */; }; - 526521F62CB8937800DB3BB9 /* MRUMSlowFrameDetector in Frameworks */ = {isa = PBXBuildFile; productRef = 526521F52CB8937800DB3BB9 /* MRUMSlowFrameDetector */; }; - 526659C32B7426B0003E878A /* MRUMANRReporter in Frameworks */ = {isa = PBXBuildFile; productRef = 526659C22B7426B0003E878A /* MRUMANRReporter */; }; - BAD44D0D2B7878990069E54D /* MRUMNetwork in Frameworks */ = {isa = PBXBuildFile; productRef = BAD44D0C2B7878990069E54D /* MRUMNetwork */; }; + 526521F62CB8937800DB3BB9 /* SplunkSlowFrameDetector in Frameworks */ = {isa = PBXBuildFile; productRef = 526521F52CB8937800DB3BB9 /* SplunkSlowFrameDetector */; }; + 526659C32B7426B0003E878A /* SplunkANRReporter in Frameworks */ = {isa = PBXBuildFile; productRef = 526659C22B7426B0003E878A /* SplunkANRReporter */; }; + BAD44D0D2B7878990069E54D /* SplunkNetwork in Frameworks */ = {isa = PBXBuildFile; productRef = BAD44D0C2B7878990069E54D /* SplunkNetwork */; }; C703FAAF2BA9D417000CC11B /* AgentAppStateManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C703FAAE2BA9D417000CC11B /* AgentAppStateManager.swift */; }; C703FAB12BA9D41E000CC11B /* AppStateManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C703FAB02BA9D41E000CC11B /* AppStateManager.swift */; }; C703FAB32BA9D424000CC11B /* AppState.swift in Sources */ = {isa = PBXBuildFile; fileRef = C703FAB22BA9D424000CC11B /* AppState.swift */; }; @@ -88,7 +88,7 @@ E4134BAB2BC6AC5400F0D2FC /* API-1.0-Status.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4134BAA2BC6AC5400F0D2FC /* API-1.0-Status.swift */; }; E41FB0932B90D873009F5CA6 /* DefaultSharedState.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41FB0922B90D873009F5CA6 /* DefaultSharedState.swift */; }; E42026A32B501304002C5F80 /* UserDefaultsStorageCRUDTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E42026A22B501304002C5F80 /* UserDefaultsStorageCRUDTests.swift */; }; - E42634832BB44B0F003706A9 /* CiscoRUM.docc in Sources */ = {isa = PBXBuildFile; fileRef = E42634822BB44B0F003706A9 /* CiscoRUM.docc */; }; + E42634832BB44B0F003706A9 /* SplunkAgent.docc in Sources */ = {isa = PBXBuildFile; fileRef = E42634822BB44B0F003706A9 /* SplunkAgent.docc */; }; E426CFAA2B28C18000094AC0 /* SessionsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E426CFA82B28C18000094AC0 /* SessionsModel.swift */; }; E426CFAB2B28C18000094AC0 /* SessionItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = E426CFA92B28C18000094AC0 /* SessionItem.swift */; }; E43370D92B95C86F00102C2D /* DefaultSharedStateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E43370D82B95C86F00102C2D /* DefaultSharedStateTests.swift */; }; @@ -103,7 +103,7 @@ E4570F822BAB243B002ED1DC /* API-1.0-NonOperationalProxyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4570F812BAB243B002ED1DC /* API-1.0-NonOperationalProxyTests.swift */; }; E4577D7B2B9F2BA700DFA2C2 /* XCTestCase+SimulateBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4577D7A2B9F2BA700DFA2C2 /* XCTestCase+SimulateBackground.swift */; }; E4577D7D2B9F5BE400DFA2C2 /* XCTestCase+SimulateNotifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4577D7C2B9F5BE400DFA2C2 /* XCTestCase+SimulateNotifications.swift */; }; - E468962D2B21C85800727A6A /* CiscoRUM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3384F2A22AC879E900512D79 /* CiscoRUM.framework */; }; + E468962D2B21C85800727A6A /* SplunkAgent.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3384F2A22AC879E900512D79 /* SplunkAgent.framework */; }; E46896362B21CA0300727A6A /* UserDefaultsStoragePrefixTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E46896352B21CA0300727A6A /* UserDefaultsStoragePrefixTests.swift */; }; E468963A2B21CC7800727A6A /* NanoIDTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E46896392B21CC7800727A6A /* NanoIDTests.swift */; }; E468963D2B21D8D000727A6A /* API-1.0-UserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E468963C2B21D8D000727A6A /* API-1.0-UserTests.swift */; }; @@ -171,7 +171,7 @@ containerPortal = 3384F2992AC879E900512D79 /* Project object */; proxyType = 1; remoteGlobalIDString = 3384F2A12AC879E900512D79; - remoteInfo = CiscoRUM; + remoteInfo = SplunkAgent; }; /* End PBXContainerItemProxy section */ @@ -196,10 +196,10 @@ 2AE43B442B861325002C4A98 /* AgentEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AgentEvent.swift; sourceTree = ""; }; 2AE43B452B861325002C4A98 /* SessionPulseEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SessionPulseEvent.swift; sourceTree = ""; }; 2AE43B462B861325002C4A98 /* SessionStartEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SessionStartEvent.swift; sourceTree = ""; }; - 3384F2A22AC879E900512D79 /* CiscoRUM.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CiscoRUM.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 3384F2AC2AC879FD00512D79 /* CiscoRUMAgent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CiscoRUMAgent.swift; sourceTree = ""; }; + 3384F2A22AC879E900512D79 /* SplunkAgent.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SplunkAgent.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3384F2AC2AC879FD00512D79 /* SplunkRum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplunkRum.swift; sourceTree = ""; }; 4B2C8BBA2BCBE4A200C6E72F /* CrashReportsDataEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashReportsDataEvent.swift; sourceTree = ""; }; - 4B2CF88B2BC8875E005CFC35 /* MRUMNetwork */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = MRUMNetwork; path = ../MRUMNetwork; sourceTree = ""; }; + 4B2CF88B2BC8875E005CFC35 /* SplunkNetwork */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = SplunkNetwork; path = ../SplunkNetwork; sourceTree = ""; }; 4B536BF22B67FAFE004A6C7C /* Release-staticlib.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Release-staticlib.xcconfig"; sourceTree = ""; }; 4B536BF42B67FB2F004A6C7C /* Release-mh_dylib.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Release-mh_dylib.xcconfig"; sourceTree = ""; }; 4B536BFF2B693BED004A6C7C /* Debug-mh_dylib.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Debug-mh_dylib.xcconfig"; sourceTree = ""; }; @@ -261,7 +261,7 @@ E4134BAA2BC6AC5400F0D2FC /* API-1.0-Status.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "API-1.0-Status.swift"; sourceTree = ""; }; E41FB0922B90D873009F5CA6 /* DefaultSharedState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultSharedState.swift; sourceTree = ""; }; E42026A22B501304002C5F80 /* UserDefaultsStorageCRUDTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsStorageCRUDTests.swift; sourceTree = ""; }; - E42634822BB44B0F003706A9 /* CiscoRUM.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = CiscoRUM.docc; sourceTree = ""; }; + E42634822BB44B0F003706A9 /* SplunkAgent.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = SplunkAgent.docc; sourceTree = ""; }; E426CFA82B28C18000094AC0 /* SessionsModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SessionsModel.swift; sourceTree = ""; }; E426CFA92B28C18000094AC0 /* SessionItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SessionItem.swift; sourceTree = ""; }; E43370D82B95C86F00102C2D /* DefaultSharedStateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultSharedStateTests.swift; sourceTree = ""; }; @@ -274,13 +274,13 @@ E4570F812BAB243B002ED1DC /* API-1.0-NonOperationalProxyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "API-1.0-NonOperationalProxyTests.swift"; sourceTree = ""; }; E4577D7A2B9F2BA700DFA2C2 /* XCTestCase+SimulateBackground.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCTestCase+SimulateBackground.swift"; sourceTree = ""; }; E4577D7C2B9F5BE400DFA2C2 /* XCTestCase+SimulateNotifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCTestCase+SimulateNotifications.swift"; sourceTree = ""; }; - E45F8C962BC5881E007AC144 /* MRUMSharedProtocols */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = MRUMSharedProtocols; path = ../MRUMSharedProtocols; sourceTree = ""; }; - E45F8C972BC5886E007AC144 /* MRUMSessionReplayProxy */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = MRUMSessionReplayProxy; path = ../MRUMSessionReplayProxy; sourceTree = ""; }; - E45F8C982BC588AC007AC144 /* MRUMLogger */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = MRUMLogger; path = ../MRUMLogger; sourceTree = ""; }; - E45F8C992BC588CE007AC144 /* MRUMOTel */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = MRUMOTel; path = ../MRUMOTel; sourceTree = ""; }; - E45F8C9A2BC588E3007AC144 /* MRUMCrashReports */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = MRUMCrashReports; path = ../MRUMCrashReports; sourceTree = ""; }; - E45F8C9B2BC58911007AC144 /* MRUMANRReporter */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = MRUMANRReporter; path = ../MRUMANRReporter; sourceTree = ""; }; - E46896292B21C85800727A6A /* CiscoRUMTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CiscoRUMTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + E45F8C962BC5881E007AC144 /* SplunkSharedProtocols */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = SplunkSharedProtocols; path = ../SplunkSharedProtocols; sourceTree = ""; }; + E45F8C972BC5886E007AC144 /* SplunkSessionReplayProxy */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = SplunkSessionReplayProxy; path = ../SplunkSessionReplayProxy; sourceTree = ""; }; + E45F8C982BC588AC007AC144 /* SplunkLogger */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = SplunkLogger; path = ../SplunkLogger; sourceTree = ""; }; + E45F8C992BC588CE007AC144 /* SplunkOpenTelemetry */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = SplunkOpenTelemetry; path = ../SplunkOpenTelemetry; sourceTree = ""; }; + E45F8C9A2BC588E3007AC144 /* SplunkCrashReports */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = SplunkCrashReports; path = ../SplunkCrashReports; sourceTree = ""; }; + E45F8C9B2BC58911007AC144 /* SplunkANRReporter */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = SplunkANRReporter; path = ../SplunkANRReporter; sourceTree = ""; }; + E46896292B21C85800727A6A /* SplunkAgentTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SplunkAgentTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; E46896352B21CA0300727A6A /* UserDefaultsStoragePrefixTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsStoragePrefixTests.swift; sourceTree = ""; }; E46896392B21CC7800727A6A /* NanoIDTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NanoIDTests.swift; sourceTree = ""; }; E468963C2B21D8D000727A6A /* API-1.0-UserTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "API-1.0-UserTests.swift"; sourceTree = ""; }; @@ -350,14 +350,14 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 526521F62CB8937800DB3BB9 /* MRUMSlowFrameDetector in Frameworks */, - BAD44D0D2B7878990069E54D /* MRUMNetwork in Frameworks */, - 4B1B151F2BB5858600BEFC4B /* MRUMOTel in Frameworks */, - 4B1B15192BB584E300BEFC4B /* MRUMSessionReplayProxy in Frameworks */, - 4B1B15222BB5859B00BEFC4B /* MRUMLogger in Frameworks */, - 4B1B15162BB584D300BEFC4B /* MRUMSharedProtocols in Frameworks */, - 4B1B15252BB585AC00BEFC4B /* MRUMCrashReports in Frameworks */, - 526659C32B7426B0003E878A /* MRUMANRReporter in Frameworks */, + 526521F62CB8937800DB3BB9 /* SplunkSlowFrameDetector in Frameworks */, + BAD44D0D2B7878990069E54D /* SplunkNetwork in Frameworks */, + 4B1B151F2BB5858600BEFC4B /* SplunkOpenTelemetry in Frameworks */, + 4B1B15192BB584E300BEFC4B /* SplunkSessionReplayProxy in Frameworks */, + 4B1B15222BB5859B00BEFC4B /* SplunkLogger in Frameworks */, + 4B1B15162BB584D300BEFC4B /* SplunkSharedProtocols in Frameworks */, + 4B1B15252BB585AC00BEFC4B /* SplunkCrashReports in Frameworks */, + 526659C32B7426B0003E878A /* SplunkANRReporter in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -365,7 +365,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E468962D2B21C85800727A6A /* CiscoRUM.framework in Frameworks */, + E468962D2B21C85800727A6A /* SplunkAgent.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -490,24 +490,24 @@ 3384F2A32AC879E900512D79 /* Products */ = { isa = PBXGroup; children = ( - 3384F2A22AC879E900512D79 /* CiscoRUM.framework */, - E46896292B21C85800727A6A /* CiscoRUMTests.xctest */, + 3384F2A22AC879E900512D79 /* SplunkAgent.framework */, + E46896292B21C85800727A6A /* SplunkAgentTests.xctest */, ); name = Products; sourceTree = ""; }; - 3384F2A42AC879E900512D79 /* CiscoRUM */ = { + 3384F2A42AC879E900512D79 /* SplunkAgent */ = { isa = PBXGroup; children = ( E4F2E4F42B1727E8006EBA69 /* Public API */, E4F2E4F82B172911006EBA69 /* Agent */, E4F2E50A2B1734E9006EBA69 /* Utils */, E4F2E4FC2B172985006EBA69 /* Extensions */, - E42634822BB44B0F003706A9 /* CiscoRUM.docc */, + E42634822BB44B0F003706A9 /* SplunkAgent.docc */, E4036D052B75226700A9A7A7 /* PrivacyInfo.xcprivacy */, 2A30EE1B2BD7AECE008557DD /* NOTICES */, ); - path = CiscoRUM; + path = SplunkAgent; sourceTree = ""; }; 4B536BF12B67FADC004A6C7C /* Configurations */ = { @@ -825,18 +825,18 @@ E45F8C952BC5881E007AC144 /* Packages */ = { isa = PBXGroup; children = ( - E45F8C962BC5881E007AC144 /* MRUMSharedProtocols */, - E45F8C972BC5886E007AC144 /* MRUMSessionReplayProxy */, - E45F8C982BC588AC007AC144 /* MRUMLogger */, - E45F8C992BC588CE007AC144 /* MRUMOTel */, - E45F8C9A2BC588E3007AC144 /* MRUMCrashReports */, - E45F8C9B2BC58911007AC144 /* MRUMANRReporter */, - 4B2CF88B2BC8875E005CFC35 /* MRUMNetwork */, + E45F8C962BC5881E007AC144 /* SplunkSharedProtocols */, + E45F8C972BC5886E007AC144 /* SplunkSessionReplayProxy */, + E45F8C982BC588AC007AC144 /* SplunkLogger */, + E45F8C992BC588CE007AC144 /* SplunkOpenTelemetry */, + E45F8C9A2BC588E3007AC144 /* SplunkCrashReports */, + E45F8C9B2BC58911007AC144 /* SplunkANRReporter */, + 4B2CF88B2BC8875E005CFC35 /* SplunkNetwork */, ); name = Packages; sourceTree = ""; }; - E468962A2B21C85800727A6A /* CiscoRUMTests */ = { + E468962A2B21C85800727A6A /* SplunkAgentTests */ = { isa = PBXGroup; children = ( E468964F2B220D8800727A6A /* Agent */, @@ -845,13 +845,13 @@ E4374AFB2B4D885300E3C88E /* Testing Support */, E46896342B21C9D300727A6A /* Utils */, ); - path = CiscoRUMTests; + path = SplunkAgentTests; sourceTree = ""; }; E46896332B21C8FF00727A6A /* Tests */ = { isa = PBXGroup; children = ( - E468962A2B21C85800727A6A /* CiscoRUMTests */, + E468962A2B21C85800727A6A /* SplunkAgentTests */, ); path = Tests; sourceTree = ""; @@ -1037,7 +1037,7 @@ E4E9747A2B1643EE00ACB469 /* Sources */ = { isa = PBXGroup; children = ( - 3384F2A42AC879E900512D79 /* CiscoRUM */, + 3384F2A42AC879E900512D79 /* SplunkAgent */, ); path = Sources; sourceTree = ""; @@ -1075,7 +1075,7 @@ children = ( E4134BA92BC6ABD700F0D2FC /* Model */, 4BB680CA2B7940C0000A54D4 /* Modules */, - 3384F2AC2AC879FD00512D79 /* CiscoRUMAgent.swift */, + 3384F2AC2AC879FD00512D79 /* SplunkRum.swift */, E4F2E5012B172E9C006EBA69 /* API-1.0-Configuration.swift */, E4F2E50F2B1737F2006EBA69 /* API-1.0-Session.swift */, E4F2E5132B173D34006EBA69 /* API-1.0-State.swift */, @@ -1182,9 +1182,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 3384F2A12AC879E900512D79 /* CiscoRUM */ = { + 3384F2A12AC879E900512D79 /* SplunkAgent */ = { isa = PBXNativeTarget; - buildConfigurationList = 3384F2A92AC879E900512D79 /* Build configuration list for PBXNativeTarget "CiscoRUM" */; + buildConfigurationList = 3384F2A92AC879E900512D79 /* Build configuration list for PBXNativeTarget "SplunkAgent" */; buildPhases = ( 3384F29D2AC879E900512D79 /* Headers */, E4F2E4F12B1721FF006EBA69 /* Swift Lint & Swift Format */, @@ -1196,24 +1196,24 @@ ); dependencies = ( ); - name = CiscoRUM; + name = SplunkAgent; packageProductDependencies = ( - BAD44D0C2B7878990069E54D /* MRUMNetwork */, - 526659C22B7426B0003E878A /* MRUMANRReporter */, - 4B1B15152BB584D300BEFC4B /* MRUMSharedProtocols */, - 4B1B15182BB584E300BEFC4B /* MRUMSessionReplayProxy */, - 4B1B151E2BB5858600BEFC4B /* MRUMOTel */, - 4B1B15212BB5859A00BEFC4B /* MRUMLogger */, - 4B1B15242BB585AC00BEFC4B /* MRUMCrashReports */, - 526521F52CB8937800DB3BB9 /* MRUMSlowFrameDetector */, - ); - productName = CiscoRUM; - productReference = 3384F2A22AC879E900512D79 /* CiscoRUM.framework */; + BAD44D0C2B7878990069E54D /* SplunkNetwork */, + 526659C22B7426B0003E878A /* SplunkANRReporter */, + 4B1B15152BB584D300BEFC4B /* SplunkSharedProtocols */, + 4B1B15182BB584E300BEFC4B /* SplunkSessionReplayProxy */, + 4B1B151E2BB5858600BEFC4B /* SplunkOpenTelemetry */, + 4B1B15212BB5859A00BEFC4B /* SplunkLogger */, + 4B1B15242BB585AC00BEFC4B /* SplunkCrashReports */, + 526521F52CB8937800DB3BB9 /* SplunkSlowFrameDetector */, + ); + productName = SplunkAgent; + productReference = 3384F2A22AC879E900512D79 /* SplunkAgent.framework */; productType = "com.apple.product-type.framework"; }; - E46896282B21C85800727A6A /* CiscoRUMTests */ = { + E46896282B21C85800727A6A /* SplunkAgentTests */ = { isa = PBXNativeTarget; - buildConfigurationList = E46896322B21C85800727A6A /* Build configuration list for PBXNativeTarget "CiscoRUMTests" */; + buildConfigurationList = E46896322B21C85800727A6A /* Build configuration list for PBXNativeTarget "SplunkAgentTests" */; buildPhases = ( E46896252B21C85800727A6A /* Sources */, E46896262B21C85800727A6A /* Frameworks */, @@ -1224,9 +1224,9 @@ dependencies = ( E468962F2B21C85800727A6A /* PBXTargetDependency */, ); - name = CiscoRUMTests; - productName = CiscoRUMTests; - productReference = E46896292B21C85800727A6A /* CiscoRUMTests.xctest */; + name = SplunkAgentTests; + productName = SplunkAgentTests; + productReference = E46896292B21C85800727A6A /* SplunkAgentTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -1247,7 +1247,7 @@ }; }; }; - buildConfigurationList = 3384F29C2AC879E900512D79 /* Build configuration list for PBXProject "CiscoRUM" */; + buildConfigurationList = 3384F29C2AC879E900512D79 /* Build configuration list for PBXProject "SplunkAgent" */; compatibilityVersion = "Xcode 14.0"; developmentRegion = en; hasScannedForEncodings = 0; @@ -1262,8 +1262,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 3384F2A12AC879E900512D79 /* CiscoRUM */, - E46896282B21C85800727A6A /* CiscoRUMTests */, + 3384F2A12AC879E900512D79 /* SplunkAgent */, + E46896282B21C85800727A6A /* SplunkAgentTests */, ); }; /* End PBXProject section */ @@ -1309,7 +1309,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "TOOLS_DIR=\"${PROJECT_DIR}/Tools\"\n\n# Check CiscoRUM directory\ncd $PROJECT_DIR\n\"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n\n# Check MRUMlogger package\ncd ../MRUMLogger/\n\"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n\n# Check MRUMSharedProtocols package\ncd ../MRUMSharedProtocols/\n\"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n\n# Check MRUMSessionReplayProxy package\ncd ../MRUMSessionReplayProxy/\n\"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n\n# Check MRUMCrashReports package\ncd ../MRUMCrashReports/\n\"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n\n# Check MRUMSlowFrameDetector package\ncd ../MRUMSlowFrameDetector/\n\"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n\n# Check MRUMNetwork package\ncd ../MRUMNetwork/\n\"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n\n# Check MRUMANRReporter package\n# cd ../MRUMANRReporter/\n# \"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n"; + shellScript = "TOOLS_DIR=\"${PROJECT_DIR}/Tools\"\n\n# Check SplunkAgent directory\ncd $PROJECT_DIR\n\"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n\n# Check SplunkLogger package\ncd ../SplunkLogger/\n\"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n\n# Check SplunkSharedProtocols package\ncd ../SplunkSharedProtocols/\n\"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n\n# Check SplunkSessionReplayProxy package\ncd ../SplunkSessionReplayProxy/\n\"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n\n# Check SplunkCrashReports package\ncd ../SplunkCrashReports/\n\"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n\n# Check SplunkSlowFrameDetector package\ncd ../SplunkSlowFrameDetector/\n\"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n\n# Check SplunkNetwork package\ncd ../SplunkNetwork/\n\"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n\n# Check SplunkANRReporter package\n# cd ../SplunkANRReporter/\n# \"${TOOLS_DIR}/Linting.sh\" --config \"${TOOLS_DIR}/.swiftlint.yml\"\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -1331,7 +1331,7 @@ 2AAD518E2BA97FD500710505 /* DefaultEventManager.swift in Sources */, 4BB680F22B7940C0000A54D4 /* API-1.0-SessionReplayModuleState.swift in Sources */, C703FAB52BAB0D4A000CC11B /* AppStateEvent.swift in Sources */, - 3384F2AD2AC879FD00512D79 /* CiscoRUMAgent.swift in Sources */, + 3384F2AD2AC879FD00512D79 /* SplunkRum.swift in Sources */, E4A708B32B9754B7002C692E /* RepeatingJob.swift in Sources */, E4EE9ED42BA34A400000D594 /* SessionReplayNonOperationalState.swift in Sources */, 2AE43B492B861325002C4A98 /* AgentEvent.swift in Sources */, @@ -1388,7 +1388,7 @@ E4AD34F62B56E4BB004976CA /* DefaultModulesManager.swift in Sources */, 4BB680E92B7940C0000A54D4 /* Status+Conversions.swift in Sources */, E426CFAA2B28C18000094AC0 /* SessionsModel.swift in Sources */, - E42634832BB44B0F003706A9 /* CiscoRUM.docc in Sources */, + E42634832BB44B0F003706A9 /* SplunkAgent.docc in Sources */, E4F2E5142B173D34006EBA69 /* API-1.0-State.swift in Sources */, C73FF4882B6CE749009C53FF /* ConfigurationHandlerError.swift in Sources */, C703FAB32BA9D424000CC11B /* AppState.swift in Sources */, @@ -1474,7 +1474,7 @@ /* Begin PBXTargetDependency section */ E468962F2B21C85800727A6A /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 3384F2A12AC879E900512D79 /* CiscoRUM */; + target = 3384F2A12AC879E900512D79 /* SplunkAgent */; targetProxy = E468962E2B21C85800727A6A /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -1614,9 +1614,10 @@ ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9J84E5CFM9; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -1637,7 +1638,7 @@ MARKETING_VERSION = 24.4.1; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20"; - PRODUCT_BUNDLE_IDENTIFIER = com.appdynamics.CiscoRUM; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.SplunkAgent; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = xros; @@ -1662,10 +1663,11 @@ ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; DEPLOYMENT_POSTPROCESSING = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9J84E5CFM9; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -1686,7 +1688,7 @@ MARKETING_VERSION = 24.4.1; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20"; - PRODUCT_BUNDLE_IDENTIFIER = com.appdynamics.CiscoRUM; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.SplunkAgent; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = xros; @@ -1770,10 +1772,11 @@ ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; DEPLOYMENT_POSTPROCESSING = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9J84E5CFM9; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -1794,7 +1797,7 @@ MARKETING_VERSION = 24.4.1; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20"; - PRODUCT_BUNDLE_IDENTIFIER = com.appdynamics.CiscoRUM; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.SplunkAgent; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = xros; @@ -1822,7 +1825,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.cisco.mrum.CiscoRUMTests; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.SplunkAgentTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator xros xrsimulator"; @@ -1904,10 +1907,11 @@ ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; DEPLOYMENT_POSTPROCESSING = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9J84E5CFM9; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -1928,7 +1932,7 @@ MARKETING_VERSION = 24.4.1; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20"; - PRODUCT_BUNDLE_IDENTIFIER = com.appdynamics.CiscoRUM; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.SplunkAgent; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = xros; @@ -1956,7 +1960,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.cisco.mrum.CiscoRUMTests; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.SplunkAgentTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator xros xrsimulator"; @@ -2045,9 +2049,10 @@ ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9J84E5CFM9; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -2069,7 +2074,7 @@ MARKETING_VERSION = 24.4.1; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20"; - PRODUCT_BUNDLE_IDENTIFIER = com.appdynamics.CiscoRUM; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.SplunkAgent; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = xros; @@ -2098,7 +2103,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.cisco.mrum.CiscoRUMTests; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.SplunkAgentTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator xros xrsimulator"; @@ -2186,9 +2191,10 @@ ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9J84E5CFM9; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -2210,7 +2216,7 @@ MARKETING_VERSION = 24.4.1; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20"; - PRODUCT_BUNDLE_IDENTIFIER = com.appdynamics.CiscoRUM; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.SplunkAgent; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = xros; @@ -2239,7 +2245,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.cisco.mrum.CiscoRUMTests; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.SplunkAgentTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator xros xrsimulator"; @@ -2264,7 +2270,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.cisco.mrum.CiscoRUMTests; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.SplunkAgentTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator xros xrsimulator"; @@ -2289,7 +2295,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.cisco.mrum.CiscoRUMTests; + PRODUCT_BUNDLE_IDENTIFIER = com.splunk.rum.SplunkAgentTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator xros xrsimulator"; @@ -2307,7 +2313,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 3384F29C2AC879E900512D79 /* Build configuration list for PBXProject "CiscoRUM" */ = { + 3384F29C2AC879E900512D79 /* Build configuration list for PBXProject "SplunkAgent" */ = { isa = XCConfigurationList; buildConfigurations = ( 3384F2A72AC879E900512D79 /* Debug */, @@ -2320,7 +2326,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3384F2A92AC879E900512D79 /* Build configuration list for PBXNativeTarget "CiscoRUM" */ = { + 3384F2A92AC879E900512D79 /* Build configuration list for PBXNativeTarget "SplunkAgent" */ = { isa = XCConfigurationList; buildConfigurations = ( 3384F2AA2AC879E900512D79 /* Debug */, @@ -2333,7 +2339,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E46896322B21C85800727A6A /* Build configuration list for PBXNativeTarget "CiscoRUMTests" */ = { + E46896322B21C85800727A6A /* Build configuration list for PBXNativeTarget "SplunkAgentTests" */ = { isa = XCConfigurationList; buildConfigurations = ( E46896302B21C85800727A6A /* Debug */, @@ -2349,37 +2355,37 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 4B1B15152BB584D300BEFC4B /* MRUMSharedProtocols */ = { + 4B1B15152BB584D300BEFC4B /* SplunkSharedProtocols */ = { isa = XCSwiftPackageProductDependency; - productName = MRUMSharedProtocols; + productName = SplunkSharedProtocols; }; - 4B1B15182BB584E300BEFC4B /* MRUMSessionReplayProxy */ = { + 4B1B15182BB584E300BEFC4B /* SplunkSessionReplayProxy */ = { isa = XCSwiftPackageProductDependency; - productName = MRUMSessionReplayProxy; + productName = SplunkSessionReplayProxy; }; - 4B1B151E2BB5858600BEFC4B /* MRUMOTel */ = { + 4B1B151E2BB5858600BEFC4B /* SplunkOpenTelemetry */ = { isa = XCSwiftPackageProductDependency; - productName = MRUMOTel; + productName = SplunkOpenTelemetry; }; - 4B1B15212BB5859A00BEFC4B /* MRUMLogger */ = { + 4B1B15212BB5859A00BEFC4B /* SplunkLogger */ = { isa = XCSwiftPackageProductDependency; - productName = MRUMLogger; + productName = SplunkLogger; }; - 4B1B15242BB585AC00BEFC4B /* MRUMCrashReports */ = { + 4B1B15242BB585AC00BEFC4B /* SplunkCrashReports */ = { isa = XCSwiftPackageProductDependency; - productName = MRUMCrashReports; + productName = SplunkCrashReports; }; - 526521F52CB8937800DB3BB9 /* MRUMSlowFrameDetector */ = { + 526521F52CB8937800DB3BB9 /* SplunkSlowFrameDetector */ = { isa = XCSwiftPackageProductDependency; - productName = MRUMSlowFrameDetector; + productName = SplunkSlowFrameDetector; }; - 526659C22B7426B0003E878A /* MRUMANRReporter */ = { + 526659C22B7426B0003E878A /* SplunkANRReporter */ = { isa = XCSwiftPackageProductDependency; - productName = MRUMANRReporter; + productName = SplunkANRReporter; }; - BAD44D0C2B7878990069E54D /* MRUMNetwork */ = { + BAD44D0C2B7878990069E54D /* SplunkNetwork */ = { isa = XCSwiftPackageProductDependency; - productName = MRUMNetwork; + productName = SplunkNetwork; }; /* End XCSwiftPackageProductDependency section */ }; diff --git a/MRUMAgent/CiscoRUM.xcodeproj/xcshareddata/xcschemes/CiscoRUM.xcscheme b/SplunkAgent/SplunkAgent.xcodeproj/xcshareddata/xcschemes/SplunkAgent.xcscheme similarity index 86% rename from MRUMAgent/CiscoRUM.xcodeproj/xcshareddata/xcschemes/CiscoRUM.xcscheme rename to SplunkAgent/SplunkAgent.xcodeproj/xcshareddata/xcschemes/SplunkAgent.xcscheme index a8eee0a9..37928709 100644 --- a/MRUMAgent/CiscoRUM.xcodeproj/xcshareddata/xcschemes/CiscoRUM.xcscheme +++ b/SplunkAgent/SplunkAgent.xcodeproj/xcshareddata/xcschemes/SplunkAgent.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "SplunkAgent.framework" + BlueprintName = "SplunkAgent" + ReferencedContainer = "container:SplunkAgent.xcodeproj"> @@ -50,9 +50,9 @@ + BuildableName = "SplunkAgent.framework" + BlueprintName = "SplunkAgent" + ReferencedContainer = "container:SplunkAgent.xcodeproj"> diff --git a/MRUMAgent/CiscoRUM.xcodeproj/xcshareddata/xcschemes/CiscoRUMTests.xcscheme b/SplunkAgent/SplunkAgent.xcodeproj/xcshareddata/xcschemes/SplunkAgentTests.xcscheme similarity index 90% rename from MRUMAgent/CiscoRUM.xcodeproj/xcshareddata/xcschemes/CiscoRUMTests.xcscheme rename to SplunkAgent/SplunkAgent.xcodeproj/xcshareddata/xcschemes/SplunkAgentTests.xcscheme index 5326762b..382b1e4f 100644 --- a/MRUMAgent/CiscoRUM.xcodeproj/xcshareddata/xcschemes/CiscoRUMTests.xcscheme +++ b/SplunkAgent/SplunkAgent.xcodeproj/xcshareddata/xcschemes/SplunkAgentTests.xcscheme @@ -19,9 +19,9 @@ + BuildableName = "SplunkAgentTests.xctest" + BlueprintName = "SplunkAgentTests" + ReferencedContainer = "container:SplunkAgent.xcodeproj"> diff --git a/MRUMAgent/Tests/CiscoRUMTests/Agent/AppState/AppStateManagerTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Agent/AppState/AppStateManagerTests.swift similarity index 99% rename from MRUMAgent/Tests/CiscoRUMTests/Agent/AppState/AppStateManagerTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Agent/AppState/AppStateManagerTests.swift index 9a87d1db..705572dd 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Agent/AppState/AppStateManagerTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Agent/AppState/AppStateManagerTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest class AppStateManagerTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Agent/Configuration/ConfigurationHandlerTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Agent/Configuration/ConfigurationHandlerTests.swift similarity index 94% rename from MRUMAgent/Tests/CiscoRUMTests/Agent/Configuration/ConfigurationHandlerTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Agent/Configuration/ConfigurationHandlerTests.swift index caa6cbf1..36d5e63c 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Agent/Configuration/ConfigurationHandlerTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Agent/Configuration/ConfigurationHandlerTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest class ConfigurationHandlerTests: XCTestCase { @@ -24,7 +24,7 @@ class ConfigurationHandlerTests: XCTestCase { let storeConfiguration = try RawMockDataBuilder.build(mockFile: .alternativeRemoteConfiguration) let storage = UserDefaultsStorage() - storage.keysPrefix = "com.cisco.mrum.test." + storage.keysPrefix = "com.splunk.rum.test." try storage.update(storeConfiguration, forKey: ConfigurationHandler.configurationStoreKey) let defaultConfig = try ConfigurationTestBuilder.buildDefault() @@ -44,7 +44,7 @@ class ConfigurationHandlerTests: XCTestCase { let expectation = XCTestExpectation(description: "Delayed execution") let storage = UserDefaultsStorage() - storage.keysPrefix = "com.cisco.mrum.test." + storage.keysPrefix = "com.splunk.rum.test." let defaultConfig = try ConfigurationTestBuilder.buildDefault() let dataResponse = try RawMockDataBuilder.build(mockFile: .alternativeRemoteConfiguration) diff --git a/MRUMAgent/Tests/CiscoRUMTests/Agent/DefaultUserTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Agent/DefaultUserTests.swift similarity index 98% rename from MRUMAgent/Tests/CiscoRUMTests/Agent/DefaultUserTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Agent/DefaultUserTests.swift index 7817e6fc..dc9ea019 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Agent/DefaultUserTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Agent/DefaultUserTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest final class DefaultUserTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Agent/Events/EventsModelTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Agent/Events/EventsModelTests.swift similarity index 99% rename from MRUMAgent/Tests/CiscoRUMTests/Agent/Events/EventsModelTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Agent/Events/EventsModelTests.swift index 2b99972c..ce1e3800 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Agent/Events/EventsModelTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Agent/Events/EventsModelTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest diff --git a/MRUMAgent/Tests/CiscoRUMTests/Agent/Events/EventsTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Agent/Events/EventsTests.swift similarity index 97% rename from MRUMAgent/Tests/CiscoRUMTests/Agent/Events/EventsTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Agent/Events/EventsTests.swift index f040241a..bf0cc132 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Agent/Events/EventsTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Agent/Events/EventsTests.swift @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM -@testable import MRUMOTel +@testable import SplunkAgent +@testable import SplunkOpenTelemetry @testable import CiscoSessionReplay -@testable import MRUMSharedProtocols +@testable import SplunkSharedProtocols import XCTest @@ -26,7 +26,7 @@ final class EventsTests: XCTestCase { // MARK: - Private - private var agent: CiscoRUMAgent? + private var agent: SplunkRum? private var sampleVideoData: Data? @@ -266,7 +266,7 @@ final class EventsTests: XCTestCase { } } - func checkEventBaseAttributes(_ event: MRUMSharedProtocols.Event) throws { + func checkEventBaseAttributes(_ event: SplunkSharedProtocols.Event) throws { XCTAssertNotNil(event.domain) XCTAssertNotNil(event.name) XCTAssertNotNil(event.instrumentationScope) diff --git a/MRUMAgent/Tests/CiscoRUMTests/Agent/Modules/AgentModulesManagerTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Agent/Modules/AgentModulesManagerTests.swift similarity index 94% rename from MRUMAgent/Tests/CiscoRUMTests/Agent/Modules/AgentModulesManagerTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Agent/Modules/AgentModulesManagerTests.swift index 810f20e8..711da287 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Agent/Modules/AgentModulesManagerTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Agent/Modules/AgentModulesManagerTests.swift @@ -15,8 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM -import MRUMSharedProtocols +@testable import SplunkAgent +import SplunkSharedProtocols import XCTest final class AgentModulesManagerTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Agent/Modules/DefaultModulesManagerTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Agent/Modules/DefaultModulesManagerTests.swift similarity index 99% rename from MRUMAgent/Tests/CiscoRUMTests/Agent/Modules/DefaultModulesManagerTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Agent/Modules/DefaultModulesManagerTests.swift index 31105ec4..a769c122 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Agent/Modules/DefaultModulesManagerTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Agent/Modules/DefaultModulesManagerTests.swift @@ -15,8 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM -import MRUMSharedProtocols +@testable import SplunkAgent +import SplunkSharedProtocols import XCTest final class DefaultModulesManagerTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Agent/Modules/ModuleAcceptHelpersTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Agent/Modules/ModuleAcceptHelpersTests.swift similarity index 98% rename from MRUMAgent/Tests/CiscoRUMTests/Agent/Modules/ModuleAcceptHelpersTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Agent/Modules/ModuleAcceptHelpersTests.swift index 544c4b64..746de566 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Agent/Modules/ModuleAcceptHelpersTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Agent/Modules/ModuleAcceptHelpersTests.swift @@ -15,8 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM -import MRUMSharedProtocols +@testable import SplunkAgent +import SplunkSharedProtocols import XCTest final class ModuleAcceptHelpersTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Agent/Resources/ResourcesTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Agent/Resources/ResourcesTests.swift similarity index 96% rename from MRUMAgent/Tests/CiscoRUMTests/Agent/Resources/ResourcesTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Agent/Resources/ResourcesTests.swift index 0671cb8a..54405474 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Agent/Resources/ResourcesTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Agent/Resources/ResourcesTests.swift @@ -16,9 +16,9 @@ limitations under the License. */ @testable import OpenTelemetrySdk -@testable import CiscoRUM -@testable import MRUMOTel -@testable import MRUMSharedProtocols +@testable import SplunkAgent +@testable import SplunkOpenTelemetry +@testable import SplunkSharedProtocols import XCTest @@ -85,7 +85,7 @@ final class ResourcesTests: XCTestCase { XCTAssertFalse(osType.description.isEmpty) // Test agent version - let agentVersion = try XCTUnwrap(otelResource.attributes["com.appdynamics.agent.version"]) + let agentVersion = try XCTUnwrap(otelResource.attributes["com.splunk.rum.agent.version"]) XCTAssertFalse(agentVersion.description.isEmpty) } } diff --git a/MRUMAgent/Tests/CiscoRUMTests/Agent/Session/DefaultSessionTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Agent/Session/DefaultSessionTests.swift similarity index 99% rename from MRUMAgent/Tests/CiscoRUMTests/Agent/Session/DefaultSessionTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Agent/Session/DefaultSessionTests.swift index 137e6df9..be26307f 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Agent/Session/DefaultSessionTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Agent/Session/DefaultSessionTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest final class DefaultSessionTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Agent/Session/SessionsModelTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Agent/Session/SessionsModelTests.swift similarity index 99% rename from MRUMAgent/Tests/CiscoRUMTests/Agent/Session/SessionsModelTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Agent/Session/SessionsModelTests.swift index 3956017f..ff826cba 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Agent/Session/SessionsModelTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Agent/Session/SessionsModelTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest final class SessionsModelTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Agent/State/DefaultSharedStateTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Agent/State/DefaultSharedStateTests.swift similarity index 98% rename from MRUMAgent/Tests/CiscoRUMTests/Agent/State/DefaultSharedStateTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Agent/State/DefaultSharedStateTests.swift index 0870d7f7..b1f49d3d 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Agent/State/DefaultSharedStateTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Agent/State/DefaultSharedStateTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest final class DefaultSharedStateTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Agent/State/RuntimeStateTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Agent/State/RuntimeStateTests.swift similarity index 99% rename from MRUMAgent/Tests/CiscoRUMTests/Agent/State/RuntimeStateTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Agent/State/RuntimeStateTests.swift index 74ff92d9..c10cbb9d 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Agent/State/RuntimeStateTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Agent/State/RuntimeStateTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import CiscoRUM +import SplunkAgent import XCTest final class RuntimeStateTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Extensions/NanoIDTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Extensions/NanoIDTests.swift similarity index 100% rename from MRUMAgent/Tests/CiscoRUMTests/Extensions/NanoIDTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Extensions/NanoIDTests.swift diff --git a/MRUMAgent/Tests/CiscoRUMTests/Extensions/XCTestCase+SimulateBackground.swift b/SplunkAgent/Tests/SplunkAgentTests/Extensions/XCTestCase+SimulateBackground.swift similarity index 98% rename from MRUMAgent/Tests/CiscoRUMTests/Extensions/XCTestCase+SimulateBackground.swift rename to SplunkAgent/Tests/SplunkAgentTests/Extensions/XCTestCase+SimulateBackground.swift index 00ae5154..753d55cc 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Extensions/XCTestCase+SimulateBackground.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Extensions/XCTestCase+SimulateBackground.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest // swiftformat:disable indent diff --git a/MRUMAgent/Tests/CiscoRUMTests/Extensions/XCTestCase+SimulateNotifications.swift b/SplunkAgent/Tests/SplunkAgentTests/Extensions/XCTestCase+SimulateNotifications.swift similarity index 100% rename from MRUMAgent/Tests/CiscoRUMTests/Extensions/XCTestCase+SimulateNotifications.swift rename to SplunkAgent/Tests/SplunkAgentTests/Extensions/XCTestCase+SimulateNotifications.swift diff --git a/MRUMAgent/Tests/CiscoRUMTests/Extensions/XCTestCase+SimulateWait.swift b/SplunkAgent/Tests/SplunkAgentTests/Extensions/XCTestCase+SimulateWait.swift similarity index 100% rename from MRUMAgent/Tests/CiscoRUMTests/Extensions/XCTestCase+SimulateWait.swift rename to SplunkAgent/Tests/SplunkAgentTests/Extensions/XCTestCase+SimulateWait.swift diff --git a/MRUMAgent/Tests/CiscoRUMTests/Public API/API-1.0-AgentTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Public API/API-1.0-AgentTests.swift similarity index 89% rename from MRUMAgent/Tests/CiscoRUMTests/Public API/API-1.0-AgentTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Public API/API-1.0-AgentTests.swift index 1aa718e3..1d84a05d 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Public API/API-1.0-AgentTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Public API/API-1.0-AgentTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest final class API10AgentTests: XCTestCase { @@ -28,7 +28,7 @@ final class API10AgentTests: XCTestCase { // Agent install let configuration = try ConfigurationTestBuilder.buildDefault() - var agent: CiscoRUMAgent? = CiscoRUMAgent.install(with: configuration) + var agent: SplunkRum? = SplunkRum.install(with: configuration) // The agent should run after install let agentStatus = try XCTUnwrap(agent?.state.status) @@ -36,7 +36,7 @@ final class API10AgentTests: XCTestCase { XCTAssertEqual(agentStatus, expectedStatus) // Another attempt to install should return an instance from the previous attempt - let anotherAgentInstance = CiscoRUMAgent.install(with: configuration) + let anotherAgentInstance = SplunkRum.install(with: configuration) XCTAssertTrue(agent === anotherAgentInstance) agent = nil diff --git a/MRUMAgent/Tests/CiscoRUMTests/Public API/API-1.0-ConfigurationTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Public API/API-1.0-ConfigurationTests.swift similarity index 99% rename from MRUMAgent/Tests/CiscoRUMTests/Public API/API-1.0-ConfigurationTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Public API/API-1.0-ConfigurationTests.swift index 30d445cd..e2f0a6e1 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Public API/API-1.0-ConfigurationTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Public API/API-1.0-ConfigurationTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import CiscoRUM +import SplunkAgent import XCTest final class API10ConfigurationTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Public API/API-1.0-SessionTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Public API/API-1.0-SessionTests.swift similarity index 98% rename from MRUMAgent/Tests/CiscoRUMTests/Public API/API-1.0-SessionTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Public API/API-1.0-SessionTests.swift index 3bbcb837..88a50b29 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Public API/API-1.0-SessionTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Public API/API-1.0-SessionTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import CiscoRUM +import SplunkAgent import XCTest final class API10SessionTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Public API/API-1.0-StateTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Public API/API-1.0-StateTests.swift similarity index 100% rename from MRUMAgent/Tests/CiscoRUMTests/Public API/API-1.0-StateTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Public API/API-1.0-StateTests.swift diff --git a/MRUMAgent/Tests/CiscoRUMTests/Public API/API-1.0-UserTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Public API/API-1.0-UserTests.swift similarity index 100% rename from MRUMAgent/Tests/CiscoRUMTests/Public API/API-1.0-UserTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Public API/API-1.0-UserTests.swift diff --git a/MRUMAgent/Tests/CiscoRUMTests/Public API/Modules/SessionReplay/API-1.0-ExtensionsTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Public API/Modules/SessionReplay/API-1.0-ExtensionsTests.swift similarity index 96% rename from MRUMAgent/Tests/CiscoRUMTests/Public API/Modules/SessionReplay/API-1.0-ExtensionsTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Public API/Modules/SessionReplay/API-1.0-ExtensionsTests.swift index 30e1cf9e..d772827b 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Public API/Modules/SessionReplay/API-1.0-ExtensionsTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Public API/Modules/SessionReplay/API-1.0-ExtensionsTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest final class SessionReplayAPI10ExtensionsTests: XCTestCase { @@ -30,7 +30,7 @@ final class SessionReplayAPI10ExtensionsTests: XCTestCase { // Agent install with initialized Session Replay module (by default) let configuration = try ConfigurationTestBuilder.buildDefault() - let agent = CiscoRUMAgent.install(with: configuration) + let agent = SplunkRum.install(with: configuration) // Stop recording immediately (we don't need it) agent.sessionReplay.stop() diff --git a/MRUMAgent/Tests/CiscoRUMTests/Public API/Modules/SessionReplay/API-1.0-ModuleProxyTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Public API/Modules/SessionReplay/API-1.0-ModuleProxyTests.swift similarity index 99% rename from MRUMAgent/Tests/CiscoRUMTests/Public API/Modules/SessionReplay/API-1.0-ModuleProxyTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Public API/Modules/SessionReplay/API-1.0-ModuleProxyTests.swift index f47dc203..102a84fe 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Public API/Modules/SessionReplay/API-1.0-ModuleProxyTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Public API/Modules/SessionReplay/API-1.0-ModuleProxyTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest final class SessionReplayAPI10ModuleProxyTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Public API/Modules/SessionReplay/API-1.0-NonOperationalProxyTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Public API/Modules/SessionReplay/API-1.0-NonOperationalProxyTests.swift similarity index 99% rename from MRUMAgent/Tests/CiscoRUMTests/Public API/Modules/SessionReplay/API-1.0-NonOperationalProxyTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Public API/Modules/SessionReplay/API-1.0-NonOperationalProxyTests.swift index f97aec0b..1c199830 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Public API/Modules/SessionReplay/API-1.0-NonOperationalProxyTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Public API/Modules/SessionReplay/API-1.0-NonOperationalProxyTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest final class SessionReplayAPI10NoOpProxyTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Public API/Modules/SessionReplay/API-1.0-TypeConversions.swift b/SplunkAgent/Tests/SplunkAgentTests/Public API/Modules/SessionReplay/API-1.0-TypeConversions.swift similarity index 92% rename from MRUMAgent/Tests/CiscoRUMTests/Public API/Modules/SessionReplay/API-1.0-TypeConversions.swift rename to SplunkAgent/Tests/SplunkAgentTests/Public API/Modules/SessionReplay/API-1.0-TypeConversions.swift index 3968897a..3ebaec2d 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Public API/Modules/SessionReplay/API-1.0-TypeConversions.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Public API/Modules/SessionReplay/API-1.0-TypeConversions.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent @testable import CiscoSessionReplay import XCTest @@ -31,8 +31,8 @@ final class SessionReplayAPI10TypeConversionsTests: XCTestCase { /* func testRenderingModesToProxyConversion() throws { /* From module to proxy */ - var moduleRenderingMode: MRUMSessionReplayRenderingMode = .default - var proxyRenderingMode: CiscoRUM.RenderingMode = .default + var moduleRenderingMode: SplunkSessionReplayRenderingMode = .default + var proxyRenderingMode: SplunkAgent.RenderingMode = .default // Test for all possible options proxyRenderingMode = .init(with: moduleRenderingMode) @@ -53,7 +53,7 @@ final class SessionReplayAPI10TypeConversionsTests: XCTestCase { func testRenderingModesToModuleConversion() throws { /* From proxy to module */ - var proxyRenderingMode: CiscoRUM.RenderingMode = .default + var proxyRenderingMode: SplunkAgent.RenderingMode = .default var srRenderingMode = proxyRenderingMode.srRenderingMode XCTAssertEqual(srRenderingMode, .default) @@ -78,8 +78,8 @@ final class SessionReplayAPI10TypeConversionsTests: XCTestCase { func testStatusToProxyConversion() throws { /* From module to proxy */ - var moduleStatus: MRUMSessionReplayStatus = .recording - var proxyStatus: CiscoRUM.SessionReplayStatus = .recording + var moduleStatus: SplunkSessionReplayStatus = .recording + var proxyStatus: SplunkAgent.SessionReplayStatus = .recording // Recording @@ -119,7 +119,7 @@ final class SessionReplayAPI10TypeConversionsTests: XCTestCase { func testStatusToModuleConversion() throws { /* From module to proxy */ - var proxyStatus: CiscoRUM.SessionReplayStatus = .recording + var proxyStatus: SplunkAgent.SessionReplayStatus = .recording var srStatus = proxyStatus.srStatus diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Assets/v.mp4 b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Assets/v.mp4 similarity index 100% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Assets/v.mp4 rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Assets/v.mp4 diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/APIClientTestBuilder.swift b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/APIClientTestBuilder.swift similarity index 97% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/APIClientTestBuilder.swift rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/APIClientTestBuilder.swift index 2790de81..c65e34ae 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/APIClientTestBuilder.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/APIClientTestBuilder.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import Foundation final class APIClientTestBuilder { @@ -62,7 +62,7 @@ struct MockEndpoint: Endpoint { class URLProtocolMock: URLProtocol { static var testURLs = [String: Data]() - static let mainUrl = URL(string: "https://www.mrumagent.test")! + static let mainUrl = URL(string: "https://www.SplunkAgent.test")! static let testErrorPath = "error" static let testServerErrorPath = "testServerError" diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/AgentTestBuilder.swift b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/AgentTestBuilder.swift similarity index 88% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/AgentTestBuilder.swift rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/AgentTestBuilder.swift index 8ced2cbc..30511074 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/AgentTestBuilder.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/AgentTestBuilder.swift @@ -15,13 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent final class AgentTestBuilder { // MARK: - Basic builds - public static func buildDefault() throws -> CiscoRUMAgent { + public static func buildDefault() throws -> SplunkRum { // We use prepared configuration let configuration = try ConfigurationTestBuilder.buildDefault() @@ -31,9 +31,9 @@ final class AgentTestBuilder { return agent } - public static func build(with configuration: Configuration, session: AgentSession = DefaultSession()) throws -> CiscoRUMAgent { + public static func build(with configuration: Configuration, session: AgentSession = DefaultSession()) throws -> SplunkRum { // Custom key-value storage instance with different keys for testing - let storage = UserDefaultsStorageTestBuilder.buildCleanStorage(named: "com.cisco.mrum.test.") + let storage = UserDefaultsStorageTestBuilder.buildCleanStorage(named: "com.splunk.rum.test.") let user = DefaultUser(storage: storage) let handler = ConfigurationHandler( @@ -46,7 +46,7 @@ final class AgentTestBuilder { let appStateManager = AppStateManager(appStateModel: appStateModel) // Agent configured for tests - let agent = CiscoRUMAgent( + let agent = SplunkRum( configurationHandler: handler, user: user, session: session, diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/ConfigurationTestBuilder.swift b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/ConfigurationTestBuilder.swift similarity index 98% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/ConfigurationTestBuilder.swift rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/ConfigurationTestBuilder.swift index 9bd1db9e..a18c31f8 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/ConfigurationTestBuilder.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/ConfigurationTestBuilder.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import CiscoRUM +import SplunkAgent import Foundation final class ConfigurationTestBuilder { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/DefaultModulesManagerTestBuilder.swift b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/DefaultModulesManagerTestBuilder.swift similarity index 98% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/DefaultModulesManagerTestBuilder.swift rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/DefaultModulesManagerTestBuilder.swift index b8367d1f..a17df0b5 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/DefaultModulesManagerTestBuilder.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/DefaultModulesManagerTestBuilder.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import Foundation final class DefaultModulesManagerTestBuilder { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/DefaultSessionTestBuilder.swift b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/DefaultSessionTestBuilder.swift similarity index 97% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/DefaultSessionTestBuilder.swift rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/DefaultSessionTestBuilder.swift index 3d4b4ca8..4db13876 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/DefaultSessionTestBuilder.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/DefaultSessionTestBuilder.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent final class DefaultSessionTestBuilder { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/RawMockDataBuilder.swift b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/RawMockDataBuilder.swift similarity index 100% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/RawMockDataBuilder.swift rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/RawMockDataBuilder.swift diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/SessionReplayTestBuilder.swift b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/SessionReplayTestBuilder.swift similarity index 91% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/SessionReplayTestBuilder.swift rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/SessionReplayTestBuilder.swift index 7d532244..8c84d6a2 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/SessionReplayTestBuilder.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/SessionReplayTestBuilder.swift @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import CiscoSessionReplay final class SessionReplayTestBuilder { // MARK: - Basic builds - public static func buildDefault() -> CiscoRUM.SessionReplay { + public static func buildDefault() -> SplunkAgent.SessionReplay { // Build Session Replay proxy with actual Session Replay module let module = CiscoSessionReplay.SessionReplay.instance let moduleProxy = SessionReplay(for: module) diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/UserDefaultsStorageTestBuilder.swift b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/UserDefaultsStorageTestBuilder.swift similarity index 97% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/UserDefaultsStorageTestBuilder.swift rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/UserDefaultsStorageTestBuilder.swift index ce33cb59..d114c589 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Builders/UserDefaultsStorageTestBuilder.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Builders/UserDefaultsStorageTestBuilder.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent final class UserDefaultsStorageTestBuilder { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Mock Data/AlternativeRemoteConfiguration.json b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Mock Data/AlternativeRemoteConfiguration.json similarity index 100% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Mock Data/AlternativeRemoteConfiguration.json rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Mock Data/AlternativeRemoteConfiguration.json diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Mock Data/RemoteConfiguration.json b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Mock Data/RemoteConfiguration.json similarity index 100% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Mock Data/RemoteConfiguration.json rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Mock Data/RemoteConfiguration.json diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Mock Data/RemoteError.json b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Mock Data/RemoteError.json similarity index 100% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Mock Data/RemoteError.json rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Mock Data/RemoteError.json diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Modules/CrashReports/CrashReportsTestModule.swift b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Modules/CrashReports/CrashReportsTestModule.swift similarity index 99% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Modules/CrashReports/CrashReportsTestModule.swift rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Modules/CrashReports/CrashReportsTestModule.swift index ce503266..f4884d6c 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Modules/CrashReports/CrashReportsTestModule.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Modules/CrashReports/CrashReportsTestModule.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols /// A dummy module skeleton for testing logic around modules. class CrashReportsTestModule { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Modules/CrashReports/CrashReportsTestModuleTypes.swift b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Modules/CrashReports/CrashReportsTestModuleTypes.swift similarity index 98% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Modules/CrashReports/CrashReportsTestModuleTypes.swift rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Modules/CrashReports/CrashReportsTestModuleTypes.swift index 405df720..f1255cdb 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Modules/CrashReports/CrashReportsTestModuleTypes.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Modules/CrashReports/CrashReportsTestModuleTypes.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols public struct CrashReportsTestConfiguration: ModuleConfiguration, Equatable { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Modules/SessionReplay/SessionReplayTestModule.swift b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Modules/SessionReplay/SessionReplayTestModule.swift similarity index 99% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Modules/SessionReplay/SessionReplayTestModule.swift rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Modules/SessionReplay/SessionReplayTestModule.swift index d02d5802..409374d9 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Modules/SessionReplay/SessionReplayTestModule.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Modules/SessionReplay/SessionReplayTestModule.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols /// A dummy module skeleton for testing logic around modules. class SessionReplayTestModule { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Modules/SessionReplay/SessionReplayTestModuleTypes.swift b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Modules/SessionReplay/SessionReplayTestModuleTypes.swift similarity index 98% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Modules/SessionReplay/SessionReplayTestModuleTypes.swift rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Modules/SessionReplay/SessionReplayTestModuleTypes.swift index 67ed8be7..7dd8446f 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Modules/SessionReplay/SessionReplayTestModuleTypes.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Modules/SessionReplay/SessionReplayTestModuleTypes.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols public struct SessionReplayTestConfiguration: ModuleConfiguration, Equatable {} diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/TestModulePool.swift b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/TestModulePool.swift similarity index 93% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/TestModulePool.swift rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/TestModulePool.swift index b24492ca..c4bfa529 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/TestModulePool.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/TestModulePool.swift @@ -15,9 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols /// The class implements the default pool of modules available for tests. class TestModulesPool: AgentModulesPool { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Validators/NanoIDValidator.swift b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Validators/NanoIDValidator.swift similarity index 100% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Validators/NanoIDValidator.swift rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Validators/NanoIDValidator.swift diff --git a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Validators/PersistentSessionsValidator.swift b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Validators/PersistentSessionsValidator.swift similarity index 97% rename from MRUMAgent/Tests/CiscoRUMTests/Testing Support/Validators/PersistentSessionsValidator.swift rename to SplunkAgent/Tests/SplunkAgentTests/Testing Support/Validators/PersistentSessionsValidator.swift index 14c3c1e6..9606637d 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Testing Support/Validators/PersistentSessionsValidator.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Testing Support/Validators/PersistentSessionsValidator.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent public class PersistentSessionsValidator { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Utils/APIClient/APIClientTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Utils/APIClient/APIClientTests.swift similarity index 98% rename from MRUMAgent/Tests/CiscoRUMTests/Utils/APIClient/APIClientTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Utils/APIClient/APIClientTests.swift index 5832865b..b044c586 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Utils/APIClient/APIClientTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Utils/APIClient/APIClientTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest class APIClientTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Utils/Info/AppInfoTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Utils/Info/AppInfoTests.swift similarity index 97% rename from MRUMAgent/Tests/CiscoRUMTests/Utils/Info/AppInfoTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Utils/Info/AppInfoTests.swift index 6096bab5..02222abd 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Utils/Info/AppInfoTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Utils/Info/AppInfoTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest final class AppInfoTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Utils/Info/DeviceInfoTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Utils/Info/DeviceInfoTests.swift similarity index 97% rename from MRUMAgent/Tests/CiscoRUMTests/Utils/Info/DeviceInfoTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Utils/Info/DeviceInfoTests.swift index ae7e285e..95884ae3 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Utils/Info/DeviceInfoTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Utils/Info/DeviceInfoTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest final class DeviceInfoTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Utils/Info/SystemInfoTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Utils/Info/SystemInfoTests.swift similarity index 97% rename from MRUMAgent/Tests/CiscoRUMTests/Utils/Info/SystemInfoTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Utils/Info/SystemInfoTests.swift index 4bad36da..28312bc9 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Utils/Info/SystemInfoTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Utils/Info/SystemInfoTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest final class SystemInfoTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Utils/PackageIdentifierTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Utils/PackageIdentifierTests.swift similarity index 98% rename from MRUMAgent/Tests/CiscoRUMTests/Utils/PackageIdentifierTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Utils/PackageIdentifierTests.swift index 32a6ed81..a9e271cb 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Utils/PackageIdentifierTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Utils/PackageIdentifierTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest final class PackageIdentifierTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Utils/Repeating jobs/LifecycleRepeatingJobTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Utils/Repeating jobs/LifecycleRepeatingJobTests.swift similarity index 99% rename from MRUMAgent/Tests/CiscoRUMTests/Utils/Repeating jobs/LifecycleRepeatingJobTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Utils/Repeating jobs/LifecycleRepeatingJobTests.swift index 164fdc17..738f2db4 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Utils/Repeating jobs/LifecycleRepeatingJobTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Utils/Repeating jobs/LifecycleRepeatingJobTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest // swiftformat:disable indent diff --git a/MRUMAgent/Tests/CiscoRUMTests/Utils/Repeating jobs/RepeatingJobTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Utils/Repeating jobs/RepeatingJobTests.swift similarity index 99% rename from MRUMAgent/Tests/CiscoRUMTests/Utils/Repeating jobs/RepeatingJobTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Utils/Repeating jobs/RepeatingJobTests.swift index 40af3836..3eafb74e 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Utils/Repeating jobs/RepeatingJobTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Utils/Repeating jobs/RepeatingJobTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest final class RepeatingJobTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Utils/UserDefaultsStorage/UserDefaultsStorageCRUDTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Utils/UserDefaultsStorage/UserDefaultsStorageCRUDTests.swift similarity index 99% rename from MRUMAgent/Tests/CiscoRUMTests/Utils/UserDefaultsStorage/UserDefaultsStorageCRUDTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Utils/UserDefaultsStorage/UserDefaultsStorageCRUDTests.swift index b0e1af44..0b5ee216 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Utils/UserDefaultsStorage/UserDefaultsStorageCRUDTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Utils/UserDefaultsStorage/UserDefaultsStorageCRUDTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest final class UserDefaultsStorageCRUDTests: XCTestCase { diff --git a/MRUMAgent/Tests/CiscoRUMTests/Utils/UserDefaultsStorage/UserDefaultsStoragePrefixTests.swift b/SplunkAgent/Tests/SplunkAgentTests/Utils/UserDefaultsStorage/UserDefaultsStoragePrefixTests.swift similarity index 98% rename from MRUMAgent/Tests/CiscoRUMTests/Utils/UserDefaultsStorage/UserDefaultsStoragePrefixTests.swift rename to SplunkAgent/Tests/SplunkAgentTests/Utils/UserDefaultsStorage/UserDefaultsStoragePrefixTests.swift index bfdf199b..7356cbbd 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Utils/UserDefaultsStorage/UserDefaultsStoragePrefixTests.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Utils/UserDefaultsStorage/UserDefaultsStoragePrefixTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import XCTest final class UserDefaultsStoragePrefixTests: XCTestCase { @@ -23,7 +23,7 @@ final class UserDefaultsStoragePrefixTests: XCTestCase { // MARK: - Tests func testDefaultKeysPrefix() throws { - let defaultKeysPrefix = "com.cisco.mrum." + let defaultKeysPrefix = "com.splunk.rum." // Default prefix value let storage = UserDefaultsStorage() diff --git a/MRUMAgent/Tests/CiscoRUMTests/Utils/UserDefaultsUtils.swift b/SplunkAgent/Tests/SplunkAgentTests/Utils/UserDefaultsUtils.swift similarity index 97% rename from MRUMAgent/Tests/CiscoRUMTests/Utils/UserDefaultsUtils.swift rename to SplunkAgent/Tests/SplunkAgentTests/Utils/UserDefaultsUtils.swift index 6e6b5e41..e9b42e90 100644 --- a/MRUMAgent/Tests/CiscoRUMTests/Utils/UserDefaultsUtils.swift +++ b/SplunkAgent/Tests/SplunkAgentTests/Utils/UserDefaultsUtils.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import CiscoRUM +@testable import SplunkAgent import Foundation class UserDefaultsUtils { diff --git a/MRUMAgent/Tools/.swiftlint.yml b/SplunkAgent/Tools/.swiftlint.yml similarity index 100% rename from MRUMAgent/Tools/.swiftlint.yml rename to SplunkAgent/Tools/.swiftlint.yml diff --git a/MRUMAgent/Tools/Linting.sh b/SplunkAgent/Tools/Linting.sh similarity index 100% rename from MRUMAgent/Tools/Linting.sh rename to SplunkAgent/Tools/Linting.sh diff --git a/MRUMCrashReports/.gitignore b/SplunkCrashReports/.gitignore similarity index 100% rename from MRUMCrashReports/.gitignore rename to SplunkCrashReports/.gitignore diff --git a/MRUMSharedProtocols/.swiftpm/xcode/xcshareddata/xcschemes/MRUMSharedProtocols.xcscheme b/SplunkCrashReports/.swiftpm/xcode/xcshareddata/xcschemes/SplunkCrashReports.xcscheme similarity index 78% rename from MRUMSharedProtocols/.swiftpm/xcode/xcshareddata/xcschemes/MRUMSharedProtocols.xcscheme rename to SplunkCrashReports/.swiftpm/xcode/xcshareddata/xcschemes/SplunkCrashReports.xcscheme index 246ba71b..8368536b 100644 --- a/MRUMSharedProtocols/.swiftpm/xcode/xcshareddata/xcschemes/MRUMSharedProtocols.xcscheme +++ b/SplunkCrashReports/.swiftpm/xcode/xcshareddata/xcschemes/SplunkCrashReports.xcscheme @@ -1,10 +1,11 @@ + buildImplicitDependencies = "YES" + buildArchitectures = "Automatic"> @@ -33,9 +34,9 @@ skipped = "NO"> @@ -61,9 +62,9 @@ diff --git a/MRUMCrashReports/.swiftpm/xcode/xcshareddata/xcschemes/MRUMCrashReportsTests.xcscheme b/SplunkCrashReports/.swiftpm/xcode/xcshareddata/xcschemes/SplunkCrashReportsTests.xcscheme similarity index 84% rename from MRUMCrashReports/.swiftpm/xcode/xcshareddata/xcschemes/MRUMCrashReportsTests.xcscheme rename to SplunkCrashReports/.swiftpm/xcode/xcshareddata/xcschemes/SplunkCrashReportsTests.xcscheme index 95b62637..93e8a689 100644 --- a/MRUMCrashReports/.swiftpm/xcode/xcshareddata/xcschemes/MRUMCrashReportsTests.xcscheme +++ b/SplunkCrashReports/.swiftpm/xcode/xcshareddata/xcschemes/SplunkCrashReportsTests.xcscheme @@ -1,10 +1,11 @@ + buildImplicitDependencies = "YES" + buildArchitectures = "Automatic"> diff --git a/MRUMCrashReports/Info.plist b/SplunkCrashReports/Info.plist similarity index 100% rename from MRUMCrashReports/Info.plist rename to SplunkCrashReports/Info.plist diff --git a/MRUMCrashReports/Package.swift b/SplunkCrashReports/Package.swift similarity index 64% rename from MRUMCrashReports/Package.swift rename to SplunkCrashReports/Package.swift index eeff19c8..2b5293f6 100644 --- a/MRUMCrashReports/Package.swift +++ b/SplunkCrashReports/Package.swift @@ -4,7 +4,7 @@ import PackageDescription let package = Package( - name: "MRUMCrashReports", + name: "SplunkCrashReports", platforms: [ .iOS(.v13), .tvOS(.v13) @@ -12,23 +12,23 @@ let package = Package( products: [ // Products define the executables and libraries a package produces, making them visible to other packages. .library( - name: "MRUMCrashReports", - targets: ["MRUMCrashReports"]), + name: "SplunkCrashReports", + targets: ["SplunkCrashReports"]), ], dependencies: [ .package(name: "ADCrashReporter", path: "../ADCrashReporter"), - .package(name: "MRUMOTel", path: "../MRUMOTel"), - .package(name: "MRUMSharedProtocols", path: "../MRUMSharedProtocols") + .package(name: "SplunkOpenTelemetry", path: "../SplunkOpenTelemetry"), + .package(name: "SplunkSharedProtocols", path: "../SplunkSharedProtocols") ], targets: [ // Targets are the basic building blocks of a package, defining a module or a test suite. // Targets can depend on other targets in this package and products from dependencies. .target( - name: "MRUMCrashReports", + name: "SplunkCrashReports", dependencies: [ .product(name: "ADCrashReporter", package: "ADCrashReporter"), - .product(name: "MRUMOTel", package: "MRUMOTel"), - .product(name: "MRUMSharedProtocols", package: "MRUMSharedProtocols") + .product(name: "SplunkOpenTelemetry", package: "SplunkOpenTelemetry"), + .product(name: "SplunkSharedProtocols", package: "SplunkSharedProtocols") ], cSettings: [ .define("PLCR_PRIVATE"), @@ -37,7 +37,7 @@ let package = Package( .headerSearchPath("Dependencies/protobuf-c") ]), .testTarget( - name: "MRUMCrashReportsTests", - dependencies: ["MRUMCrashReports", "MRUMSharedProtocols"]), + name: "SplunkCrashReportsTests", + dependencies: ["SplunkCrashReports", "SplunkSharedProtocols"]), ] ) diff --git a/MRUMCrashReports/Sources/MRUMCrashReports/CrashReportConfig.swift b/SplunkCrashReports/Sources/SplunkCrashReports/CrashReportConfig.swift similarity index 97% rename from MRUMCrashReports/Sources/MRUMCrashReports/CrashReportConfig.swift rename to SplunkCrashReports/Sources/SplunkCrashReports/CrashReportConfig.swift index 1530f348..e3c0b1f7 100644 --- a/MRUMCrashReports/Sources/MRUMCrashReports/CrashReportConfig.swift +++ b/SplunkCrashReports/Sources/SplunkCrashReports/CrashReportConfig.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols public struct CrashReportsConfiguration: ModuleConfiguration {} diff --git a/MRUMCrashReports/Sources/MRUMCrashReports/CrashReportJSON.swift b/SplunkCrashReports/Sources/SplunkCrashReports/CrashReportJSON.swift similarity index 100% rename from MRUMCrashReports/Sources/MRUMCrashReports/CrashReportJSON.swift rename to SplunkCrashReports/Sources/SplunkCrashReports/CrashReportJSON.swift diff --git a/MRUMCrashReports/Sources/MRUMCrashReports/CrashReportKeys.swift b/SplunkCrashReports/Sources/SplunkCrashReports/CrashReportKeys.swift similarity index 100% rename from MRUMCrashReports/Sources/MRUMCrashReports/CrashReportKeys.swift rename to SplunkCrashReports/Sources/SplunkCrashReports/CrashReportKeys.swift diff --git a/MRUMCrashReports/Sources/MRUMCrashReports/CrashReports+Module.swift b/SplunkCrashReports/Sources/SplunkCrashReports/CrashReports+Module.swift similarity index 98% rename from MRUMCrashReports/Sources/MRUMCrashReports/CrashReports+Module.swift rename to SplunkCrashReports/Sources/SplunkCrashReports/CrashReports+Module.swift index 185c95ee..9b158fad 100644 --- a/MRUMCrashReports/Sources/MRUMCrashReports/CrashReports+Module.swift +++ b/SplunkCrashReports/Sources/SplunkCrashReports/CrashReports+Module.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols // `String` can be used as an event type that the module produces. // This is due to the fact the Crash Reports module serializes diff --git a/MRUMCrashReports/Sources/MRUMCrashReports/CrashReports.swift b/SplunkCrashReports/Sources/SplunkCrashReports/CrashReports.swift similarity index 99% rename from MRUMCrashReports/Sources/MRUMCrashReports/CrashReports.swift rename to SplunkCrashReports/Sources/SplunkCrashReports/CrashReports.swift index 9577f83b..51b02a34 100644 --- a/MRUMCrashReports/Sources/MRUMCrashReports/CrashReports.swift +++ b/SplunkCrashReports/Sources/SplunkCrashReports/CrashReports.swift @@ -16,8 +16,8 @@ limitations under the License. */ import Foundation -import MRUMSharedProtocols -import MRUMLogger +import SplunkSharedProtocols +import SplunkLogger @_implementationOnly import ADCrashReporter public class CrashReports { diff --git a/MRUMCrashReports/Sources/MRUMCrashReports/Extensions/InternalLoggerConfiguration+Defaults.swift b/SplunkCrashReports/Sources/SplunkCrashReports/Extensions/InternalLoggerConfiguration+Defaults.swift similarity index 81% rename from MRUMCrashReports/Sources/MRUMCrashReports/Extensions/InternalLoggerConfiguration+Defaults.swift rename to SplunkCrashReports/Sources/SplunkCrashReports/Extensions/InternalLoggerConfiguration+Defaults.swift index 6ef3d3bd..11ded254 100644 --- a/MRUMCrashReports/Sources/MRUMCrashReports/Extensions/InternalLoggerConfiguration+Defaults.swift +++ b/SplunkCrashReports/Sources/SplunkCrashReports/Extensions/InternalLoggerConfiguration+Defaults.swift @@ -16,18 +16,18 @@ limitations under the License. */ import Foundation -import MRUMLogger +import SplunkLogger // MARK: Default configuration public extension InternalLoggerConfiguration { /// Provides a default `InternalLoggerConfiguration` with the pre-specified subsystem to - /// "CiscoRUM Crash Reporter" and a variable category. + /// "SplunkAgent Crash Reporter" and a variable category. /// /// - Parameters: /// - category: More finely-grained category of the logged subsystem. - static func crashReporter(subsystem: String = "CiscoRUM Crash Reporter", category: String) -> InternalLoggerConfiguration { + static func crashReporter(subsystem: String = "SplunkAgent Crash Reporter", category: String) -> InternalLoggerConfiguration { return InternalLoggerConfiguration(subsystem: subsystem, category: category) } } diff --git a/MRUMNetwork/Tests/MRUMNetworkTests/MRUMNetworkTests.swift b/SplunkCrashReports/Tests/SplunkCrashReportsTests/SplunkCrashReportsTests.swift similarity index 77% rename from MRUMNetwork/Tests/MRUMNetworkTests/MRUMNetworkTests.swift rename to SplunkCrashReports/Tests/SplunkCrashReportsTests/SplunkCrashReportsTests.swift index 46dd99ad..07c5fae9 100644 --- a/MRUMNetwork/Tests/MRUMNetworkTests/MRUMNetworkTests.swift +++ b/SplunkCrashReports/Tests/SplunkCrashReportsTests/SplunkCrashReportsTests.swift @@ -1,7 +1,7 @@ import XCTest -@testable import MRUMNetwork +@testable import SplunkCrashReports -final class MRUMNetworkTests: XCTestCase { +final class SplunkCrashReportsTests: XCTestCase { func testExample() throws { // XCTest Documentation // https://developer.apple.com/documentation/xctest diff --git a/MRUMLogger/.gitignore b/SplunkLogger/.gitignore similarity index 100% rename from MRUMLogger/.gitignore rename to SplunkLogger/.gitignore diff --git a/MRUMLogger/Package.swift b/SplunkLogger/Package.swift similarity index 58% rename from MRUMLogger/Package.swift rename to SplunkLogger/Package.swift index 851e24d2..58fc1e3f 100644 --- a/MRUMLogger/Package.swift +++ b/SplunkLogger/Package.swift @@ -3,7 +3,7 @@ import PackageDescription let package = Package( - name: "MRUMLogger", + name: "SplunkLogger", platforms: [ .iOS(.v13), .tvOS(.v13), @@ -11,17 +11,17 @@ let package = Package( ], products: [ .library( - name: "MRUMLogger", - targets: ["MRUMLogger"] + name: "SplunkLogger", + targets: ["SplunkLogger"] ) ], targets: [ .target( - name: "MRUMLogger" + name: "SplunkLogger" ), .testTarget( - name: "MRUMLoggerTests", - dependencies: ["MRUMLogger"] + name: "SplunkLoggerTests", + dependencies: ["SplunkLogger"] ) ] ) diff --git a/MRUMLogger/Sources/MRUMLogger/Configuration/Extensions/InternalLoggerConfiguration+Defaults.swift b/SplunkLogger/Sources/SplunkLogger/Configuration/Extensions/InternalLoggerConfiguration+Defaults.swift similarity index 90% rename from MRUMLogger/Sources/MRUMLogger/Configuration/Extensions/InternalLoggerConfiguration+Defaults.swift rename to SplunkLogger/Sources/SplunkLogger/Configuration/Extensions/InternalLoggerConfiguration+Defaults.swift index a7cab9b2..d122222d 100644 --- a/MRUMLogger/Sources/MRUMLogger/Configuration/Extensions/InternalLoggerConfiguration+Defaults.swift +++ b/SplunkLogger/Sources/SplunkLogger/Configuration/Extensions/InternalLoggerConfiguration+Defaults.swift @@ -37,10 +37,10 @@ public extension InternalLoggerConfiguration { } - /// Provides a default `InternalLoggerConfiguration` with the pre-specified subsystem to "Cisco RUM Agent" and a variable category. + /// Provides a default `InternalLoggerConfiguration` with the pre-specified subsystem to "Splunk RUM Agent" and a variable category. /// - Parameters: /// - category: More finely-grained category of the logged subsystem. - static func agent(subsystem: String = "Cisco RUM Agent", category: String) -> InternalLoggerConfiguration { + static func agent(subsystem: String = "Splunk RUM Agent", category: String) -> InternalLoggerConfiguration { return InternalLoggerConfiguration(subsystem: subsystem, category: category) } } diff --git a/MRUMLogger/Sources/MRUMLogger/Configuration/InternalLoggerConfiguration.swift b/SplunkLogger/Sources/SplunkLogger/Configuration/InternalLoggerConfiguration.swift similarity index 100% rename from MRUMLogger/Sources/MRUMLogger/Configuration/InternalLoggerConfiguration.swift rename to SplunkLogger/Sources/SplunkLogger/Configuration/InternalLoggerConfiguration.swift diff --git a/MRUMLogger/Sources/MRUMLogger/Configuration/LoggerConfigurationProvider.swift b/SplunkLogger/Sources/SplunkLogger/Configuration/LoggerConfigurationProvider.swift similarity index 100% rename from MRUMLogger/Sources/MRUMLogger/Configuration/LoggerConfigurationProvider.swift rename to SplunkLogger/Sources/SplunkLogger/Configuration/LoggerConfigurationProvider.swift diff --git a/MRUMLogger/Sources/MRUMLogger/InternalLogger.swift b/SplunkLogger/Sources/SplunkLogger/InternalLogger.swift similarity index 100% rename from MRUMLogger/Sources/MRUMLogger/InternalLogger.swift rename to SplunkLogger/Sources/SplunkLogger/InternalLogger.swift diff --git a/MRUMLogger/Sources/MRUMLogger/LogLevel/Extensions/LogLevel+Defaults.swift b/SplunkLogger/Sources/SplunkLogger/LogLevel/Extensions/LogLevel+Defaults.swift similarity index 100% rename from MRUMLogger/Sources/MRUMLogger/LogLevel/Extensions/LogLevel+Defaults.swift rename to SplunkLogger/Sources/SplunkLogger/LogLevel/Extensions/LogLevel+Defaults.swift diff --git a/MRUMLogger/Sources/MRUMLogger/LogLevel/Extensions/LogLevel+TypeConversions.swift b/SplunkLogger/Sources/SplunkLogger/LogLevel/Extensions/LogLevel+TypeConversions.swift similarity index 100% rename from MRUMLogger/Sources/MRUMLogger/LogLevel/Extensions/LogLevel+TypeConversions.swift rename to SplunkLogger/Sources/SplunkLogger/LogLevel/Extensions/LogLevel+TypeConversions.swift diff --git a/MRUMLogger/Sources/MRUMLogger/LogLevel/LogLevel.swift b/SplunkLogger/Sources/SplunkLogger/LogLevel/LogLevel.swift similarity index 100% rename from MRUMLogger/Sources/MRUMLogger/LogLevel/LogLevel.swift rename to SplunkLogger/Sources/SplunkLogger/LogLevel/LogLevel.swift diff --git a/MRUMLogger/Sources/MRUMLogger/Loggers/LegacyLogger.swift b/SplunkLogger/Sources/SplunkLogger/Loggers/LegacyLogger.swift similarity index 100% rename from MRUMLogger/Sources/MRUMLogger/Loggers/LegacyLogger.swift rename to SplunkLogger/Sources/SplunkLogger/Loggers/LegacyLogger.swift diff --git a/MRUMLogger/Sources/MRUMLogger/Loggers/LoggerProvider.swift b/SplunkLogger/Sources/SplunkLogger/Loggers/LoggerProvider.swift similarity index 100% rename from MRUMLogger/Sources/MRUMLogger/Loggers/LoggerProvider.swift rename to SplunkLogger/Sources/SplunkLogger/Loggers/LoggerProvider.swift diff --git a/MRUMLogger/Sources/MRUMLogger/Loggers/ModernLogger.swift b/SplunkLogger/Sources/SplunkLogger/Loggers/ModernLogger.swift similarity index 100% rename from MRUMLogger/Sources/MRUMLogger/Loggers/ModernLogger.swift rename to SplunkLogger/Sources/SplunkLogger/Loggers/ModernLogger.swift diff --git a/MRUMLogger/Sources/MRUMLogger/Utils/LoggerPrefix.swift b/SplunkLogger/Sources/SplunkLogger/Utils/LoggerPrefix.swift similarity index 95% rename from MRUMLogger/Sources/MRUMLogger/Utils/LoggerPrefix.swift rename to SplunkLogger/Sources/SplunkLogger/Utils/LoggerPrefix.swift index 3fa3d804..b8f52a8f 100644 --- a/MRUMLogger/Sources/MRUMLogger/Utils/LoggerPrefix.swift +++ b/SplunkLogger/Sources/SplunkLogger/Utils/LoggerPrefix.swift @@ -22,7 +22,7 @@ struct LoggerPrefix { // MARK: - Static logger prefix - static let `default`: String = "com.cisco.rum" + static let `default`: String = "com.splunk.rum" // MARK: - Logger prefix diff --git a/MRUMLogger/Sources/MRUMLogger/Validation/LoggerVerbosityValidator.swift b/SplunkLogger/Sources/SplunkLogger/Validation/LoggerVerbosityValidator.swift similarity index 100% rename from MRUMLogger/Sources/MRUMLogger/Validation/LoggerVerbosityValidator.swift rename to SplunkLogger/Sources/SplunkLogger/Validation/LoggerVerbosityValidator.swift diff --git a/MRUMLogger/Sources/MRUMLogger/Verbosity/InternalLoggerVerbosity.swift b/SplunkLogger/Sources/SplunkLogger/Verbosity/InternalLoggerVerbosity.swift similarity index 100% rename from MRUMLogger/Sources/MRUMLogger/Verbosity/InternalLoggerVerbosity.swift rename to SplunkLogger/Sources/SplunkLogger/Verbosity/InternalLoggerVerbosity.swift diff --git a/MRUMLogger/Tests/MRUMLoggerTests/MRUMLoggerTests.swift b/SplunkLogger/Tests/SplunkLoggerTests/SplunkLoggerTests.swift similarity index 92% rename from MRUMLogger/Tests/MRUMLoggerTests/MRUMLoggerTests.swift rename to SplunkLogger/Tests/SplunkLoggerTests/SplunkLoggerTests.swift index a82fd324..b4b59be9 100644 --- a/MRUMLogger/Tests/MRUMLoggerTests/MRUMLoggerTests.swift +++ b/SplunkLogger/Tests/SplunkLoggerTests/SplunkLoggerTests.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import MRUMLogger +@testable import SplunkLogger import XCTest struct NoopLogger: LoggerProvider, LoggerVerbosityValidator { @@ -24,7 +24,7 @@ struct NoopLogger: LoggerProvider, LoggerVerbosityValidator { func log(level: LogLevel, isPrivate: Bool, message: String) {} } -final class MRUMLoggerTests: XCTestCase { +final class SplunkLoggerTests: XCTestCase { var logger: (LoggerProvider & LoggerVerbosityValidator)! var configuration: InternalLoggerConfiguration! @@ -36,7 +36,7 @@ final class MRUMLoggerTests: XCTestCase { } func testShouldLogLevels_givenSilentVerbosity() throws { - configuration = InternalLoggerConfiguration(verbosity: .silent, subsystem: "cisco.rum.tests") + configuration = InternalLoggerConfiguration(verbosity: .silent, subsystem: "com.splunk.rum.tests") logger = NoopLogger(configuration: configuration) let shouldLogError = logger.shouldLog(at: .error) @@ -49,7 +49,7 @@ final class MRUMLoggerTests: XCTestCase { } func testShouldLogLevels_givenStandardVerbosity() throws { - configuration = InternalLoggerConfiguration(verbosity: .standard, subsystem: "cisco.rum.tests") + configuration = InternalLoggerConfiguration(verbosity: .standard, subsystem: "com.splunk.rum.tests") logger = NoopLogger(configuration: configuration) let shouldLogError = logger.shouldLog(at: .error) @@ -62,7 +62,7 @@ final class MRUMLoggerTests: XCTestCase { } func testShouldLogLevels_givenVerboseVerbosity() throws { - configuration = InternalLoggerConfiguration(verbosity: .verbose, subsystem: "cisco.rum.tests") + configuration = InternalLoggerConfiguration(verbosity: .verbose, subsystem: "com.splunk.rum.tests") logger = NoopLogger(configuration: configuration) let shouldLogError = logger.shouldLog(at: .error) diff --git a/MRUMNetwork/Package.swift b/SplunkNetwork/Package.swift similarity index 57% rename from MRUMNetwork/Package.swift rename to SplunkNetwork/Package.swift index 64fc9f51..2a206fd8 100644 --- a/MRUMNetwork/Package.swift +++ b/SplunkNetwork/Package.swift @@ -3,7 +3,7 @@ import PackageDescription let package = Package( - name: "MRUMNetwork", + name: "SplunkNetwork", platforms: [ .iOS(.v13), .tvOS(.v13) @@ -11,24 +11,24 @@ let package = Package( products: [ // Products define the executables and libraries a package produces, making them visible to other packages. .library( - name: "MRUMNetwork", - targets: ["MRUMNetwork"]), + name: "SplunkNetwork", + targets: ["SplunkNetwork"]), ], dependencies: [ - .package(name: "MRUMSharedProtocols", path: "../MRUMSharedProtocols"), - .package(name: "MRUMOTel", path: "../MRUMOTel") + .package(name: "SplunkSharedProtocols", path: "../SplunkSharedProtocols"), + .package(name: "SplunkOpenTelemetry", path: "../SplunkOpenTelemetry") ], targets: [ // Targets are the basic building blocks of a package, defining a module or a test suite. // Targets can depend on other targets in this package and products from dependencies. .target( - name: "MRUMNetwork", + name: "SplunkNetwork", dependencies: [ - "MRUMSharedProtocols", - "MRUMOTel" + "SplunkSharedProtocols", + "SplunkOpenTelemetry" ]), .testTarget( - name: "MRUMNetworkTests", - dependencies: ["MRUMNetwork"]), + name: "SplunkNetworkTests", + dependencies: ["SplunkNetwork"]), ] ) diff --git a/MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Extensions/InternalLoggerConfiguration+Defaults.swift b/SplunkNetwork/Sources/SplunkNetwork/Extensions/InternalLoggerConfiguration+Defaults.swift similarity index 79% rename from MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Extensions/InternalLoggerConfiguration+Defaults.swift rename to SplunkNetwork/Sources/SplunkNetwork/Extensions/InternalLoggerConfiguration+Defaults.swift index 060bc111..5cac3bf5 100644 --- a/MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Extensions/InternalLoggerConfiguration+Defaults.swift +++ b/SplunkNetwork/Sources/SplunkNetwork/Extensions/InternalLoggerConfiguration+Defaults.swift @@ -16,18 +16,18 @@ limitations under the License. */ import Foundation -import MRUMLogger +import SplunkLogger // MARK: Default configuration public extension InternalLoggerConfiguration { /// Provides a default `InternalLoggerConfiguration` with the pre-specified subsystem to - /// "CiscoRUM OTel Background Exporter" and a variable category. + /// "SplunkAgent Network Instrumentation" and a variable category. /// /// - Parameters: /// - category: More finely-grained category of the logged subsystem. - static func backgroundExporter(subsystem: String = "CiscoRUM OTel Background Exporter", category: String) -> InternalLoggerConfiguration { + static func networkInstrumentation(subsystem: String = "SplunkAgent Network Instrumentation", category: String) -> InternalLoggerConfiguration { return InternalLoggerConfiguration(subsystem: subsystem, category: category) } } diff --git a/MRUMNetwork/Sources/MRUMNetwork/NetworkInstrumentation+Module.swift b/SplunkNetwork/Sources/SplunkNetwork/NetworkInstrumentation+Module.swift similarity index 98% rename from MRUMNetwork/Sources/MRUMNetwork/NetworkInstrumentation+Module.swift rename to SplunkNetwork/Sources/SplunkNetwork/NetworkInstrumentation+Module.swift index 917d56c0..5e965af4 100644 --- a/MRUMNetwork/Sources/MRUMNetwork/NetworkInstrumentation+Module.swift +++ b/SplunkNetwork/Sources/SplunkNetwork/NetworkInstrumentation+Module.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols public struct NetworkInstrumentationData: ModuleEventData {} diff --git a/MRUMNetwork/Sources/MRUMNetwork/NetworkInstrumentation.swift b/SplunkNetwork/Sources/SplunkNetwork/NetworkInstrumentation.swift similarity index 99% rename from MRUMNetwork/Sources/MRUMNetwork/NetworkInstrumentation.swift rename to SplunkNetwork/Sources/SplunkNetwork/NetworkInstrumentation.swift index 12490a59..b9e0417a 100644 --- a/MRUMNetwork/Sources/MRUMNetwork/NetworkInstrumentation.swift +++ b/SplunkNetwork/Sources/SplunkNetwork/NetworkInstrumentation.swift @@ -17,8 +17,8 @@ limitations under the License. import Foundation -import MRUMSharedProtocols -import MRUMLogger +import SplunkSharedProtocols +import SplunkLogger import OpenTelemetryApi import URLSessionInstrumentation import OpenTelemetrySdk diff --git a/MRUMNetwork/Sources/MRUMNetwork/NetworkInstrumentationConfig.swift b/SplunkNetwork/Sources/SplunkNetwork/NetworkInstrumentationConfig.swift similarity index 97% rename from MRUMNetwork/Sources/MRUMNetwork/NetworkInstrumentationConfig.swift rename to SplunkNetwork/Sources/SplunkNetwork/NetworkInstrumentationConfig.swift index ef829a61..4a91e2a5 100644 --- a/MRUMNetwork/Sources/MRUMNetwork/NetworkInstrumentationConfig.swift +++ b/SplunkNetwork/Sources/SplunkNetwork/NetworkInstrumentationConfig.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols public struct NetworkInstrumentationConfiguration: ModuleConfiguration {} diff --git a/MRUMOTel/Tests/MRUMOTelTests/MRUMOTelTests.swift b/SplunkNetwork/Tests/SplunkNetworkTests/SplunkNetworkTests.swift similarity index 79% rename from MRUMOTel/Tests/MRUMOTelTests/MRUMOTelTests.swift rename to SplunkNetwork/Tests/SplunkNetworkTests/SplunkNetworkTests.swift index 18b95874..f184e943 100644 --- a/MRUMOTel/Tests/MRUMOTelTests/MRUMOTelTests.swift +++ b/SplunkNetwork/Tests/SplunkNetworkTests/SplunkNetworkTests.swift @@ -1,7 +1,7 @@ import XCTest -@testable import MRUMOTel +@testable import SplunkNetwork -final class MRUMOTelTests: XCTestCase { +final class SplunkNetworkTests: XCTestCase { func testExample() throws { // XCTest Documentation // https://developer.apple.com/documentation/xctest diff --git a/MRUMOTel/.gitignore b/SplunkOpenTelemetry/.gitignore similarity index 100% rename from MRUMOTel/.gitignore rename to SplunkOpenTelemetry/.gitignore diff --git a/MRUMSessionReplayProxy/.swiftpm/xcode/xcshareddata/xcschemes/MRUMSessionReplayProxy.xcscheme b/SplunkOpenTelemetry/.swiftpm/xcode/xcshareddata/xcschemes/SplunkOpenTelemetry.xcscheme similarity index 78% rename from MRUMSessionReplayProxy/.swiftpm/xcode/xcshareddata/xcschemes/MRUMSessionReplayProxy.xcscheme rename to SplunkOpenTelemetry/.swiftpm/xcode/xcshareddata/xcschemes/SplunkOpenTelemetry.xcscheme index 5155c607..e713bfeb 100644 --- a/MRUMSessionReplayProxy/.swiftpm/xcode/xcshareddata/xcschemes/MRUMSessionReplayProxy.xcscheme +++ b/SplunkOpenTelemetry/.swiftpm/xcode/xcshareddata/xcschemes/SplunkOpenTelemetry.xcscheme @@ -1,10 +1,11 @@ + buildImplicitDependencies = "YES" + buildArchitectures = "Automatic"> @@ -33,9 +34,9 @@ skipped = "NO"> @@ -61,9 +62,9 @@ diff --git a/MRUMOTel/.swiftpm/xcode/xcshareddata/xcschemes/MRUMOTelTests.xcscheme b/SplunkOpenTelemetry/.swiftpm/xcode/xcshareddata/xcschemes/SplunkOpenTelemetryTests.xcscheme similarity index 84% rename from MRUMOTel/.swiftpm/xcode/xcshareddata/xcschemes/MRUMOTelTests.xcscheme rename to SplunkOpenTelemetry/.swiftpm/xcode/xcshareddata/xcschemes/SplunkOpenTelemetryTests.xcscheme index 479b65f1..4d77529d 100644 --- a/MRUMOTel/.swiftpm/xcode/xcshareddata/xcschemes/MRUMOTelTests.xcscheme +++ b/SplunkOpenTelemetry/.swiftpm/xcode/xcshareddata/xcschemes/SplunkOpenTelemetryTests.xcscheme @@ -1,10 +1,11 @@ + buildImplicitDependencies = "YES" + buildArchitectures = "Automatic"> diff --git a/MRUMOTel/Package.swift b/SplunkOpenTelemetry/Package.swift similarity index 70% rename from MRUMOTel/Package.swift rename to SplunkOpenTelemetry/Package.swift index 175789cc..9418a165 100644 --- a/MRUMOTel/Package.swift +++ b/SplunkOpenTelemetry/Package.swift @@ -4,7 +4,7 @@ import PackageDescription let package = Package( - name: "MRUMOTel", + name: "SplunkOpenTelemetry", platforms: [ .iOS(.v13), .tvOS(.v13), @@ -13,14 +13,14 @@ let package = Package( products: [ // Products define the executables and libraries a package produces, making them visible to other packages. .library( - name: "MRUMOTel", + name: "SplunkOpenTelemetry", targets: [ - "MRUMOTel", + "SplunkOpenTelemetry", ]), ], dependencies: [ - .package(name: "MRUMOTelBackgroundExporter", path: "../MRUMOTelBackgroundExporter"), - .package(name: "MRUMLogger", path: "../MRUMLogger"), + .package(name: "SplunkOpenTelemetryBackgroundExporter", path: "../SplunkOpenTelemetryBackgroundExporter"), + .package(name: "SplunkLogger", path: "../SplunkLogger"), .package( url: "https://github.com/open-telemetry/opentelemetry-swift", exact: "1.12.1" @@ -30,10 +30,10 @@ let package = Package( // Targets are the basic building blocks of a package, defining a module or a test suite. // Targets can depend on other targets in this package and products from dependencies. .target( - name: "MRUMOTel", + name: "SplunkOpenTelemetry", dependencies: [ - "MRUMOTelBackgroundExporter", - "MRUMLogger", + "SplunkOpenTelemetryBackgroundExporter", + "SplunkLogger", .product(name: "OpenTelemetrySdk", package: "opentelemetry-swift"), .product(name: "URLSessionInstrumentation", package: "opentelemetry-swift"), .product(name: "ResourceExtension", package: "opentelemetry-swift"), @@ -41,7 +41,7 @@ let package = Package( ]), .testTarget( - name: "MRUMOTelTests", - dependencies: ["MRUMOTel"]), + name: "SplunkOpenTelemetryTests", + dependencies: ["SplunkOpenTelemetry"]), ] ) diff --git a/SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/API/ApiPaths.swift b/SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/API/ApiPaths.swift new file mode 100644 index 00000000..dbc65ec4 --- /dev/null +++ b/SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/API/ApiPaths.swift @@ -0,0 +1,23 @@ +// +/* +Copyright 2024 Splunk Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import Foundation + +enum ApiPaths: String { + case logs = "eum/v1/logs" + case traces = "eum/v1/traces" +} diff --git a/MRUMOTel/Sources/MRUMOTel/Log Event Processor/OTLPLogEventProcessor+AgentEvent.swift b/SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/Log Event Processor/OTLPLogEventProcessor+AgentEvent.swift similarity index 75% rename from MRUMOTel/Sources/MRUMOTel/Log Event Processor/OTLPLogEventProcessor+AgentEvent.swift rename to SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/Log Event Processor/OTLPLogEventProcessor+AgentEvent.swift index 74a6c751..a42ea379 100644 --- a/MRUMOTel/Sources/MRUMOTel/Log Event Processor/OTLPLogEventProcessor+AgentEvent.swift +++ b/SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/Log Event Processor/OTLPLogEventProcessor+AgentEvent.swift @@ -1,10 +1,23 @@ // -// MRUM SDK, © 2024 CISCO -// +/* +Copyright 2024 Splunk Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ import Foundation import OpenTelemetryApi -import MRUMSharedProtocols +import SplunkSharedProtocols extension OTLPLogEventProcessor { diff --git a/MRUMOTel/Sources/MRUMOTel/Log Event Processor/OTLPLogEventProcessor.swift b/SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/Log Event Processor/OTLPLogEventProcessor.swift similarity index 81% rename from MRUMOTel/Sources/MRUMOTel/Log Event Processor/OTLPLogEventProcessor.swift rename to SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/Log Event Processor/OTLPLogEventProcessor.swift index cd1fab26..eeb54c24 100644 --- a/MRUMOTel/Sources/MRUMOTel/Log Event Processor/OTLPLogEventProcessor.swift +++ b/SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/Log Event Processor/OTLPLogEventProcessor.swift @@ -1,14 +1,27 @@ // -// MRUM SDK, © 2024 CISCO -// +/* +Copyright 2024 Splunk Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ import Foundation import OpenTelemetryApi import OpenTelemetryProtocolExporterCommon import OpenTelemetrySdk -import MRUMSharedProtocols -import MRUMOTelBackgroundExporter -import MRUMLogger +import SplunkSharedProtocols +import SplunkOpenTelemetryBackgroundExporter +import SplunkLogger /// OTLPLogEventProcessor sends OpenTelemetry Logs enriched with Resources via an instantiated background exporter. public class OTLPLogEventProcessor: LogEventProcessor { @@ -19,10 +32,10 @@ public class OTLPLogEventProcessor: LogEventProcessor { private let loggerProvider: LoggerProvider // Internal Logger - private let internalLogger = InternalLogger(configuration: .default(subsystem: "Cisco RUM OTel", category: "Logs")) + private let internalLogger = InternalLogger(configuration: .default(subsystem: "Splunk RUM OTel", category: "Logs")) // Logger background dispatch queues - private let backgroundQueue = DispatchQueue(label: "com.CiscoRUM.LogEventProcessor", qos: .utility) + private let backgroundQueue = DispatchQueue(label: "com.splunk.rum.LogEventProcessor", qos: .utility) // Stored properties for Unit tests #if DEBUG diff --git a/MRUMOTel/Sources/MRUMOTel/OTel.swift b/SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/OTel.swift similarity index 100% rename from MRUMOTel/Sources/MRUMOTel/OTel.swift rename to SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/OTel.swift diff --git a/MRUMOTel/Sources/MRUMOTel/Resources/Resource+AgentResources.swift b/SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/Resources/Resource+AgentResources.swift similarity index 80% rename from MRUMOTel/Sources/MRUMOTel/Resources/Resource+AgentResources.swift rename to SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/Resources/Resource+AgentResources.swift index 38a62f75..9442c746 100644 --- a/MRUMOTel/Sources/MRUMOTel/Resources/Resource+AgentResources.swift +++ b/SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/Resources/Resource+AgentResources.swift @@ -1,9 +1,22 @@ // -// MRUM SDK, © 2024 CISCO -// +/* +Copyright 2024 Splunk Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols import OpenTelemetryApi import OpenTelemetrySdk @@ -44,7 +57,7 @@ extension Resource { ResourceAttributes.serviceVersion.rawValue: AttributeValue.string(serviceVersion), // SDK info - "com.appdynamics.agent.version": AttributeValue.string(agentVersion), + "com.splunk.rum.agent.version": AttributeValue.string(agentVersion), // Device info ResourceAttributes.deviceModelIdentifier.rawValue: AttributeValue.string(deviceModelIdentifier), diff --git a/MRUMOTel/Sources/MRUMOTel/Trace Processor/OTLPTraceProcessor.swift b/SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/Trace Processor/OTLPTraceProcessor.swift similarity index 73% rename from MRUMOTel/Sources/MRUMOTel/Trace Processor/OTLPTraceProcessor.swift rename to SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/Trace Processor/OTLPTraceProcessor.swift index c5b0a1d6..1cb02c14 100644 --- a/MRUMOTel/Sources/MRUMOTel/Trace Processor/OTLPTraceProcessor.swift +++ b/SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/Trace Processor/OTLPTraceProcessor.swift @@ -1,13 +1,26 @@ // -// MRUM SDK, © 2024 CISCO -// +/* +Copyright 2024 Splunk Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ import Foundation import OpenTelemetryApi import OpenTelemetryProtocolExporterCommon import OpenTelemetrySdk -import MRUMSharedProtocols -import MRUMOTelBackgroundExporter +import SplunkSharedProtocols +import SplunkOpenTelemetryBackgroundExporter /// OTLPTraceProcessor initializes and uses OpenTelemetry Trace Provider. /// diff --git a/MRUMOTel/Sources/MRUMOTel/Utils/AttributeValue+MrumEventAttributeValue.swift b/SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/Utils/AttributeValue+MrumEventAttributeValue.swift similarity index 51% rename from MRUMOTel/Sources/MRUMOTel/Utils/AttributeValue+MrumEventAttributeValue.swift rename to SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/Utils/AttributeValue+MrumEventAttributeValue.swift index 9288312f..1cba1c87 100644 --- a/MRUMOTel/Sources/MRUMOTel/Utils/AttributeValue+MrumEventAttributeValue.swift +++ b/SplunkOpenTelemetry/Sources/SplunkOpenTelemetry/Utils/AttributeValue+MrumEventAttributeValue.swift @@ -1,9 +1,22 @@ // -// MRUM SDK, © 2024 CISCO -// +/* +Copyright 2024 Splunk Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols import OpenTelemetryApi extension AttributeValue { diff --git a/MRUMANRReporter/Tests/MRUMANRReporterTests/MRUMANRReporterTests.swift b/SplunkOpenTelemetry/Tests/SplunkOpenTelemetryTests/SplunkOpenTelemetryTests.swift similarity index 76% rename from MRUMANRReporter/Tests/MRUMANRReporterTests/MRUMANRReporterTests.swift rename to SplunkOpenTelemetry/Tests/SplunkOpenTelemetryTests/SplunkOpenTelemetryTests.swift index bc4675ff..9fa45c1a 100644 --- a/MRUMANRReporter/Tests/MRUMANRReporterTests/MRUMANRReporterTests.swift +++ b/SplunkOpenTelemetry/Tests/SplunkOpenTelemetryTests/SplunkOpenTelemetryTests.swift @@ -1,7 +1,7 @@ import XCTest -@testable import MRUMANRReporter +@testable import SplunkOpenTelemetry -final class MRUMANRReporterTests: XCTestCase { +final class SplunkOpenTelemetryTests: XCTestCase { func testExample() throws { // XCTest Documentation // https://developer.apple.com/documentation/xctest diff --git a/MRUMOTelBackgroundExporter/Package.swift b/SplunkOpenTelemetryBackgroundExporter/Package.swift similarity index 70% rename from MRUMOTelBackgroundExporter/Package.swift rename to SplunkOpenTelemetryBackgroundExporter/Package.swift index d881ec83..f1306a6c 100644 --- a/MRUMOTelBackgroundExporter/Package.swift +++ b/SplunkOpenTelemetryBackgroundExporter/Package.swift @@ -4,7 +4,7 @@ import PackageDescription let package = Package( - name: "MRUMOTelBackgroundExporter", + name: "SplunkOpenTelemetryBackgroundExporter", platforms: [ .iOS(.v13), .tvOS(.v13), @@ -13,13 +13,13 @@ let package = Package( products: [ // Products define the executables and libraries a package produces, making them visible to other packages. .library( - name: "MRUMOTelBackgroundExporter", + name: "SplunkOpenTelemetryBackgroundExporter", targets: [ - "MRUMOTelBackgroundExporter" + "SplunkOpenTelemetryBackgroundExporter" ]) ], dependencies: [ - .package(name: "MRUMLogger", path: "../MRUMLogger"), + .package(name: "SplunkLogger", path: "../SplunkLogger"), .package( url: "https://github.com/open-telemetry/opentelemetry-swift", exact: "1.12.1" @@ -29,15 +29,15 @@ let package = Package( // Targets are the basic building blocks of a package, defining a module or a test suite. // Targets can depend on other targets in this package and products from dependencies. .target( - name: "MRUMOTelBackgroundExporter", + name: "SplunkOpenTelemetryBackgroundExporter", dependencies: [ - "MRUMLogger", + "SplunkLogger", .product(name: "OpenTelemetrySdk", package: "opentelemetry-swift"), .product(name: "OpenTelemetryProtocolExporter", package: "opentelemetry-swift") ]), .testTarget( - name: "MRUMOTelBackgroundExporterTests", - dependencies: ["MRUMOTelBackgroundExporter"]) + name: "SplunkOpenTelemetryBackgroundExporterTests", + dependencies: ["SplunkOpenTelemetryBackgroundExporter"]) ] ) diff --git a/MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/BackgroundHTTPClient.swift b/SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/BackgroundHTTPClient.swift similarity index 99% rename from MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/BackgroundHTTPClient.swift rename to SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/BackgroundHTTPClient.swift index 7f18c2a0..32d7be42 100644 --- a/MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/BackgroundHTTPClient.swift +++ b/SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/BackgroundHTTPClient.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -import MRUMLogger +import SplunkLogger /// Client for sending requests over HTTP. final class BackgroundHTTPClient: NSObject { diff --git a/MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Disk Cache/DiskCache.swift b/SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Disk Cache/DiskCache.swift similarity index 100% rename from MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Disk Cache/DiskCache.swift rename to SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Disk Cache/DiskCache.swift diff --git a/MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Disk Cache/Statistics/DiskCache+Statistics.swift b/SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Disk Cache/Statistics/DiskCache+Statistics.swift similarity index 100% rename from MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Disk Cache/Statistics/DiskCache+Statistics.swift rename to SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Disk Cache/Statistics/DiskCache+Statistics.swift diff --git a/MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Disk Cache/Statistics/DiskCacheStatistics.swift b/SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Disk Cache/Statistics/DiskCacheStatistics.swift similarity index 100% rename from MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Disk Cache/Statistics/DiskCacheStatistics.swift rename to SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Disk Cache/Statistics/DiskCacheStatistics.swift diff --git a/MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Exporters/logs/OTLPBackgroundHTTPLogExporter.swift b/SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Exporters/logs/OTLPBackgroundHTTPLogExporter.swift similarity index 100% rename from MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Exporters/logs/OTLPBackgroundHTTPLogExporter.swift rename to SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Exporters/logs/OTLPBackgroundHTTPLogExporter.swift diff --git a/MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Exporters/metric/OTLPBackgroundHTTPMetricExporter.swift b/SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Exporters/metric/OTLPBackgroundHTTPMetricExporter.swift similarity index 100% rename from MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Exporters/metric/OTLPBackgroundHTTPMetricExporter.swift rename to SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Exporters/metric/OTLPBackgroundHTTPMetricExporter.swift diff --git a/MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Exporters/trace/OTLPBackgroundHTTPTraceExporter.swift b/SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Exporters/trace/OTLPBackgroundHTTPTraceExporter.swift similarity index 100% rename from MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Exporters/trace/OTLPBackgroundHTTPTraceExporter.swift rename to SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Exporters/trace/OTLPBackgroundHTTPTraceExporter.swift diff --git a/MRUMNetwork/Sources/MRUMNetwork/Extensions/InternalLoggerConfiguration+Defaults.swift b/SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Extensions/InternalLoggerConfiguration+Defaults.swift similarity index 81% rename from MRUMNetwork/Sources/MRUMNetwork/Extensions/InternalLoggerConfiguration+Defaults.swift rename to SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Extensions/InternalLoggerConfiguration+Defaults.swift index f62f01f5..aa0625de 100644 --- a/MRUMNetwork/Sources/MRUMNetwork/Extensions/InternalLoggerConfiguration+Defaults.swift +++ b/SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Extensions/InternalLoggerConfiguration+Defaults.swift @@ -16,18 +16,18 @@ limitations under the License. */ import Foundation -import MRUMLogger +import SplunkLogger // MARK: Default configuration public extension InternalLoggerConfiguration { /// Provides a default `InternalLoggerConfiguration` with the pre-specified subsystem to - /// "CiscoRUM Network Instrumentation" and a variable category. + /// "SplunkAgent OTel Background Exporter" and a variable category. /// /// - Parameters: /// - category: More finely-grained category of the logged subsystem. - static func networkInstrumentation(subsystem: String = "CiscoRUM Network Instrumentation", category: String) -> InternalLoggerConfiguration { + static func backgroundExporter(subsystem: String = "SplunkAgent OTel Background Exporter", category: String) -> InternalLoggerConfiguration { return InternalLoggerConfiguration(subsystem: subsystem, category: category) } } diff --git a/MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Extensions/OperationQueue.swift b/SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Extensions/OperationQueue.swift similarity index 100% rename from MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Extensions/OperationQueue.swift rename to SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Extensions/OperationQueue.swift diff --git a/MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Models/RequestDescriptor.swift b/SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Models/RequestDescriptor.swift similarity index 100% rename from MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Models/RequestDescriptor.swift rename to SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Models/RequestDescriptor.swift diff --git a/MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Models/SessionQOSConfiguration.swift b/SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Models/SessionQOSConfiguration.swift similarity index 100% rename from MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/Models/SessionQOSConfiguration.swift rename to SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/Models/SessionQOSConfiguration.swift diff --git a/MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/OTLPBackgroundHTTPBaseExporter.swift b/SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/OTLPBackgroundHTTPBaseExporter.swift similarity index 100% rename from MRUMOTelBackgroundExporter/Sources/MRUMOTelBackgroundExporter/OTLPBackgroundHTTPBaseExporter.swift rename to SplunkOpenTelemetryBackgroundExporter/Sources/SplunkOpenTelemetryBackgroundExporter/OTLPBackgroundHTTPBaseExporter.swift diff --git a/MRUMOTelBackgroundExporter/Tests/MRUMOTelBackgroundExporterTests/MRUMOTelBackgroundExporterTests.swift b/SplunkOpenTelemetryBackgroundExporter/Tests/SplunkOpenTelemetryBackgroundExporterTests/SplunkOpenTelemetryBackgroundExporterTests.swift similarity index 94% rename from MRUMOTelBackgroundExporter/Tests/MRUMOTelBackgroundExporterTests/MRUMOTelBackgroundExporterTests.swift rename to SplunkOpenTelemetryBackgroundExporter/Tests/SplunkOpenTelemetryBackgroundExporterTests/SplunkOpenTelemetryBackgroundExporterTests.swift index 9d5f0bbb..5c78f7ac 100644 --- a/MRUMOTelBackgroundExporter/Tests/MRUMOTelBackgroundExporterTests/MRUMOTelBackgroundExporterTests.swift +++ b/SplunkOpenTelemetryBackgroundExporter/Tests/SplunkOpenTelemetryBackgroundExporterTests/SplunkOpenTelemetryBackgroundExporterTests.swift @@ -1,7 +1,7 @@ import XCTest -@testable import MRUMOTelBackgroundExporter +@testable import SplunkOpenTelemetryBackgroundExporter -final class MRUMOTelBackgroundExporterTests: XCTestCase { +final class SplunkOpenTelemetryBackgroundExporterTests: XCTestCase { // MARK: - Should send tests diff --git a/MRUMSessionReplayProxy/.gitignore b/SplunkSessionReplayProxy/.gitignore similarity index 100% rename from MRUMSessionReplayProxy/.gitignore rename to SplunkSessionReplayProxy/.gitignore diff --git a/MRUMSessionReplayProxy/Package.swift b/SplunkSessionReplayProxy/Package.swift similarity index 83% rename from MRUMSessionReplayProxy/Package.swift rename to SplunkSessionReplayProxy/Package.swift index b7c7e9d6..8fa04f30 100644 --- a/MRUMSessionReplayProxy/Package.swift +++ b/SplunkSessionReplayProxy/Package.swift @@ -5,7 +5,7 @@ import class Foundation.ProcessInfo import PackageDescription let package = Package( - name: "MRUMSessionReplayProxy", + name: "SplunkSessionReplayProxy", platforms: [ .iOS(.v13), .tvOS(.v13), @@ -13,25 +13,25 @@ let package = Package( ], products: [ .library( - name: "MRUMSessionReplayProxy", - targets: ["MRUMSessionReplayProxy"] + name: "SplunkSessionReplayProxy", + targets: ["SplunkSessionReplayProxy"] ) ], dependencies: [ - .package(name: "MRUMSharedProtocols", path: "../MRUMSharedProtocols"), + .package(name: "SplunkSharedProtocols", path: "../SplunkSharedProtocols"), sessionReplayDependency() ], targets: [ .target( - name: "MRUMSessionReplayProxy", + name: "SplunkSessionReplayProxy", dependencies: [ - "MRUMSharedProtocols", + "SplunkSharedProtocols", .product(name: "CiscoSessionReplay", package: "smartlook-ios-sdk-private") ] ), .testTarget( - name: "MRUMSessionReplayProxyTests", - dependencies: ["MRUMSessionReplayProxy"] + name: "SplunkSessionReplayProxyTests", + dependencies: ["SplunkSessionReplayProxy"] ) ] ) diff --git a/MRUMSessionReplayProxy/Sources/MRUMSessionReplayProxy/SessionReplay+Module.swift b/SplunkSessionReplayProxy/Sources/SplunkSessionReplayProxy/SessionReplay+Module.swift similarity index 99% rename from MRUMSessionReplayProxy/Sources/MRUMSessionReplayProxy/SessionReplay+Module.swift rename to SplunkSessionReplayProxy/Sources/SplunkSessionReplayProxy/SessionReplay+Module.swift index da5a1f80..a1dd9e6f 100644 --- a/MRUMSessionReplayProxy/Sources/MRUMSessionReplayProxy/SessionReplay+Module.swift +++ b/SplunkSessionReplayProxy/Sources/SplunkSessionReplayProxy/SessionReplay+Module.swift @@ -17,7 +17,7 @@ limitations under the License. import Foundation import CiscoSessionReplay -import MRUMSharedProtocols +import SplunkSharedProtocols // IMPORTANT NOTES: // diff --git a/SplunkSessionReplayProxy/Tests/SplunkSessionReplayProxyTests/SplunkSessionReplayProxyTests.swift b/SplunkSessionReplayProxy/Tests/SplunkSessionReplayProxyTests/SplunkSessionReplayProxyTests.swift new file mode 100644 index 00000000..1be9735f --- /dev/null +++ b/SplunkSessionReplayProxy/Tests/SplunkSessionReplayProxyTests/SplunkSessionReplayProxyTests.swift @@ -0,0 +1,12 @@ +@testable import SplunkSessionReplayProxy +import XCTest + +final class SplunkSessionReplayProxyTests: XCTestCase { + func testExample() throws { + // XCTest Documentation + // https://developer.apple.com/documentation/xctest + + // Defining Test Cases and Test Methods + // https://developer.apple.com/documentation/xctest/defining_test_cases_and_test_methods + } +} diff --git a/MRUMSharedProtocols/.gitignore b/SplunkSharedProtocols/.gitignore similarity index 100% rename from MRUMSharedProtocols/.gitignore rename to SplunkSharedProtocols/.gitignore diff --git a/MRUMSharedProtocols/Package.swift b/SplunkSharedProtocols/Package.swift similarity index 52% rename from MRUMSharedProtocols/Package.swift rename to SplunkSharedProtocols/Package.swift index 2ec1633d..de7d2917 100644 --- a/MRUMSharedProtocols/Package.swift +++ b/SplunkSharedProtocols/Package.swift @@ -3,7 +3,7 @@ import PackageDescription let package = Package( - name: "MRUMSharedProtocols", + name: "SplunkSharedProtocols", platforms: [ .iOS(.v13), .tvOS(.v13), @@ -11,17 +11,17 @@ let package = Package( ], products: [ .library( - name: "MRUMSharedProtocols", - targets: ["MRUMSharedProtocols"] + name: "SplunkSharedProtocols", + targets: ["SplunkSharedProtocols"] ) ], targets: [ .target( - name: "MRUMSharedProtocols" + name: "SplunkSharedProtocols" ), .testTarget( - name: "MRUMSharedProtocolsTests", - dependencies: ["MRUMSharedProtocols"] + name: "SplunkSharedProtocolsTests", + dependencies: ["SplunkSharedProtocols"] ) ] ) diff --git a/MRUMSharedProtocols/Sources/MRUMSharedProtocols/Agent/AgentSharedState.swift b/SplunkSharedProtocols/Sources/SplunkSharedProtocols/Agent/AgentSharedState.swift similarity index 100% rename from MRUMSharedProtocols/Sources/MRUMSharedProtocols/Agent/AgentSharedState.swift rename to SplunkSharedProtocols/Sources/SplunkSharedProtocols/Agent/AgentSharedState.swift diff --git a/MRUMSharedProtocols/Sources/MRUMSharedProtocols/Events/Event.swift b/SplunkSharedProtocols/Sources/SplunkSharedProtocols/Events/Event.swift similarity index 100% rename from MRUMSharedProtocols/Sources/MRUMSharedProtocols/Events/Event.swift rename to SplunkSharedProtocols/Sources/SplunkSharedProtocols/Events/Event.swift diff --git a/MRUMSharedProtocols/Sources/MRUMSharedProtocols/Events/EventAttributeValue.swift b/SplunkSharedProtocols/Sources/SplunkSharedProtocols/Events/EventAttributeValue.swift similarity index 100% rename from MRUMSharedProtocols/Sources/MRUMSharedProtocols/Events/EventAttributeValue.swift rename to SplunkSharedProtocols/Sources/SplunkSharedProtocols/Events/EventAttributeValue.swift diff --git a/MRUMSharedProtocols/Sources/MRUMSharedProtocols/Events/Processors/LogEventProcessor.swift b/SplunkSharedProtocols/Sources/SplunkSharedProtocols/Events/Processors/LogEventProcessor.swift similarity index 100% rename from MRUMSharedProtocols/Sources/MRUMSharedProtocols/Events/Processors/LogEventProcessor.swift rename to SplunkSharedProtocols/Sources/SplunkSharedProtocols/Events/Processors/LogEventProcessor.swift diff --git a/MRUMSharedProtocols/Sources/MRUMSharedProtocols/Events/Processors/TraceProcessor.swift b/SplunkSharedProtocols/Sources/SplunkSharedProtocols/Events/Processors/TraceProcessor.swift similarity index 100% rename from MRUMSharedProtocols/Sources/MRUMSharedProtocols/Events/Processors/TraceProcessor.swift rename to SplunkSharedProtocols/Sources/SplunkSharedProtocols/Events/Processors/TraceProcessor.swift diff --git a/MRUMSharedProtocols/Sources/MRUMSharedProtocols/Modules/Module.swift b/SplunkSharedProtocols/Sources/SplunkSharedProtocols/Modules/Module.swift similarity index 100% rename from MRUMSharedProtocols/Sources/MRUMSharedProtocols/Modules/Module.swift rename to SplunkSharedProtocols/Sources/SplunkSharedProtocols/Modules/Module.swift diff --git a/MRUMSharedProtocols/Sources/MRUMSharedProtocols/Modules/ModuleConfiguration.swift b/SplunkSharedProtocols/Sources/SplunkSharedProtocols/Modules/ModuleConfiguration.swift similarity index 100% rename from MRUMSharedProtocols/Sources/MRUMSharedProtocols/Modules/ModuleConfiguration.swift rename to SplunkSharedProtocols/Sources/SplunkSharedProtocols/Modules/ModuleConfiguration.swift diff --git a/MRUMSharedProtocols/Sources/MRUMSharedProtocols/Modules/RemoteModuleConfiguration.swift b/SplunkSharedProtocols/Sources/SplunkSharedProtocols/Modules/RemoteModuleConfiguration.swift similarity index 100% rename from MRUMSharedProtocols/Sources/MRUMSharedProtocols/Modules/RemoteModuleConfiguration.swift rename to SplunkSharedProtocols/Sources/SplunkSharedProtocols/Modules/RemoteModuleConfiguration.swift diff --git a/MRUMSharedProtocols/Sources/MRUMSharedProtocols/Resources/AgentResources.swift b/SplunkSharedProtocols/Sources/SplunkSharedProtocols/Resources/AgentResources.swift similarity index 100% rename from MRUMSharedProtocols/Sources/MRUMSharedProtocols/Resources/AgentResources.swift rename to SplunkSharedProtocols/Sources/SplunkSharedProtocols/Resources/AgentResources.swift diff --git a/MRUMSharedProtocols/Tests/MRUMSharedProtocolsTests/ModuleTests.swift b/SplunkSharedProtocols/Tests/SplunkSharedProtocolsTests/ModuleTests.swift similarity index 93% rename from MRUMSharedProtocols/Tests/MRUMSharedProtocolsTests/ModuleTests.swift rename to SplunkSharedProtocols/Tests/SplunkSharedProtocolsTests/ModuleTests.swift index 847c059a..93e7d58c 100644 --- a/MRUMSharedProtocols/Tests/MRUMSharedProtocolsTests/ModuleTests.swift +++ b/SplunkSharedProtocols/Tests/SplunkSharedProtocolsTests/ModuleTests.swift @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import MRUMSharedProtocols +@testable import SplunkSharedProtocols import XCTest -final class MRUMSharedProtocolsTests: XCTestCase { +final class SplunkSharedProtocolsTests: XCTestCase { func testModuleProtocols() throws { // Constant Metadata, Data is generated at the start of the test. diff --git a/MRUMSharedProtocols/Tests/MRUMSharedProtocolsTests/TestAgent.swift b/SplunkSharedProtocols/Tests/SplunkSharedProtocolsTests/TestAgent.swift similarity index 96% rename from MRUMSharedProtocols/Tests/MRUMSharedProtocolsTests/TestAgent.swift rename to SplunkSharedProtocols/Tests/SplunkSharedProtocolsTests/TestAgent.swift index f88d65db..9a6e376f 100644 --- a/MRUMSharedProtocols/Tests/MRUMSharedProtocolsTests/TestAgent.swift +++ b/SplunkSharedProtocols/Tests/SplunkSharedProtocolsTests/TestAgent.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import MRUMSharedProtocols +@testable import SplunkSharedProtocols import XCTest public class TestAgent { diff --git a/MRUMSharedProtocols/Tests/MRUMSharedProtocolsTests/TestModule.swift b/SplunkSharedProtocols/Tests/SplunkSharedProtocolsTests/TestModule.swift similarity index 98% rename from MRUMSharedProtocols/Tests/MRUMSharedProtocolsTests/TestModule.swift rename to SplunkSharedProtocols/Tests/SplunkSharedProtocolsTests/TestModule.swift index be9834d1..85ae5071 100644 --- a/MRUMSharedProtocols/Tests/MRUMSharedProtocolsTests/TestModule.swift +++ b/SplunkSharedProtocols/Tests/SplunkSharedProtocolsTests/TestModule.swift @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -@testable import MRUMSharedProtocols +@testable import SplunkSharedProtocols import XCTest // MARK: - Configuration, Metadata and Data diff --git a/MRUMSlowFrameDetector/.gitignore b/SplunkSlowFrameDetector/.gitignore similarity index 100% rename from MRUMSlowFrameDetector/.gitignore rename to SplunkSlowFrameDetector/.gitignore diff --git a/SplunkSlowFrameDetector/Package.swift b/SplunkSlowFrameDetector/Package.swift new file mode 100644 index 00000000..aabd824a --- /dev/null +++ b/SplunkSlowFrameDetector/Package.swift @@ -0,0 +1,40 @@ +// swift-tools-version: 5.9 + +import PackageDescription + +let package = Package( + name: "SplunkSlowFrameDetector", + platforms: [ + .iOS(.v13), + .tvOS(.v13) + ], + products: [ + .library( + name: "SplunkSlowFrameDetector", + targets: [ + "SplunkSlowFrameDetector" + ] + ) + ], + dependencies: [ + .package(name: "SplunkSharedProtocols", + path: "../SplunkSharedProtocols"), + .package(name: "SplunkOpenTelemetry", + path: "../SplunkOpenTelemetry") + ], + targets: [ + .target( + name: "SplunkSlowFrameDetector", + dependencies: [ + .product(name: "SplunkSharedProtocols", + package: "SplunkSharedProtocols"), + .product(name: "SplunkOpenTelemetry", + package: "SplunkOpenTelemetry") + ] + ), + .testTarget( + name: "SplunkSlowFrameDetectorTests", + dependencies: ["SplunkSlowFrameDetector"] + ) + ] +) diff --git a/MRUMSlowFrameDetector/Sources/MRUMSlowFrameDetector/EventMetadataSlowFrameDetector.swift b/SplunkSlowFrameDetector/Sources/SplunkSlowFrameDetector/EventMetadataSlowFrameDetector.swift similarity index 100% rename from MRUMSlowFrameDetector/Sources/MRUMSlowFrameDetector/EventMetadataSlowFrameDetector.swift rename to SplunkSlowFrameDetector/Sources/SplunkSlowFrameDetector/EventMetadataSlowFrameDetector.swift diff --git a/MRUMSlowFrameDetector/Sources/MRUMSlowFrameDetector/ScreenName/ScreenManager.swift b/SplunkSlowFrameDetector/Sources/SplunkSlowFrameDetector/ScreenName/ScreenManager.swift similarity index 97% rename from MRUMSlowFrameDetector/Sources/MRUMSlowFrameDetector/ScreenName/ScreenManager.swift rename to SplunkSlowFrameDetector/Sources/SplunkSlowFrameDetector/ScreenName/ScreenManager.swift index 60e23236..bd73aafc 100644 --- a/MRUMSlowFrameDetector/Sources/MRUMSlowFrameDetector/ScreenName/ScreenManager.swift +++ b/SplunkSlowFrameDetector/Sources/SplunkSlowFrameDetector/ScreenName/ScreenManager.swift @@ -22,12 +22,12 @@ import OpenTelemetrySdk // Global convenience functions to maintain compatibility with legacy code -// TODO: Consider lifting this up out of this module and into CiscoRUM +// TODO: Consider lifting this up out of this module and into SplunkAgent // // we need some team input on this. // // For example, it might go under a new group "ScreenContent": -// CiscoRUM -> +// SplunkAgent -> // Agent -> // ScreenContent -> // ScreenName.swift diff --git a/MRUMSlowFrameDetector/Sources/MRUMSlowFrameDetector/SlowFrameDetector+Module.swift b/SplunkSlowFrameDetector/Sources/SplunkSlowFrameDetector/SlowFrameDetector+Module.swift similarity index 98% rename from MRUMSlowFrameDetector/Sources/MRUMSlowFrameDetector/SlowFrameDetector+Module.swift rename to SplunkSlowFrameDetector/Sources/SplunkSlowFrameDetector/SlowFrameDetector+Module.swift index b6358dc5..2ee069a9 100644 --- a/MRUMSlowFrameDetector/Sources/MRUMSlowFrameDetector/SlowFrameDetector+Module.swift +++ b/SplunkSlowFrameDetector/Sources/SplunkSlowFrameDetector/SlowFrameDetector+Module.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols // `Data` can be used as an event type that the module produces. extension Data: ModuleEventData {} diff --git a/MRUMSlowFrameDetector/Sources/MRUMSlowFrameDetector/SlowFrameDetector.swift b/SplunkSlowFrameDetector/Sources/SplunkSlowFrameDetector/SlowFrameDetector.swift similarity index 99% rename from MRUMSlowFrameDetector/Sources/MRUMSlowFrameDetector/SlowFrameDetector.swift rename to SplunkSlowFrameDetector/Sources/SplunkSlowFrameDetector/SlowFrameDetector.swift index 689d5952..1d89b47f 100644 --- a/MRUMSlowFrameDetector/Sources/MRUMSlowFrameDetector/SlowFrameDetector.swift +++ b/SplunkSlowFrameDetector/Sources/SplunkSlowFrameDetector/SlowFrameDetector.swift @@ -21,7 +21,7 @@ Adapted from SlowFrameDetector implementation at https://github.com/signalfx/spl import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols import QuartzCore import UIKit diff --git a/MRUMSlowFrameDetector/Sources/MRUMSlowFrameDetector/SlowFrameDetectorConfiguration.swift b/SplunkSlowFrameDetector/Sources/SplunkSlowFrameDetector/SlowFrameDetectorConfiguration.swift similarity index 98% rename from MRUMSlowFrameDetector/Sources/MRUMSlowFrameDetector/SlowFrameDetectorConfiguration.swift rename to SplunkSlowFrameDetector/Sources/SplunkSlowFrameDetector/SlowFrameDetectorConfiguration.swift index f8850ef4..88a3f2c3 100644 --- a/MRUMSlowFrameDetector/Sources/MRUMSlowFrameDetector/SlowFrameDetectorConfiguration.swift +++ b/SplunkSlowFrameDetector/Sources/SplunkSlowFrameDetector/SlowFrameDetectorConfiguration.swift @@ -16,7 +16,7 @@ limitations under the License. */ import Foundation -import MRUMSharedProtocols +import SplunkSharedProtocols public struct SlowFrameDetectorConfiguration: ModuleConfiguration {} diff --git a/SplunkSlowFrameDetector/Tests/SplunkSlowFrameDetectorTests/SplunkSlowFrameDetectorTests.swift b/SplunkSlowFrameDetector/Tests/SplunkSlowFrameDetectorTests/SplunkSlowFrameDetectorTests.swift new file mode 100644 index 00000000..abe13996 --- /dev/null +++ b/SplunkSlowFrameDetector/Tests/SplunkSlowFrameDetectorTests/SplunkSlowFrameDetectorTests.swift @@ -0,0 +1,12 @@ +@testable import SplunkSlowFrameDetector +import XCTest + +final class SplunkSlowFrameDetectorTests: XCTestCase { + func testExample() throws { + // XCTest Documentation + // https://developer.apple.com/documentation/xctest + + // Defining Test Cases and Test Methods + // https://developer.apple.com/documentation/xctest/defining_test_cases_and_test_methods + } +} diff --git a/Tools/build_frameworks/010-Paths.sh b/Tools/build_frameworks/010-Paths.sh index 9df03d60..aed02fe8 100644 --- a/Tools/build_frameworks/010-Paths.sh +++ b/Tools/build_frameworks/010-Paths.sh @@ -3,11 +3,11 @@ # Various important paths used by the script. function mrum_project { - echo "${PROJECT_DIR}/MRUMAgent/CiscoRUM.xcodeproj" + echo "${PROJECT_DIR}/SplunkAgent/SplunkAgent.xcodeproj" } function mrum_workspace { - echo "${PROJECT_DIR}/MRUM.xcworkspace" + echo "${PROJECT_DIR}/Splunk.xcworkspace" } # Unique output folder of the script run. @@ -60,5 +60,5 @@ function mrum_tempdir { id_path_fragment=".${id}" fi - echo "$(mktemp -d -t "com.cisco.mrum.sdk-build${id_path_fragment}.$(date +'%Y-%m-%d-%H.%M.%S')")" + echo "$(mktemp -d -t "com.splunk.rum.sdk-build${id_path_fragment}.$(date +'%Y-%m-%d-%H.%M.%S')")" } diff --git a/Tools/build_frameworks/030-Frameworks.sh b/Tools/build_frameworks/030-Frameworks.sh index b94340a9..9b6cef3a 100644 --- a/Tools/build_frameworks/030-Frameworks.sh +++ b/Tools/build_frameworks/030-Frameworks.sh @@ -5,7 +5,7 @@ # Frameworks to be build # These are by naming convention also names of the respective project build targets -FRAMEWORK_ANALYTICS="CiscoRUM" +FRAMEWORK_ANALYTICS="SplunkAgent" ALL_FRAMEWORKS=($FRAMEWORK_ANALYTICS) @@ -72,7 +72,7 @@ function framework_package_name { assert_valid_framework ${framework} if [[ $framework == $FRAMEWORK_ANALYTICS ]]; then - echo "CiscoRUM" + echo "SplunkAgent" fi } @@ -95,7 +95,7 @@ function zipped_xcframework_filename { assert_valid_framework ${framework} if [[ $framework == $FRAMEWORK_ANALYTICS ]]; then - echo "CiscoRUM-iOS-$(artifact_build_number $framework).zip" + echo "SplunkAgent-iOS-$(artifact_build_number $framework).zip" fi } @@ -107,5 +107,5 @@ function zipped_xcframework_url { local artifact_version=$(artifact_build_number $framework) local file_name=$(zipped_xcframework_filename $framework) - echo "https://appdynamics.jfrog.io/ui/native/zip-hosted/mrum/CiscoRUM-iOS/${artifact_version}/${file_name}" + echo "https://appdynamics.jfrog.io/ui/native/zip-hosted/mrum/SplunkAgent-iOS/${artifact_version}/${file_name}" } diff --git a/Tools/build_frameworks/041-Cmdline-Options-Help.sh b/Tools/build_frameworks/041-Cmdline-Options-Help.sh index fbfc9b80..abaee462 100644 --- a/Tools/build_frameworks/041-Cmdline-Options-Help.sh +++ b/Tools/build_frameworks/041-Cmdline-Options-Help.sh @@ -2,7 +2,7 @@ function print_help { log '' - log 'Builds CiscoRUM 1.0 frameworks.' + log 'Builds SplunkAgent 1.0 frameworks.' log '' log '' diff --git a/Tools/build_frameworks/090-Documentation.sh b/Tools/build_frameworks/090-Documentation.sh index c4977569..18ecaa10 100644 --- a/Tools/build_frameworks/090-Documentation.sh +++ b/Tools/build_frameworks/090-Documentation.sh @@ -161,12 +161,12 @@ function build_web_documentation { fi # Custom index files - local web_doc_ios_version_root_path="${web_doc_ios_version_path}/documentation/mrumagent/" + local web_doc_ios_version_root_path="${web_doc_ios_version_path}/documentation/splunkagent/" local web_doc_ios_path_index="${temp_web_build_dir_root}/webdoc/${web_doc_ios_path}/index.html" local web_doc_ios_version_path_index="${temp_web_build_dir}/index.html" # The original index.html returns a "not found" page, - # the real documentation root is at `documentation/mrumagent/`. + # the real documentation root is at `documentation/splunkagent/`. # # Because S3 does not allow straigthforward `/` redirect configuration, # redirect via header of a custom `index.html` is used. @@ -179,7 +179,7 @@ echo " -

CiscoRUM

+

SplunkAgent

Redirecting to /${web_doc_ios_version_root_path}