From 941e0c4f1bcad9535ec84c94ac842c7f70bd1591 Mon Sep 17 00:00:00 2001 From: Ondrej Synak Date: Thu, 9 Jan 2025 12:46:38 +0100 Subject: [PATCH 1/3] Rename packages to match com.splunk.rum --- .../app/lib/TestConstants.kt | 4 +-- .../com/{smartlook => splunk}/app/lib/Util.kt | 2 +- .../app/lib/ZipkinCommunicator.kt | 2 +- .../app/screens/HttpUrlConnectionScreen.kt | 4 +-- .../app/screens/MainScreen.kt | 4 +-- .../app/screens/OkHttpScreen.kt | 4 +-- .../app/screens/Screen.kt | 8 +++--- .../app/tests/component/BaseTest.kt | 4 +-- .../networkrequests/HttpUrlConnectionTest.kt | 12 ++++---- .../networkrequests/NetworkRequestsUtil.kt | 4 +-- .../component/networkrequests/OkHttp3Test.kt | 12 ++++---- .../app/tests/e2e/BaseTestE2E.kt | 4 +-- .../networkrequests/NetworkRequestsTest.kt | 12 ++++---- .../java/com/{smartlook => splunk}/app/App.kt | 2 +- .../app/extension/FragmentTransactionExt.kt | 4 +-- .../app/extension/PointFExt.kt | 2 +- .../app/extension/ToolbarExt.kt | 2 +- .../app/ui/BaseFragment.kt | 4 +-- .../app/ui/MainActivity.kt | 14 +++++----- .../HttpURLConnectionFragment.kt | 14 +++++----- .../app/ui/menu/MenuFragment.kt | 14 +++++----- .../app/ui/okhttp/OkHttpFragment.kt | 14 +++++----- .../app/util/FragmentAnimation.kt | 4 +-- .../android/common/http/HttpClient.kt | 22 +++++++-------- .../android/common/http/extension/MapExt.kt | 4 +-- .../common/http/extension/OutputStreamExt.kt | 12 ++++---- .../common/http/extension/StringExt.kt | 4 +-- .../android/common/http/model/Header.kt | 2 +- .../android/common/http/model/Query.kt | 2 +- .../android/common/http/model/Response.kt | 2 +- .../common/http/model/part/ByteArrayPart.kt | 2 +- .../common/http/model/part/ContentPart.kt | 2 +- .../common/http/model/part/FilePart.kt | 2 +- .../android/common/http/model/part/Part.kt | 2 +- .../common/http/model/part/StringPart.kt | 2 +- .../sdk/common/id/NanoId.kt | 2 +- .../sdk/common/job/IJobManager.kt | 2 +- .../sdk/common/job/JobIdStorage.kt | 6 ++-- .../sdk/common/job/JobManager.kt | 2 +- .../sdk/common/job/JobType.kt | 2 +- .../otel/api/OpenTelemetryInitializer.kt | 6 ++-- .../api/internal/OfflineOtelDataProcessor.kt | 8 +++--- .../api/logRecord/AndroidLogRecordExporter.kt | 6 ++-- .../api/logRecord/UploadOtelLogRecordData.kt | 4 +-- .../logRecord/UploadOtelLogRecordDataJob.kt | 10 +++---- .../otel/api/span/AndroidSpanExporter.kt | 6 ++-- .../otel/api/span/UploadOtelSpanData.kt | 4 +-- .../otel/api/span/UploadOtelSpanDataJob.kt | 10 +++---- .../otel/internal/storage/OtelStorage.kt | 2 +- .../sdk/common/storage/IStorage.kt | 4 +-- .../sdk/common/storage/Paths.kt | 10 +++---- .../sdk/common/storage/Storage.kt | 20 ++++++------- .../sdk/common/storage/extensions/FileExt.kt | 2 +- .../common/storage/extensions/FileStatExt.kt | 4 +-- .../sdk/common/storage/extensions/IntExt.kt | 2 +- .../sdk/common/storage/policy/SizeCache.kt | 6 ++-- .../common/storage/policy/StoragePolicy.kt | 2 +- .../storage/preferences/FilePermanentCache.kt | 2 +- .../storage/preferences/IPermanentCache.kt | 2 +- .../storage/preferences/IPreferences.kt | 2 +- .../common/storage/preferences/Preferences.kt | 6 ++-- .../sdk/common/storage/preferences/Value.kt | 4 +-- .../sdk/common/utils/AppStateObserver.kt | 8 +++--- .../sdk/common/utils/Barrier.kt | 2 +- .../sdk/common/utils/Common.kt | 2 +- .../utils/FragmentTransactionObserver.kt | 8 +++--- .../sdk/common/utils/HashCalculationUtils.kt | 2 +- .../sdk/common/utils/Lock.kt | 2 +- .../sdk/common/utils/Threads.kt | 2 +- .../ActivityLifecycleCallbacksAdapter.kt | 2 +- .../common/utils/extensions/ActivityExt.kt | 2 +- .../sdk/common/utils/extensions/AnyExt.kt | 2 +- .../sdk/common/utils/extensions/BitmapExt.kt | 2 +- .../common/utils/extensions/CollectionExt.kt | 2 +- .../sdk/common/utils/extensions/ContextExt.kt | 4 +-- .../utils/extensions/ExecutorServiceExt.kt | 4 +-- .../sdk/common/utils/extensions/FieldExt.kt | 2 +- .../common/utils/extensions/JSONArrayExt.kt | 2 +- .../common/utils/extensions/JSONObjectExt.kt | 2 +- .../sdk/common/utils/extensions/KClassExt.kt | 2 +- .../sdk/common/utils/extensions/ListExt.kt | 2 +- .../utils/extensions/MutableCollectionExt.kt | 2 +- .../common/utils/extensions/ResourcesExt.kt | 2 +- .../extensions/ScheduledExecutorServiceExt.kt | 4 +-- .../utils/extensions/StringBuilderExt.kt | 2 +- .../sdk/common/utils/extensions/StringExt.kt | 2 +- .../sdk/common/utils/extensions/ViewExt.kt | 2 +- .../common/utils/extensions/ViewGroupExt.kt | 2 +- .../common/utils/thread/NamedThreadFactory.kt | 2 +- .../build-info-injector/build.gradle.kts | 2 +- .../BuildInfoInjectorPlugin.kt | 6 ++-- .../utils/MappingFileModifier.kt | 4 +-- .../utils/ObfuscationTypeAnalyzer.kt | 2 +- .../networkrequest/bci/build.gradle.kts | 2 +- .../HttpUrlConnectionPlugin.java | 4 +-- .../rum/bci/okhttp3/OkHttpCallbackAdvice.java | 6 ++-- .../rum/bci/okhttp3/OkHttpCallbackPlugin.java | 2 +- .../rum/bci/okhttp3/OkHttpClientAdvice.java | 4 +-- .../rum/bci/okhttp3/OkHttpClientPlugin.java | 2 +- .../META-INF/net.bytebuddy/build.plugins | 6 ++-- .../buildtime/plugin/build.gradle.kts | 2 +- .../plugin/AndroidInstrumentationPlugin.java | 4 +-- instrumentation/runtime/anr/build.gradle.kts | 2 +- .../runtime/anr/proguard-rules.pro | 2 +- .../android => splunk}/rum/anr/ANRWatchDog.kt | 2 +- .../rum/anr/AnrReportingHandler.kt | 4 +-- .../rum/anr/ANRWatchDogTest.kt | 3 +- .../rum/anr/AnrReportingHandlerTest.kt | 3 +- .../runtime/crash/build.gradle.kts | 2 +- .../runtime/crash/proguard-rules.pro | 2 +- .../rum/crash/CrashReportingHandler.kt | 4 +-- .../rum/crash/CrashReportingHandlerTest.kt | 3 +- .../networkrequest/library/build.gradle.kts | 2 +- .../rum/library/common/HttpConfigUtil.java | 4 +-- .../common/HttpInstrumentationConfig.java | 2 +- .../HttpUrlInstrumentationConfig.java | 2 +- .../HttpUrlReplacements.java | 8 +++--- .../tracing/HttpUrlConnectionSingletons.java | 4 +-- .../tracing/HttpUrlHttpAttributesGetter.java | 2 +- .../tracing/RequestPropertySetter.java | 2 +- .../library/okhttp3/OkHttp3Singletons.java | 16 +++++------ .../ConnectionErrorWrapperInterceptor.java | 2 +- .../tracing/OkHttpCallbackAdviceHelper.java | 2 +- .../tracing/OkHttpCustomConfigArgument.java | 2 +- .../tracing/OkHttpInterceptorUtils.java | 2 +- .../tracing/RequestPropertySetter.java | 2 +- .../ResendCountContextInterceptor.java | 2 +- .../okhttp3/tracing/TracingCallback.java | 2 +- .../okhttp3/tracing/TracingInterceptor.java | 2 +- .../HttpUrlReplacementsTest.kt | 7 +++-- .../tracing/OkHttpCallbackAdviceHelperTest.kt | 3 +- .../okhttp3/tracing/TracingInterceptorTest.kt | 4 ++- .../intergrationrun/ApiTestJava.java | 16 +++++------ integration/agent/api/build.gradle.kts | 2 +- integration/agent/api/proguard-rules.pro | 2 +- .../agent/api/AgentConfiguration.kt | 2 +- .../integration/agent/api/CiscoRUMAgent.kt | 6 ++-- .../api/attributes/AttributeConstants.kt | 2 +- .../GenericAttributesLogProcessor.kt | 4 +-- .../api/configuration/ConfigurationManager.kt | 2 +- .../agent/api/extension/ConfigurationExt.kt | 2 +- .../agent/api/internal/MRUMAgentCore.kt | 22 +++++++-------- .../api/sessionId/SessionIdLogProcessor.kt | 6 ++-- .../api/sessionId/SessionIdSpanProcessor.kt | 6 ++-- .../api/sessionId/SessionStartEventManager.kt | 23 +++++++-------- .../sessionPulse/SessionPulseEventManager.kt | 8 +++--- .../api/state/StateLogRecordProcessor.kt | 6 ++-- .../agent/api/JavaIntegration.java | 4 +-- integration/agent/internal/build.gradle.kts | 2 +- integration/agent/internal/proguard-rules.pro | 2 +- .../agent/internal/AgentIntegration.kt | 22 +++++++-------- .../config/ModuleConfigurationManager.kt | 28 +++++++++---------- .../config/RemoteModuleConfiguration.kt | 2 +- .../agent/internal/config/ServerClock.kt | 2 +- .../extension/ModuleConfigurationsExt.kt | 4 +-- .../RemoteModuleConfigurationsExt.kt | 8 +++--- .../agent/internal/session/SessionManager.kt | 13 ++++----- .../agent/internal/state/StateManager.kt | 4 +-- integration/agent/module/build.gradle.kts | 2 +- integration/agent/module/proguard-rules.pro | 2 +- .../agent/module/ModuleConfiguration.kt | 2 +- integration/anr/build.gradle.kts | 2 +- integration/anr/consumer-rules.pro | 6 ++-- integration/anr/proguard-rules.pro | 8 +++--- integration/anr/src/main/AndroidManifest.xml | 2 +- .../anr/api/ANRModuleConfiguration.kt | 4 +-- .../anr/configurer/ANRConfigurer.kt | 16 +++++------ .../integration/anr/installer/ANRInstaller.kt | 4 +-- integration/crash/build.gradle.kts | 2 +- integration/crash/consumer-rules.pro | 6 ++-- integration/crash/proguard-rules.pro | 8 +++--- .../crash/src/main/AndroidManifest.xml | 2 +- .../crash/api/CrashModuleConfiguration.kt | 4 +-- .../crash/configurer/CrashConfigurer.kt | 14 +++++----- .../crash/installer/CrashInstaller.kt | 4 +-- integration/networkrequest/build.gradle.kts | 2 +- integration/networkrequest/consumer-rules.pro | 6 ++-- integration/networkrequest/proguard-rules.pro | 8 +++--- .../src/main/AndroidManifest.xml | 2 +- .../api/NetworkRequestModuleConfiguration.kt | 4 +-- .../configurer/NetworkRequestConfigurer.kt | 12 ++++---- .../installer/NetworkRequestInstaller.kt | 4 +-- 182 files changed, 447 insertions(+), 440 deletions(-) rename app/src/androidTest/java/com/{smartlook => splunk}/app/lib/TestConstants.kt (91%) rename app/src/androidTest/java/com/{smartlook => splunk}/app/lib/Util.kt (97%) rename app/src/androidTest/java/com/{smartlook => splunk}/app/lib/ZipkinCommunicator.kt (98%) rename app/src/androidTest/java/com/{smartlook => splunk}/app/screens/HttpUrlConnectionScreen.kt (96%) rename app/src/androidTest/java/com/{smartlook => splunk}/app/screens/MainScreen.kt (93%) rename app/src/androidTest/java/com/{smartlook => splunk}/app/screens/OkHttpScreen.kt (95%) rename app/src/androidTest/java/com/{smartlook => splunk}/app/screens/Screen.kt (97%) rename app/src/androidTest/java/com/{smartlook => splunk}/app/tests/component/BaseTest.kt (90%) rename app/src/androidTest/java/com/{smartlook => splunk}/app/tests/component/networkrequests/HttpUrlConnectionTest.kt (84%) rename app/src/androidTest/java/com/{smartlook => splunk}/app/tests/component/networkrequests/NetworkRequestsUtil.kt (91%) rename app/src/androidTest/java/com/{smartlook => splunk}/app/tests/component/networkrequests/OkHttp3Test.kt (84%) rename app/src/androidTest/java/com/{smartlook => splunk}/app/tests/e2e/BaseTestE2E.kt (91%) rename app/src/androidTest/java/com/{smartlook => splunk}/app/tests/e2e/networkrequests/NetworkRequestsTest.kt (83%) rename app/src/main/java/com/{smartlook => splunk}/app/App.kt (98%) rename app/src/main/java/com/{smartlook => splunk}/app/extension/FragmentTransactionExt.kt (91%) rename app/src/main/java/com/{smartlook => splunk}/app/extension/PointFExt.kt (97%) rename app/src/main/java/com/{smartlook => splunk}/app/extension/ToolbarExt.kt (95%) rename app/src/main/java/com/{smartlook => splunk}/app/ui/BaseFragment.kt (95%) rename app/src/main/java/com/{smartlook => splunk}/app/ui/MainActivity.kt (87%) rename app/src/main/java/com/{smartlook => splunk}/app/ui/httpurlconnection/HttpURLConnectionFragment.kt (95%) rename app/src/main/java/com/{smartlook => splunk}/app/ui/menu/MenuFragment.kt (92%) rename app/src/main/java/com/{smartlook => splunk}/app/ui/okhttp/OkHttpFragment.kt (98%) rename app/src/main/java/com/{smartlook => splunk}/app/util/FragmentAnimation.kt (96%) rename common/http/src/main/java/com/{smartlook => splunk}/android/common/http/HttpClient.kt (87%) rename common/http/src/main/java/com/{smartlook => splunk}/android/common/http/extension/MapExt.kt (72%) rename common/http/src/main/java/com/{smartlook => splunk}/android/common/http/extension/OutputStreamExt.kt (81%) rename common/http/src/main/java/com/{smartlook => splunk}/android/common/http/extension/StringExt.kt (82%) rename common/http/src/main/java/com/{smartlook => splunk}/android/common/http/model/Header.kt (57%) rename common/http/src/main/java/com/{smartlook => splunk}/android/common/http/model/Query.kt (57%) rename common/http/src/main/java/com/{smartlook => splunk}/android/common/http/model/Response.kt (79%) rename common/http/src/main/java/com/{smartlook => splunk}/android/common/http/model/part/ByteArrayPart.kt (85%) rename common/http/src/main/java/com/{smartlook => splunk}/android/common/http/model/part/ContentPart.kt (84%) rename common/http/src/main/java/com/{smartlook => splunk}/android/common/http/model/part/FilePart.kt (86%) rename common/http/src/main/java/com/{smartlook => splunk}/android/common/http/model/part/Part.kt (78%) rename common/http/src/main/java/com/{smartlook => splunk}/android/common/http/model/part/StringPart.kt (85%) rename common/id/src/main/java/com/{smartlook => splunk}/sdk/common/id/NanoId.kt (97%) rename common/job/src/main/java/com/{smartlook => splunk}/sdk/common/job/IJobManager.kt (80%) rename common/job/src/main/java/com/{smartlook => splunk}/sdk/common/job/JobIdStorage.kt (95%) rename common/job/src/main/java/com/{smartlook => splunk}/sdk/common/job/JobManager.kt (98%) rename common/job/src/main/java/com/{smartlook => splunk}/sdk/common/job/JobType.kt (92%) rename common/storage/src/main/java/com/{smartlook => splunk}/sdk/common/storage/IStorage.kt (97%) rename common/storage/src/main/java/com/{smartlook => splunk}/sdk/common/storage/Paths.kt (92%) rename common/storage/src/main/java/com/{smartlook => splunk}/sdk/common/storage/Storage.kt (97%) rename common/storage/src/main/java/com/{smartlook => splunk}/sdk/common/storage/extensions/FileExt.kt (93%) rename common/storage/src/main/java/com/{smartlook => splunk}/sdk/common/storage/extensions/FileStatExt.kt (85%) rename common/storage/src/main/java/com/{smartlook => splunk}/sdk/common/storage/extensions/IntExt.kt (57%) rename common/storage/src/main/java/com/{smartlook => splunk}/sdk/common/storage/policy/SizeCache.kt (91%) rename common/storage/src/main/java/com/{smartlook => splunk}/sdk/common/storage/policy/StoragePolicy.kt (85%) rename common/storage/src/main/java/com/{smartlook => splunk}/sdk/common/storage/preferences/FilePermanentCache.kt (93%) rename common/storage/src/main/java/com/{smartlook => splunk}/sdk/common/storage/preferences/IPermanentCache.kt (62%) rename common/storage/src/main/java/com/{smartlook => splunk}/sdk/common/storage/preferences/IPreferences.kt (93%) rename common/storage/src/main/java/com/{smartlook => splunk}/sdk/common/storage/preferences/Preferences.kt (96%) rename common/storage/src/main/java/com/{smartlook => splunk}/sdk/common/storage/preferences/Value.kt (96%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/AppStateObserver.kt (96%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/Barrier.kt (96%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/Common.kt (91%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/FragmentTransactionObserver.kt (82%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/HashCalculationUtils.kt (96%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/Lock.kt (92%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/Threads.kt (93%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/adapters/ActivityLifecycleCallbacksAdapter.kt (93%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/ActivityExt.kt (74%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/AnyExt.kt (96%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/BitmapExt.kt (68%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/CollectionExt.kt (87%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/ContextExt.kt (86%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/ExecutorServiceExt.kt (81%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/FieldExt.kt (91%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/JSONArrayExt.kt (82%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/JSONObjectExt.kt (95%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/KClassExt.kt (92%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/ListExt.kt (78%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/MutableCollectionExt.kt (82%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/ResourcesExt.kt (82%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/ScheduledExecutorServiceExt.kt (84%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/StringBuilderExt.kt (75%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/StringExt.kt (89%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/ViewExt.kt (91%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/extensions/ViewGroupExt.kt (86%) rename common/utils/src/main/java/com/{smartlook => splunk}/sdk/common/utils/thread/NamedThreadFactory.kt (89%) rename instrumentation/buildtime/build-info-injector/src/main/java/com/{cisco/android => splunk}/rum/buildInfoInjector/BuildInfoInjectorPlugin.kt (96%) rename instrumentation/buildtime/build-info-injector/src/main/java/com/{cisco/android => splunk}/rum/buildInfoInjector/utils/MappingFileModifier.kt (97%) rename instrumentation/buildtime/build-info-injector/src/main/java/com/{cisco/android => splunk}/rum/buildInfoInjector/utils/ObfuscationTypeAnalyzer.kt (98%) rename instrumentation/buildtime/networkrequest/bci/src/main/java/com/{cisco/android => splunk}/rum/bci/httpurlconnection/HttpUrlConnectionPlugin.java (99%) rename instrumentation/buildtime/networkrequest/bci/src/main/java/com/{cisco/android => splunk}/rum/bci/okhttp3/OkHttpCallbackAdvice.java (86%) rename instrumentation/buildtime/networkrequest/bci/src/main/java/com/{cisco/android => splunk}/rum/bci/okhttp3/OkHttpCallbackPlugin.java (97%) rename instrumentation/buildtime/networkrequest/bci/src/main/java/com/{cisco/android => splunk}/rum/bci/okhttp3/OkHttpClientAdvice.java (93%) rename instrumentation/buildtime/networkrequest/bci/src/main/java/com/{cisco/android => splunk}/rum/bci/okhttp3/OkHttpClientPlugin.java (97%) rename instrumentation/buildtime/plugin/src/main/java/com/{cisco/android => splunk}/rum/plugin/AndroidInstrumentationPlugin.java (94%) rename instrumentation/runtime/anr/src/main/java/com/{cisco/android => splunk}/rum/anr/ANRWatchDog.kt (98%) rename instrumentation/runtime/anr/src/main/java/com/{cisco/android => splunk}/rum/anr/AnrReportingHandler.kt (98%) rename instrumentation/runtime/anr/src/test/java/com/{cisco/android => splunk}/rum/anr/ANRWatchDogTest.kt (97%) rename instrumentation/runtime/anr/src/test/java/com/{cisco/android => splunk}/rum/anr/AnrReportingHandlerTest.kt (99%) rename instrumentation/runtime/crash/src/main/java/com/{cisco/android => splunk}/rum/crash/CrashReportingHandler.kt (98%) rename instrumentation/runtime/crash/src/test/java/com/{cisco/android => splunk}/rum/crash/CrashReportingHandlerTest.kt (98%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/common/HttpConfigUtil.java (90%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/common/HttpInstrumentationConfig.java (99%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/httpurlconnection/HttpUrlInstrumentationConfig.java (97%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/httpurlconnection/HttpUrlReplacements.java (97%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/httpurlconnection/tracing/HttpUrlConnectionSingletons.java (97%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/httpurlconnection/tracing/HttpUrlHttpAttributesGetter.java (97%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/httpurlconnection/tracing/RequestPropertySetter.java (93%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/okhttp3/OkHttp3Singletons.java (88%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/okhttp3/tracing/ConnectionErrorWrapperInterceptor.java (96%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelper.java (96%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/okhttp3/tracing/OkHttpCustomConfigArgument.java (94%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/okhttp3/tracing/OkHttpInterceptorUtils.java (96%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/okhttp3/tracing/RequestPropertySetter.java (94%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/okhttp3/tracing/ResendCountContextInterceptor.java (96%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/okhttp3/tracing/TracingCallback.java (96%) rename instrumentation/runtime/networkrequest/library/src/main/java/com/{cisco/android => splunk}/rum/library/okhttp3/tracing/TracingInterceptor.java (97%) rename instrumentation/runtime/networkrequest/library/src/test/java/com/{cisco/android => splunk}/rum/library/httpurlconnection/HttpUrlReplacementsTest.kt (99%) rename instrumentation/runtime/networkrequest/library/src/test/java/com/{cisco/android => splunk}/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelperTest.kt (96%) rename instrumentation/runtime/networkrequest/library/src/test/java/com/{cisco/android => splunk}/rum/library/okhttp3/tracing/TracingInterceptorTest.kt (96%) rename integration/agent/api/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/api/AgentConfiguration.kt (95%) rename integration/agent/api/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/api/CiscoRUMAgent.kt (91%) rename integration/agent/api/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/api/attributes/AttributeConstants.kt (94%) rename integration/agent/api/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/api/attributes/GenericAttributesLogProcessor.kt (86%) rename integration/agent/api/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/api/configuration/ConfigurationManager.kt (96%) rename integration/agent/api/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/api/extension/ConfigurationExt.kt (94%) rename integration/agent/api/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/api/internal/MRUMAgentCore.kt (78%) rename integration/agent/api/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/api/sessionId/SessionIdLogProcessor.kt (83%) rename integration/agent/api/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/api/sessionId/SessionIdSpanProcessor.kt (83%) rename integration/agent/api/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/api/sessionId/SessionStartEventManager.kt (58%) rename integration/agent/api/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/api/sessionPulse/SessionPulseEventManager.kt (87%) rename integration/agent/api/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/api/state/StateLogRecordProcessor.kt (81%) rename integration/agent/api/src/test/java/com/{cisco/android => splunk}/rum/integration/agent/api/JavaIntegration.java (92%) rename integration/agent/internal/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/internal/AgentIntegration.kt (86%) rename integration/agent/internal/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/internal/config/ModuleConfigurationManager.kt (84%) rename integration/agent/internal/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/internal/config/RemoteModuleConfiguration.kt (91%) rename integration/agent/internal/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/internal/config/ServerClock.kt (92%) rename integration/agent/internal/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/internal/extension/ModuleConfigurationsExt.kt (85%) rename integration/agent/internal/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/internal/extension/RemoteModuleConfigurationsExt.kt (87%) rename integration/agent/internal/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/internal/session/SessionManager.kt (94%) rename integration/agent/internal/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/internal/state/StateManager.kt (93%) rename integration/agent/module/src/main/java/com/{cisco/android => splunk}/rum/integration/agent/module/ModuleConfiguration.kt (91%) rename integration/anr/src/main/java/com/{cisco/android => splunk}/rum/integration/anr/api/ANRModuleConfiguration.kt (83%) rename integration/anr/src/main/java/com/{cisco/android => splunk}/rum/integration/anr/configurer/ANRConfigurer.kt (86%) rename integration/anr/src/main/java/com/{cisco/android => splunk}/rum/integration/anr/installer/ANRInstaller.kt (92%) rename integration/crash/src/main/java/com/{cisco/android => splunk}/rum/integration/crash/api/CrashModuleConfiguration.kt (83%) rename integration/crash/src/main/java/com/{cisco/android => splunk}/rum/integration/crash/configurer/CrashConfigurer.kt (86%) rename integration/crash/src/main/java/com/{cisco/android => splunk}/rum/integration/crash/installer/CrashInstaller.kt (91%) rename integration/networkrequest/src/main/java/com/{cisco/android => splunk}/rum/integration/networkrequest/api/NetworkRequestModuleConfiguration.kt (83%) rename integration/networkrequest/src/main/java/com/{cisco/android => splunk}/rum/integration/networkrequest/configurer/NetworkRequestConfigurer.kt (84%) rename integration/networkrequest/src/main/java/com/{cisco/android => splunk}/rum/integration/networkrequest/installer/NetworkRequestInstaller.kt (90%) diff --git a/app/src/androidTest/java/com/smartlook/app/lib/TestConstants.kt b/app/src/androidTest/java/com/splunk/app/lib/TestConstants.kt similarity index 91% rename from app/src/androidTest/java/com/smartlook/app/lib/TestConstants.kt rename to app/src/androidTest/java/com/splunk/app/lib/TestConstants.kt index 2a1b01f1..3fee102c 100644 --- a/app/src/androidTest/java/com/smartlook/app/lib/TestConstants.kt +++ b/app/src/androidTest/java/com/splunk/app/lib/TestConstants.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.smartlook.app.lib +package com.splunk.app.lib -import com.smartlook.app.BuildConfig +import com.splunk.app.BuildConfig object TestConstants { const val DEFAULT_NETWORK_TIMEOUT = 120_000L diff --git a/app/src/androidTest/java/com/smartlook/app/lib/Util.kt b/app/src/androidTest/java/com/splunk/app/lib/Util.kt similarity index 97% rename from app/src/androidTest/java/com/smartlook/app/lib/Util.kt rename to app/src/androidTest/java/com/splunk/app/lib/Util.kt index 26aded19..d5f8ab2a 100644 --- a/app/src/androidTest/java/com/smartlook/app/lib/Util.kt +++ b/app/src/androidTest/java/com/splunk/app/lib/Util.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.smartlook.app.lib +package com.splunk.app.lib import android.app.Instrumentation import android.content.Context diff --git a/app/src/androidTest/java/com/smartlook/app/lib/ZipkinCommunicator.kt b/app/src/androidTest/java/com/splunk/app/lib/ZipkinCommunicator.kt similarity index 98% rename from app/src/androidTest/java/com/smartlook/app/lib/ZipkinCommunicator.kt rename to app/src/androidTest/java/com/splunk/app/lib/ZipkinCommunicator.kt index aefa1430..77f842ed 100644 --- a/app/src/androidTest/java/com/smartlook/app/lib/ZipkinCommunicator.kt +++ b/app/src/androidTest/java/com/splunk/app/lib/ZipkinCommunicator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.smartlook.app.lib +package com.splunk.app.lib import okhttp3.OkHttpClient import okhttp3.Request diff --git a/app/src/androidTest/java/com/smartlook/app/screens/HttpUrlConnectionScreen.kt b/app/src/androidTest/java/com/splunk/app/screens/HttpUrlConnectionScreen.kt similarity index 96% rename from app/src/androidTest/java/com/smartlook/app/screens/HttpUrlConnectionScreen.kt rename to app/src/androidTest/java/com/splunk/app/screens/HttpUrlConnectionScreen.kt index 3a2e4277..2283f4b0 100644 --- a/app/src/androidTest/java/com/smartlook/app/screens/HttpUrlConnectionScreen.kt +++ b/app/src/androidTest/java/com/splunk/app/screens/HttpUrlConnectionScreen.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.smartlook.app.screens +package com.splunk.app.screens import android.view.View -import com.smartlook.app.R +import com.splunk.app.R import org.hamcrest.Matcher class HttpUrlConnectionScreen : Screen() { diff --git a/app/src/androidTest/java/com/smartlook/app/screens/MainScreen.kt b/app/src/androidTest/java/com/splunk/app/screens/MainScreen.kt similarity index 93% rename from app/src/androidTest/java/com/smartlook/app/screens/MainScreen.kt rename to app/src/androidTest/java/com/splunk/app/screens/MainScreen.kt index f361afc4..f30ee6a7 100644 --- a/app/src/androidTest/java/com/smartlook/app/screens/MainScreen.kt +++ b/app/src/androidTest/java/com/splunk/app/screens/MainScreen.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.smartlook.app.screens +package com.splunk.app.screens import android.view.View -import com.smartlook.app.R +import com.splunk.app.R import org.hamcrest.Matcher class MainScreen : Screen() { diff --git a/app/src/androidTest/java/com/smartlook/app/screens/OkHttpScreen.kt b/app/src/androidTest/java/com/splunk/app/screens/OkHttpScreen.kt similarity index 95% rename from app/src/androidTest/java/com/smartlook/app/screens/OkHttpScreen.kt rename to app/src/androidTest/java/com/splunk/app/screens/OkHttpScreen.kt index 5fd94d79..7f374ae0 100644 --- a/app/src/androidTest/java/com/smartlook/app/screens/OkHttpScreen.kt +++ b/app/src/androidTest/java/com/splunk/app/screens/OkHttpScreen.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.smartlook.app.screens +package com.splunk.app.screens import android.view.View -import com.smartlook.app.R +import com.splunk.app.R import org.hamcrest.Matcher class OkHttpScreen : Screen() { diff --git a/app/src/androidTest/java/com/smartlook/app/screens/Screen.kt b/app/src/androidTest/java/com/splunk/app/screens/Screen.kt similarity index 97% rename from app/src/androidTest/java/com/smartlook/app/screens/Screen.kt rename to app/src/androidTest/java/com/splunk/app/screens/Screen.kt index df2406b1..85ec33ba 100644 --- a/app/src/androidTest/java/com/smartlook/app/screens/Screen.kt +++ b/app/src/androidTest/java/com/splunk/app/screens/Screen.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.smartlook.app.screens +package com.splunk.app.screens import android.view.View import androidx.recyclerview.widget.RecyclerView @@ -29,9 +29,9 @@ import androidx.test.espresso.contrib.RecyclerViewActions import androidx.test.espresso.matcher.ViewMatchers import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText -import com.smartlook.app.lib.ResourceType -import com.smartlook.app.lib.TestConstants -import com.smartlook.app.lib.resType +import com.splunk.app.lib.ResourceType +import com.splunk.app.lib.TestConstants +import com.splunk.app.lib.resType import org.hamcrest.Matcher import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit diff --git a/app/src/androidTest/java/com/smartlook/app/tests/component/BaseTest.kt b/app/src/androidTest/java/com/splunk/app/tests/component/BaseTest.kt similarity index 90% rename from app/src/androidTest/java/com/smartlook/app/tests/component/BaseTest.kt rename to app/src/androidTest/java/com/splunk/app/tests/component/BaseTest.kt index 0b32f936..7223a083 100644 --- a/app/src/androidTest/java/com/smartlook/app/tests/component/BaseTest.kt +++ b/app/src/androidTest/java/com/splunk/app/tests/component/BaseTest.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.smartlook.app.tests.component +package com.splunk.app.tests.component import androidx.test.ext.junit.rules.ActivityScenarioRule -import com.smartlook.app.ui.MainActivity +import com.splunk.app.ui.MainActivity import org.junit.Rule abstract class BaseTest { diff --git a/app/src/androidTest/java/com/smartlook/app/tests/component/networkrequests/HttpUrlConnectionTest.kt b/app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/HttpUrlConnectionTest.kt similarity index 84% rename from app/src/androidTest/java/com/smartlook/app/tests/component/networkrequests/HttpUrlConnectionTest.kt rename to app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/HttpUrlConnectionTest.kt index 114f3268..1c3242a0 100644 --- a/app/src/androidTest/java/com/smartlook/app/tests/component/networkrequests/HttpUrlConnectionTest.kt +++ b/app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/HttpUrlConnectionTest.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.smartlook.app.tests.component.networkrequests +package com.splunk.app.tests.component.networkrequests -import com.smartlook.app.lib.ZipkinCommunicator -import com.smartlook.app.screens.HttpUrlConnectionScreen -import com.smartlook.app.screens.MainScreen -import com.smartlook.app.screens.screen -import com.smartlook.app.tests.component.BaseTest +import com.splunk.app.lib.ZipkinCommunicator +import com.splunk.app.screens.HttpUrlConnectionScreen +import com.splunk.app.screens.MainScreen +import com.splunk.app.screens.screen +import com.splunk.app.tests.component.BaseTest import org.junit.Before import org.junit.Test diff --git a/app/src/androidTest/java/com/smartlook/app/tests/component/networkrequests/NetworkRequestsUtil.kt b/app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/NetworkRequestsUtil.kt similarity index 91% rename from app/src/androidTest/java/com/smartlook/app/tests/component/networkrequests/NetworkRequestsUtil.kt rename to app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/NetworkRequestsUtil.kt index 73dcda3e..3bc5c317 100644 --- a/app/src/androidTest/java/com/smartlook/app/tests/component/networkrequests/NetworkRequestsUtil.kt +++ b/app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/NetworkRequestsUtil.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.smartlook.app.tests.component.networkrequests +package com.splunk.app.tests.component.networkrequests import android.util.Log -import com.smartlook.app.lib.ZipkinCommunicator +import com.splunk.app.lib.ZipkinCommunicator object NetworkRequestsUtil { fun verifyBySpanNameWithZipkin(method: String, duration: Long) { diff --git a/app/src/androidTest/java/com/smartlook/app/tests/component/networkrequests/OkHttp3Test.kt b/app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/OkHttp3Test.kt similarity index 84% rename from app/src/androidTest/java/com/smartlook/app/tests/component/networkrequests/OkHttp3Test.kt rename to app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/OkHttp3Test.kt index 6668bafb..ffbe9d48 100644 --- a/app/src/androidTest/java/com/smartlook/app/tests/component/networkrequests/OkHttp3Test.kt +++ b/app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/OkHttp3Test.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.smartlook.app.tests.component.networkrequests +package com.splunk.app.tests.component.networkrequests -import com.smartlook.app.lib.ZipkinCommunicator -import com.smartlook.app.screens.MainScreen -import com.smartlook.app.screens.OkHttpScreen -import com.smartlook.app.screens.screen -import com.smartlook.app.tests.component.BaseTest +import com.splunk.app.lib.ZipkinCommunicator +import com.splunk.app.screens.MainScreen +import com.splunk.app.screens.OkHttpScreen +import com.splunk.app.screens.screen +import com.splunk.app.tests.component.BaseTest import org.junit.Before import org.junit.Test diff --git a/app/src/androidTest/java/com/smartlook/app/tests/e2e/BaseTestE2E.kt b/app/src/androidTest/java/com/splunk/app/tests/e2e/BaseTestE2E.kt similarity index 91% rename from app/src/androidTest/java/com/smartlook/app/tests/e2e/BaseTestE2E.kt rename to app/src/androidTest/java/com/splunk/app/tests/e2e/BaseTestE2E.kt index de6f2ed8..eefbb815 100644 --- a/app/src/androidTest/java/com/smartlook/app/tests/e2e/BaseTestE2E.kt +++ b/app/src/androidTest/java/com/splunk/app/tests/e2e/BaseTestE2E.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.smartlook.app.tests.e2e +package com.splunk.app.tests.e2e import androidx.test.ext.junit.rules.ActivityScenarioRule -import com.smartlook.app.ui.MainActivity +import com.splunk.app.ui.MainActivity import org.junit.Rule abstract class BaseTestE2E { diff --git a/app/src/androidTest/java/com/smartlook/app/tests/e2e/networkrequests/NetworkRequestsTest.kt b/app/src/androidTest/java/com/splunk/app/tests/e2e/networkrequests/NetworkRequestsTest.kt similarity index 83% rename from app/src/androidTest/java/com/smartlook/app/tests/e2e/networkrequests/NetworkRequestsTest.kt rename to app/src/androidTest/java/com/splunk/app/tests/e2e/networkrequests/NetworkRequestsTest.kt index 1c640aaa..b1018256 100644 --- a/app/src/androidTest/java/com/smartlook/app/tests/e2e/networkrequests/NetworkRequestsTest.kt +++ b/app/src/androidTest/java/com/splunk/app/tests/e2e/networkrequests/NetworkRequestsTest.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.smartlook.app.tests.e2e.networkrequests +package com.splunk.app.tests.e2e.networkrequests -import com.smartlook.app.screens.HttpUrlConnectionScreen -import com.smartlook.app.screens.MainScreen -import com.smartlook.app.screens.OkHttpScreen -import com.smartlook.app.screens.screen -import com.smartlook.app.tests.e2e.BaseTestE2E +import com.splunk.app.screens.HttpUrlConnectionScreen +import com.splunk.app.screens.MainScreen +import com.splunk.app.screens.OkHttpScreen +import com.splunk.app.screens.screen +import com.splunk.app.tests.e2e.BaseTestE2E import org.junit.Test class NetworkRequestsTest: BaseTestE2E() { diff --git a/app/src/main/java/com/smartlook/app/App.kt b/app/src/main/java/com/splunk/app/App.kt similarity index 98% rename from app/src/main/java/com/smartlook/app/App.kt rename to app/src/main/java/com/splunk/app/App.kt index 5407c28c..e52146d3 100644 --- a/app/src/main/java/com/smartlook/app/App.kt +++ b/app/src/main/java/com/splunk/app/App.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.smartlook.app +package com.splunk.app import android.app.Application import com.cisco.android.rum.integration.agent.api.AgentConfiguration diff --git a/app/src/main/java/com/smartlook/app/extension/FragmentTransactionExt.kt b/app/src/main/java/com/splunk/app/extension/FragmentTransactionExt.kt similarity index 91% rename from app/src/main/java/com/smartlook/app/extension/FragmentTransactionExt.kt rename to app/src/main/java/com/splunk/app/extension/FragmentTransactionExt.kt index 897469f1..db8c3219 100644 --- a/app/src/main/java/com/smartlook/app/extension/FragmentTransactionExt.kt +++ b/app/src/main/java/com/splunk/app/extension/FragmentTransactionExt.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.smartlook.app.extension +package com.splunk.app.extension import androidx.fragment.app.FragmentTransaction -import com.smartlook.app.util.FragmentAnimation +import com.splunk.app.util.FragmentAnimation fun FragmentTransaction.setCustomAnimations(animation: FragmentAnimation?): FragmentTransaction { if (animation != null) diff --git a/app/src/main/java/com/smartlook/app/extension/PointFExt.kt b/app/src/main/java/com/splunk/app/extension/PointFExt.kt similarity index 97% rename from app/src/main/java/com/smartlook/app/extension/PointFExt.kt rename to app/src/main/java/com/splunk/app/extension/PointFExt.kt index c1fa6303..e8dea6b5 100644 --- a/app/src/main/java/com/smartlook/app/extension/PointFExt.kt +++ b/app/src/main/java/com/splunk/app/extension/PointFExt.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.smartlook.app.extension +package com.splunk.app.extension import android.graphics.PointF import kotlin.math.PI diff --git a/app/src/main/java/com/smartlook/app/extension/ToolbarExt.kt b/app/src/main/java/com/splunk/app/extension/ToolbarExt.kt similarity index 95% rename from app/src/main/java/com/smartlook/app/extension/ToolbarExt.kt rename to app/src/main/java/com/splunk/app/extension/ToolbarExt.kt index 7eb99dc4..9aa9b6f9 100644 --- a/app/src/main/java/com/smartlook/app/extension/ToolbarExt.kt +++ b/app/src/main/java/com/splunk/app/extension/ToolbarExt.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.smartlook.app.extension +package com.splunk.app.extension import androidx.annotation.StringRes import androidx.appcompat.widget.Toolbar diff --git a/app/src/main/java/com/smartlook/app/ui/BaseFragment.kt b/app/src/main/java/com/splunk/app/ui/BaseFragment.kt similarity index 95% rename from app/src/main/java/com/smartlook/app/ui/BaseFragment.kt rename to app/src/main/java/com/splunk/app/ui/BaseFragment.kt index f323e875..00423b11 100644 --- a/app/src/main/java/com/smartlook/app/ui/BaseFragment.kt +++ b/app/src/main/java/com/splunk/app/ui/BaseFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.smartlook.app.ui +package com.splunk.app.ui import android.os.Bundle import android.view.LayoutInflater @@ -22,7 +22,7 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.viewbinding.ViewBinding -import com.smartlook.app.util.FragmentAnimation +import com.splunk.app.util.FragmentAnimation abstract class BaseFragment : Fragment() { diff --git a/app/src/main/java/com/smartlook/app/ui/MainActivity.kt b/app/src/main/java/com/splunk/app/ui/MainActivity.kt similarity index 87% rename from app/src/main/java/com/smartlook/app/ui/MainActivity.kt rename to app/src/main/java/com/splunk/app/ui/MainActivity.kt index 9964079f..05a91b31 100644 --- a/app/src/main/java/com/smartlook/app/ui/MainActivity.kt +++ b/app/src/main/java/com/splunk/app/ui/MainActivity.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.smartlook.app.ui +package com.splunk.app.ui import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.smartlook.app.databinding.ActivityMainBinding -import com.smartlook.app.extension.setCustomAnimations -import com.smartlook.app.extension.setSubtitle -import com.smartlook.app.ui.menu.MenuFragment -import com.smartlook.app.util.FragmentAnimation -import com.smartlook.sdk.common.utils.extensions.contentView +import com.splunk.app.databinding.ActivityMainBinding +import com.splunk.app.extension.setCustomAnimations +import com.splunk.app.extension.setSubtitle +import com.splunk.app.ui.menu.MenuFragment +import com.splunk.app.util.FragmentAnimation +import com.splunk.sdk.common.utils.extensions.contentView class MainActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/smartlook/app/ui/httpurlconnection/HttpURLConnectionFragment.kt b/app/src/main/java/com/splunk/app/ui/httpurlconnection/HttpURLConnectionFragment.kt similarity index 95% rename from app/src/main/java/com/smartlook/app/ui/httpurlconnection/HttpURLConnectionFragment.kt rename to app/src/main/java/com/splunk/app/ui/httpurlconnection/HttpURLConnectionFragment.kt index c0126aa0..9199d5a4 100644 --- a/app/src/main/java/com/smartlook/app/ui/httpurlconnection/HttpURLConnectionFragment.kt +++ b/app/src/main/java/com/splunk/app/ui/httpurlconnection/HttpURLConnectionFragment.kt @@ -14,23 +14,23 @@ * limitations under the License. */ -package com.smartlook.app.ui.httpurlconnection +package com.splunk.app.ui.httpurlconnection import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.smartlook.app.databinding.FragmentHttpUrlConnectionBinding -import com.smartlook.app.ui.BaseFragment -import com.smartlook.sdk.common.utils.runOnBackgroundThread +import com.splunk.app.databinding.FragmentHttpUrlConnectionBinding +import com.splunk.app.ui.BaseFragment +import com.splunk.sdk.common.utils.runOnBackgroundThread import java.io.IOException import java.net.HttpURLConnection import java.net.URL import android.util.Log import android.widget.Toast -import com.cisco.android.rum.library.httpurlconnection.HttpUrlInstrumentationConfig -import com.smartlook.app.R -import com.smartlook.sdk.common.utils.runOnUiThread +import com.splunk.rum.library.httpurlconnection.HttpUrlInstrumentationConfig +import com.splunk.app.R +import com.splunk.sdk.common.utils.runOnUiThread import java.util.concurrent.Executors import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/com/smartlook/app/ui/menu/MenuFragment.kt b/app/src/main/java/com/splunk/app/ui/menu/MenuFragment.kt similarity index 92% rename from app/src/main/java/com/smartlook/app/ui/menu/MenuFragment.kt rename to app/src/main/java/com/splunk/app/ui/menu/MenuFragment.kt index af91d849..04d32aba 100644 --- a/app/src/main/java/com/smartlook/app/ui/menu/MenuFragment.kt +++ b/app/src/main/java/com/splunk/app/ui/menu/MenuFragment.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.smartlook.app.ui.menu +package com.splunk.app.ui.menu import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.smartlook.app.R -import com.smartlook.app.databinding.FragmentMenuBinding -import com.smartlook.app.ui.BaseFragment -import com.smartlook.app.ui.httpurlconnection.HttpURLConnectionFragment -import com.smartlook.app.ui.okhttp.OkHttpFragment -import com.smartlook.app.util.FragmentAnimation +import com.splunk.app.R +import com.splunk.app.databinding.FragmentMenuBinding +import com.splunk.app.ui.BaseFragment +import com.splunk.app.ui.httpurlconnection.HttpURLConnectionFragment +import com.splunk.app.ui.okhttp.OkHttpFragment +import com.splunk.app.util.FragmentAnimation class MenuFragment : BaseFragment() { diff --git a/app/src/main/java/com/smartlook/app/ui/okhttp/OkHttpFragment.kt b/app/src/main/java/com/splunk/app/ui/okhttp/OkHttpFragment.kt similarity index 98% rename from app/src/main/java/com/smartlook/app/ui/okhttp/OkHttpFragment.kt rename to app/src/main/java/com/splunk/app/ui/okhttp/OkHttpFragment.kt index fda70454..7a89447c 100644 --- a/app/src/main/java/com/smartlook/app/ui/okhttp/OkHttpFragment.kt +++ b/app/src/main/java/com/splunk/app/ui/okhttp/OkHttpFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.smartlook.app.ui.okhttp +package com.splunk.app.ui.okhttp import android.graphics.Bitmap import android.os.Bundle @@ -23,12 +23,12 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Toast -import com.smartlook.app.R -import com.smartlook.app.databinding.FragmentOkhttpBinding -import com.smartlook.app.ui.BaseFragment -import com.smartlook.sdk.common.utils.extensions.safeSchedule -import com.smartlook.sdk.common.utils.runOnBackgroundThread -import com.smartlook.sdk.common.utils.runOnUiThread +import com.splunk.app.R +import com.splunk.app.databinding.FragmentOkhttpBinding +import com.splunk.app.ui.BaseFragment +import com.splunk.sdk.common.utils.extensions.safeSchedule +import com.splunk.sdk.common.utils.runOnBackgroundThread +import com.splunk.sdk.common.utils.runOnUiThread import io.opentelemetry.api.trace.Span import io.opentelemetry.sdk.OpenTelemetrySdk import io.opentelemetry.sdk.trace.SdkTracerProvider diff --git a/app/src/main/java/com/smartlook/app/util/FragmentAnimation.kt b/app/src/main/java/com/splunk/app/util/FragmentAnimation.kt similarity index 96% rename from app/src/main/java/com/smartlook/app/util/FragmentAnimation.kt rename to app/src/main/java/com/splunk/app/util/FragmentAnimation.kt index e2098880..2949b22c 100644 --- a/app/src/main/java/com/smartlook/app/util/FragmentAnimation.kt +++ b/app/src/main/java/com/splunk/app/util/FragmentAnimation.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.smartlook.app.util +package com.splunk.app.util import androidx.annotation.AnimRes import androidx.annotation.AnimatorRes -import com.smartlook.app.R +import com.splunk.app.R data class FragmentAnimation( @AnimatorRes @AnimRes val enter: Int, diff --git a/common/http/src/main/java/com/smartlook/android/common/http/HttpClient.kt b/common/http/src/main/java/com/splunk/android/common/http/HttpClient.kt similarity index 87% rename from common/http/src/main/java/com/smartlook/android/common/http/HttpClient.kt rename to common/http/src/main/java/com/splunk/android/common/http/HttpClient.kt index be9b01ee..3c8677e8 100644 --- a/common/http/src/main/java/com/smartlook/android/common/http/HttpClient.kt +++ b/common/http/src/main/java/com/splunk/android/common/http/HttpClient.kt @@ -1,14 +1,14 @@ -package com.smartlook.android.common.http - -import com.smartlook.android.common.http.extension.toHeaders -import com.smartlook.android.common.http.extension.toURL -import com.smartlook.android.common.http.extension.write -import com.smartlook.android.common.http.model.Header -import com.smartlook.android.common.http.model.Query -import com.smartlook.android.common.http.model.Response -import com.smartlook.android.common.http.model.part.Part -import com.smartlook.sdk.common.utils.extensions.safeSubmit -import com.smartlook.sdk.common.utils.thread.NamedThreadFactory +package com.splunk.android.common.http + +import com.splunk.android.common.http.extension.toHeaders +import com.splunk.android.common.http.extension.toURL +import com.splunk.android.common.http.extension.write +import com.splunk.android.common.http.model.Header +import com.splunk.android.common.http.model.Query +import com.splunk.android.common.http.model.Response +import com.splunk.android.common.http.model.part.Part +import com.splunk.sdk.common.utils.extensions.safeSubmit +import com.splunk.sdk.common.utils.thread.NamedThreadFactory import java.io.ByteArrayOutputStream import java.io.File import java.io.FileNotFoundException diff --git a/common/http/src/main/java/com/smartlook/android/common/http/extension/MapExt.kt b/common/http/src/main/java/com/splunk/android/common/http/extension/MapExt.kt similarity index 72% rename from common/http/src/main/java/com/smartlook/android/common/http/extension/MapExt.kt rename to common/http/src/main/java/com/splunk/android/common/http/extension/MapExt.kt index fd4caf17..26cb98dc 100644 --- a/common/http/src/main/java/com/smartlook/android/common/http/extension/MapExt.kt +++ b/common/http/src/main/java/com/splunk/android/common/http/extension/MapExt.kt @@ -1,6 +1,6 @@ -package com.smartlook.android.common.http.extension +package com.splunk.android.common.http.extension -import com.smartlook.android.common.http.model.Header +import com.splunk.android.common.http.model.Header internal fun Map>.toHeaders(): List
{ val headers = ArrayList
(size) diff --git a/common/http/src/main/java/com/smartlook/android/common/http/extension/OutputStreamExt.kt b/common/http/src/main/java/com/splunk/android/common/http/extension/OutputStreamExt.kt similarity index 81% rename from common/http/src/main/java/com/smartlook/android/common/http/extension/OutputStreamExt.kt rename to common/http/src/main/java/com/splunk/android/common/http/extension/OutputStreamExt.kt index 8f6b2b09..0bdab82e 100644 --- a/common/http/src/main/java/com/smartlook/android/common/http/extension/OutputStreamExt.kt +++ b/common/http/src/main/java/com/splunk/android/common/http/extension/OutputStreamExt.kt @@ -1,10 +1,10 @@ -package com.smartlook.android.common.http.extension +package com.splunk.android.common.http.extension -import com.smartlook.android.common.http.model.part.ByteArrayPart -import com.smartlook.android.common.http.model.part.ContentPart -import com.smartlook.android.common.http.model.part.FilePart -import com.smartlook.android.common.http.model.part.Part -import com.smartlook.android.common.http.model.part.StringPart +import com.splunk.android.common.http.model.part.ByteArrayPart +import com.splunk.android.common.http.model.part.ContentPart +import com.splunk.android.common.http.model.part.FilePart +import com.splunk.android.common.http.model.part.Part +import com.splunk.android.common.http.model.part.StringPart import java.io.FileNotFoundException import java.io.OutputStream diff --git a/common/http/src/main/java/com/smartlook/android/common/http/extension/StringExt.kt b/common/http/src/main/java/com/splunk/android/common/http/extension/StringExt.kt similarity index 82% rename from common/http/src/main/java/com/smartlook/android/common/http/extension/StringExt.kt rename to common/http/src/main/java/com/splunk/android/common/http/extension/StringExt.kt index 6ed2ad35..b6711ad8 100644 --- a/common/http/src/main/java/com/smartlook/android/common/http/extension/StringExt.kt +++ b/common/http/src/main/java/com/splunk/android/common/http/extension/StringExt.kt @@ -1,6 +1,6 @@ -package com.smartlook.android.common.http.extension +package com.splunk.android.common.http.extension -import com.smartlook.android.common.http.model.Query +import com.splunk.android.common.http.model.Query import java.net.URL import java.net.URLEncoder diff --git a/common/http/src/main/java/com/smartlook/android/common/http/model/Header.kt b/common/http/src/main/java/com/splunk/android/common/http/model/Header.kt similarity index 57% rename from common/http/src/main/java/com/smartlook/android/common/http/model/Header.kt rename to common/http/src/main/java/com/splunk/android/common/http/model/Header.kt index 9b6f862b..b5737d8e 100644 --- a/common/http/src/main/java/com/smartlook/android/common/http/model/Header.kt +++ b/common/http/src/main/java/com/splunk/android/common/http/model/Header.kt @@ -1,4 +1,4 @@ -package com.smartlook.android.common.http.model +package com.splunk.android.common.http.model data class Header( val name: String, diff --git a/common/http/src/main/java/com/smartlook/android/common/http/model/Query.kt b/common/http/src/main/java/com/splunk/android/common/http/model/Query.kt similarity index 57% rename from common/http/src/main/java/com/smartlook/android/common/http/model/Query.kt rename to common/http/src/main/java/com/splunk/android/common/http/model/Query.kt index 18973b22..c2893bc7 100644 --- a/common/http/src/main/java/com/smartlook/android/common/http/model/Query.kt +++ b/common/http/src/main/java/com/splunk/android/common/http/model/Query.kt @@ -1,4 +1,4 @@ -package com.smartlook.android.common.http.model +package com.splunk.android.common.http.model data class Query( val name: String, diff --git a/common/http/src/main/java/com/smartlook/android/common/http/model/Response.kt b/common/http/src/main/java/com/splunk/android/common/http/model/Response.kt similarity index 79% rename from common/http/src/main/java/com/smartlook/android/common/http/model/Response.kt rename to common/http/src/main/java/com/splunk/android/common/http/model/Response.kt index 159725c0..f3323f05 100644 --- a/common/http/src/main/java/com/smartlook/android/common/http/model/Response.kt +++ b/common/http/src/main/java/com/splunk/android/common/http/model/Response.kt @@ -1,4 +1,4 @@ -package com.smartlook.android.common.http.model +package com.splunk.android.common.http.model class Response internal constructor( val code: Int, diff --git a/common/http/src/main/java/com/smartlook/android/common/http/model/part/ByteArrayPart.kt b/common/http/src/main/java/com/splunk/android/common/http/model/part/ByteArrayPart.kt similarity index 85% rename from common/http/src/main/java/com/smartlook/android/common/http/model/part/ByteArrayPart.kt rename to common/http/src/main/java/com/splunk/android/common/http/model/part/ByteArrayPart.kt index fe23aafc..35a371b1 100644 --- a/common/http/src/main/java/com/smartlook/android/common/http/model/part/ByteArrayPart.kt +++ b/common/http/src/main/java/com/splunk/android/common/http/model/part/ByteArrayPart.kt @@ -1,4 +1,4 @@ -package com.smartlook.android.common.http.model.part +package com.splunk.android.common.http.model.part import androidx.annotation.WorkerThread diff --git a/common/http/src/main/java/com/smartlook/android/common/http/model/part/ContentPart.kt b/common/http/src/main/java/com/splunk/android/common/http/model/part/ContentPart.kt similarity index 84% rename from common/http/src/main/java/com/smartlook/android/common/http/model/part/ContentPart.kt rename to common/http/src/main/java/com/splunk/android/common/http/model/part/ContentPart.kt index 99d1c932..d2ac82e2 100644 --- a/common/http/src/main/java/com/smartlook/android/common/http/model/part/ContentPart.kt +++ b/common/http/src/main/java/com/splunk/android/common/http/model/part/ContentPart.kt @@ -1,4 +1,4 @@ -package com.smartlook.android.common.http.model.part +package com.splunk.android.common.http.model.part import androidx.annotation.WorkerThread import java.io.OutputStream diff --git a/common/http/src/main/java/com/smartlook/android/common/http/model/part/FilePart.kt b/common/http/src/main/java/com/splunk/android/common/http/model/part/FilePart.kt similarity index 86% rename from common/http/src/main/java/com/smartlook/android/common/http/model/part/FilePart.kt rename to common/http/src/main/java/com/splunk/android/common/http/model/part/FilePart.kt index 75947900..fab30f0d 100644 --- a/common/http/src/main/java/com/smartlook/android/common/http/model/part/FilePart.kt +++ b/common/http/src/main/java/com/splunk/android/common/http/model/part/FilePart.kt @@ -1,4 +1,4 @@ -package com.smartlook.android.common.http.model.part +package com.splunk.android.common.http.model.part import androidx.annotation.WorkerThread import java.io.File diff --git a/common/http/src/main/java/com/smartlook/android/common/http/model/part/Part.kt b/common/http/src/main/java/com/splunk/android/common/http/model/part/Part.kt similarity index 78% rename from common/http/src/main/java/com/smartlook/android/common/http/model/part/Part.kt rename to common/http/src/main/java/com/splunk/android/common/http/model/part/Part.kt index 22d21742..c86cda5c 100644 --- a/common/http/src/main/java/com/smartlook/android/common/http/model/part/Part.kt +++ b/common/http/src/main/java/com/splunk/android/common/http/model/part/Part.kt @@ -1,4 +1,4 @@ -package com.smartlook.android.common.http.model.part +package com.splunk.android.common.http.model.part import androidx.annotation.WorkerThread diff --git a/common/http/src/main/java/com/smartlook/android/common/http/model/part/StringPart.kt b/common/http/src/main/java/com/splunk/android/common/http/model/part/StringPart.kt similarity index 85% rename from common/http/src/main/java/com/smartlook/android/common/http/model/part/StringPart.kt rename to common/http/src/main/java/com/splunk/android/common/http/model/part/StringPart.kt index bf704621..6e3cd843 100644 --- a/common/http/src/main/java/com/smartlook/android/common/http/model/part/StringPart.kt +++ b/common/http/src/main/java/com/splunk/android/common/http/model/part/StringPart.kt @@ -1,4 +1,4 @@ -package com.smartlook.android.common.http.model.part +package com.splunk.android.common.http.model.part import androidx.annotation.WorkerThread diff --git a/common/id/src/main/java/com/smartlook/sdk/common/id/NanoId.kt b/common/id/src/main/java/com/splunk/sdk/common/id/NanoId.kt similarity index 97% rename from common/id/src/main/java/com/smartlook/sdk/common/id/NanoId.kt rename to common/id/src/main/java/com/splunk/sdk/common/id/NanoId.kt index 4b06a4ef..56b4bcb7 100644 --- a/common/id/src/main/java/com/smartlook/sdk/common/id/NanoId.kt +++ b/common/id/src/main/java/com/splunk/sdk/common/id/NanoId.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.id +package com.splunk.sdk.common.id import java.security.SecureRandom import java.util.Random diff --git a/common/job/src/main/java/com/smartlook/sdk/common/job/IJobManager.kt b/common/job/src/main/java/com/splunk/sdk/common/job/IJobManager.kt similarity index 80% rename from common/job/src/main/java/com/smartlook/sdk/common/job/IJobManager.kt rename to common/job/src/main/java/com/splunk/sdk/common/job/IJobManager.kt index 0265f400..c6c61771 100644 --- a/common/job/src/main/java/com/smartlook/sdk/common/job/IJobManager.kt +++ b/common/job/src/main/java/com/splunk/sdk/common/job/IJobManager.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.job +package com.splunk.sdk.common.job interface IJobManager { fun scheduleJob(jobType: JobType) diff --git a/common/job/src/main/java/com/smartlook/sdk/common/job/JobIdStorage.kt b/common/job/src/main/java/com/splunk/sdk/common/job/JobIdStorage.kt similarity index 95% rename from common/job/src/main/java/com/smartlook/sdk/common/job/JobIdStorage.kt rename to common/job/src/main/java/com/splunk/sdk/common/job/JobIdStorage.kt index 4a09d052..8b06a1e6 100644 --- a/common/job/src/main/java/com/smartlook/sdk/common/job/JobIdStorage.kt +++ b/common/job/src/main/java/com/splunk/sdk/common/job/JobIdStorage.kt @@ -1,7 +1,7 @@ -package com.smartlook.sdk.common.job +package com.splunk.sdk.common.job -import com.smartlook.sdk.common.utils.extensions.toJSONObject -import com.smartlook.sdk.common.storage.IStorage +import com.splunk.sdk.common.utils.extensions.toJSONObject +import com.splunk.sdk.common.storage.IStorage import org.json.JSONObject import java.util.concurrent.locks.ReentrantLock import kotlin.concurrent.withLock diff --git a/common/job/src/main/java/com/smartlook/sdk/common/job/JobManager.kt b/common/job/src/main/java/com/splunk/sdk/common/job/JobManager.kt similarity index 98% rename from common/job/src/main/java/com/smartlook/sdk/common/job/JobManager.kt rename to common/job/src/main/java/com/splunk/sdk/common/job/JobManager.kt index 8a35d3db..4d7e4cd3 100644 --- a/common/job/src/main/java/com/smartlook/sdk/common/job/JobManager.kt +++ b/common/job/src/main/java/com/splunk/sdk/common/job/JobManager.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.job +package com.splunk.sdk.common.job import android.annotation.SuppressLint import android.app.job.JobScheduler diff --git a/common/job/src/main/java/com/smartlook/sdk/common/job/JobType.kt b/common/job/src/main/java/com/splunk/sdk/common/job/JobType.kt similarity index 92% rename from common/job/src/main/java/com/smartlook/sdk/common/job/JobType.kt rename to common/job/src/main/java/com/splunk/sdk/common/job/JobType.kt index b88b5c81..b0ad3390 100644 --- a/common/job/src/main/java/com/smartlook/sdk/common/job/JobType.kt +++ b/common/job/src/main/java/com/splunk/sdk/common/job/JobType.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.job +package com.splunk.sdk.common.job import android.app.job.JobInfo import android.content.Context diff --git a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/OpenTelemetryInitializer.kt b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/OpenTelemetryInitializer.kt index 8b01dd86..ef786556 100644 --- a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/OpenTelemetryInitializer.kt +++ b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/OpenTelemetryInitializer.kt @@ -21,9 +21,9 @@ import com.cisco.mrum.common.otel.api.internal.Resources import com.cisco.mrum.common.otel.api.logRecord.AndroidLogRecordExporter import com.cisco.mrum.common.otel.api.span.AndroidSpanExporter import com.cisco.mrum.common.otel.internal.storage.OtelStorage -import com.smartlook.sdk.common.job.JobIdStorage -import com.smartlook.sdk.common.job.JobManager -import com.smartlook.sdk.common.storage.Storage +import com.splunk.sdk.common.job.JobIdStorage +import com.splunk.sdk.common.job.JobManager +import com.splunk.sdk.common.storage.Storage import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator import io.opentelemetry.context.propagation.ContextPropagators diff --git a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/internal/OfflineOtelDataProcessor.kt b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/internal/OfflineOtelDataProcessor.kt index 54d7f56e..798a7fdc 100644 --- a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/internal/OfflineOtelDataProcessor.kt +++ b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/internal/OfflineOtelDataProcessor.kt @@ -19,10 +19,10 @@ package com.cisco.mrum.common.otel.api.internal import com.cisco.android.common.logger.Logger import com.cisco.mrum.common.otel.api.logRecord.UploadOtelLogRecordData import com.cisco.mrum.common.otel.api.span.UploadOtelSpanData -import com.smartlook.sdk.common.job.IJobManager -import com.smartlook.sdk.common.job.JobIdStorage -import com.smartlook.sdk.common.storage.IStorage -import com.smartlook.sdk.common.utils.extensions.safeSubmit +import com.splunk.sdk.common.job.IJobManager +import com.splunk.sdk.common.job.JobIdStorage +import com.splunk.sdk.common.storage.IStorage +import com.splunk.sdk.common.utils.extensions.safeSubmit import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicBoolean diff --git a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/logRecord/AndroidLogRecordExporter.kt b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/logRecord/AndroidLogRecordExporter.kt index db55ccfe..21e86bf0 100644 --- a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/logRecord/AndroidLogRecordExporter.kt +++ b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/logRecord/AndroidLogRecordExporter.kt @@ -16,9 +16,9 @@ package com.cisco.mrum.common.otel.api.logRecord -import com.smartlook.sdk.common.job.IJobManager -import com.smartlook.sdk.common.job.JobIdStorage -import com.smartlook.sdk.common.storage.IStorage +import com.splunk.sdk.common.job.IJobManager +import com.splunk.sdk.common.job.JobIdStorage +import com.splunk.sdk.common.storage.IStorage import io.opentelemetry.exporter.internal.otlp.logs.LogsRequestMarshaler import io.opentelemetry.sdk.common.CompletableResultCode import io.opentelemetry.sdk.logs.data.LogRecordData diff --git a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/logRecord/UploadOtelLogRecordData.kt b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/logRecord/UploadOtelLogRecordData.kt index 5dce0a6e..c4e121b8 100644 --- a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/logRecord/UploadOtelLogRecordData.kt +++ b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/logRecord/UploadOtelLogRecordData.kt @@ -20,8 +20,8 @@ import android.app.job.JobInfo import android.content.Context import android.os.Build import androidx.annotation.RequiresApi -import com.smartlook.sdk.common.job.JobIdStorage -import com.smartlook.sdk.common.job.JobType +import com.splunk.sdk.common.job.JobIdStorage +import com.splunk.sdk.common.job.JobType internal data class UploadOtelLogRecordData(val id: String, val jobIdStorage: JobIdStorage) : JobType { diff --git a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/logRecord/UploadOtelLogRecordDataJob.kt b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/logRecord/UploadOtelLogRecordDataJob.kt index d99d2f4d..db2c074e 100644 --- a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/logRecord/UploadOtelLogRecordDataJob.kt +++ b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/logRecord/UploadOtelLogRecordDataJob.kt @@ -25,11 +25,11 @@ import android.content.Context import android.os.PersistableBundle import com.cisco.android.common.logger.Logger import com.cisco.mrum.common.otel.internal.storage.OtelStorage -import com.smartlook.android.common.http.HttpClient -import com.smartlook.android.common.http.model.Header -import com.smartlook.android.common.http.model.Response -import com.smartlook.sdk.common.job.JobIdStorage -import com.smartlook.sdk.common.storage.Storage +import com.splunk.android.common.http.HttpClient +import com.splunk.android.common.http.model.Header +import com.splunk.android.common.http.model.Response +import com.splunk.sdk.common.job.JobIdStorage +import com.splunk.sdk.common.storage.Storage import java.net.UnknownHostException @SuppressLint("NewApi") diff --git a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/span/AndroidSpanExporter.kt b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/span/AndroidSpanExporter.kt index ee6baf8e..61aff7b9 100644 --- a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/span/AndroidSpanExporter.kt +++ b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/span/AndroidSpanExporter.kt @@ -16,9 +16,9 @@ package com.cisco.mrum.common.otel.api.span -import com.smartlook.sdk.common.job.IJobManager -import com.smartlook.sdk.common.job.JobIdStorage -import com.smartlook.sdk.common.storage.IStorage +import com.splunk.sdk.common.job.IJobManager +import com.splunk.sdk.common.job.JobIdStorage +import com.splunk.sdk.common.storage.IStorage import io.opentelemetry.exporter.internal.otlp.traces.TraceRequestMarshaler import io.opentelemetry.sdk.common.CompletableResultCode import io.opentelemetry.sdk.trace.data.SpanData diff --git a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/span/UploadOtelSpanData.kt b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/span/UploadOtelSpanData.kt index 8bbf8211..f5912aee 100644 --- a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/span/UploadOtelSpanData.kt +++ b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/span/UploadOtelSpanData.kt @@ -20,8 +20,8 @@ import android.app.job.JobInfo import android.content.Context import android.os.Build import androidx.annotation.RequiresApi -import com.smartlook.sdk.common.job.JobIdStorage -import com.smartlook.sdk.common.job.JobType +import com.splunk.sdk.common.job.JobIdStorage +import com.splunk.sdk.common.job.JobType internal data class UploadOtelSpanData(val id: String, val jobIdStorage: JobIdStorage) : JobType { diff --git a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/span/UploadOtelSpanDataJob.kt b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/span/UploadOtelSpanDataJob.kt index f1ed9e43..f65a17d9 100644 --- a/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/span/UploadOtelSpanDataJob.kt +++ b/common/otel/api/src/main/java/com/cisco/mrum/common/otel/api/span/UploadOtelSpanDataJob.kt @@ -25,11 +25,11 @@ import android.content.Context import android.os.PersistableBundle import com.cisco.android.common.logger.Logger import com.cisco.mrum.common.otel.internal.storage.OtelStorage -import com.smartlook.android.common.http.HttpClient -import com.smartlook.android.common.http.model.Header -import com.smartlook.android.common.http.model.Response -import com.smartlook.sdk.common.job.JobIdStorage -import com.smartlook.sdk.common.storage.Storage +import com.splunk.android.common.http.HttpClient +import com.splunk.android.common.http.model.Header +import com.splunk.android.common.http.model.Response +import com.splunk.sdk.common.job.JobIdStorage +import com.splunk.sdk.common.storage.Storage import java.net.UnknownHostException @SuppressLint("NewApi") diff --git a/common/otel/internal/src/main/java/com/cisco/mrum/common/otel/internal/storage/OtelStorage.kt b/common/otel/internal/src/main/java/com/cisco/mrum/common/otel/internal/storage/OtelStorage.kt index 941bfad7..de7560ff 100644 --- a/common/otel/internal/src/main/java/com/cisco/mrum/common/otel/internal/storage/OtelStorage.kt +++ b/common/otel/internal/src/main/java/com/cisco/mrum/common/otel/internal/storage/OtelStorage.kt @@ -16,7 +16,7 @@ package com.cisco.mrum.common.otel.internal.storage -import com.smartlook.sdk.common.storage.preferences.IPreferences +import com.splunk.sdk.common.storage.preferences.IPreferences class OtelStorage private constructor( private val preferences: IPreferences diff --git a/common/storage/src/main/java/com/smartlook/sdk/common/storage/IStorage.kt b/common/storage/src/main/java/com/splunk/sdk/common/storage/IStorage.kt similarity index 97% rename from common/storage/src/main/java/com/smartlook/sdk/common/storage/IStorage.kt rename to common/storage/src/main/java/com/splunk/sdk/common/storage/IStorage.kt index 26bcaed1..3ef2480d 100644 --- a/common/storage/src/main/java/com/smartlook/sdk/common/storage/IStorage.kt +++ b/common/storage/src/main/java/com/splunk/sdk/common/storage/IStorage.kt @@ -1,7 +1,7 @@ -package com.smartlook.sdk.common.storage +package com.splunk.sdk.common.storage import android.graphics.Bitmap -import com.smartlook.sdk.common.storage.preferences.IPreferences +import com.splunk.sdk.common.storage.preferences.IPreferences import java.io.File interface IStorage { diff --git a/common/storage/src/main/java/com/smartlook/sdk/common/storage/Paths.kt b/common/storage/src/main/java/com/splunk/sdk/common/storage/Paths.kt similarity index 92% rename from common/storage/src/main/java/com/smartlook/sdk/common/storage/Paths.kt rename to common/storage/src/main/java/com/splunk/sdk/common/storage/Paths.kt index f720f37f..b2e01105 100644 --- a/common/storage/src/main/java/com/smartlook/sdk/common/storage/Paths.kt +++ b/common/storage/src/main/java/com/splunk/sdk/common/storage/Paths.kt @@ -1,11 +1,11 @@ -package com.smartlook.sdk.common.storage +package com.splunk.sdk.common.storage import android.content.Context import android.os.Build -import com.smartlook.sdk.common.storage.extensions.createNewFileOnPath -import com.smartlook.sdk.common.storage.extensions.formatChildDir -import com.smartlook.sdk.common.storage.extensions.formatChildFile -import com.smartlook.sdk.common.utils.runOnAndroidAtLeast +import com.splunk.sdk.common.storage.extensions.createNewFileOnPath +import com.splunk.sdk.common.storage.extensions.formatChildDir +import com.splunk.sdk.common.storage.extensions.formatChildFile +import com.splunk.sdk.common.utils.runOnAndroidAtLeast import java.io.File /** diff --git a/common/storage/src/main/java/com/smartlook/sdk/common/storage/Storage.kt b/common/storage/src/main/java/com/splunk/sdk/common/storage/Storage.kt similarity index 97% rename from common/storage/src/main/java/com/smartlook/sdk/common/storage/Storage.kt rename to common/storage/src/main/java/com/splunk/sdk/common/storage/Storage.kt index e26cf044..b3b3f6f8 100644 --- a/common/storage/src/main/java/com/smartlook/sdk/common/storage/Storage.kt +++ b/common/storage/src/main/java/com/splunk/sdk/common/storage/Storage.kt @@ -1,17 +1,17 @@ -package com.smartlook.sdk.common.storage +package com.splunk.sdk.common.storage import android.content.Context import android.graphics.Bitmap import com.cisco.android.common.logger.Logger -import com.smartlook.sdk.common.storage.extensions.MB -import com.smartlook.sdk.common.storage.extensions.createNewFileOnPath -import com.smartlook.sdk.common.storage.extensions.oldestChildDir -import com.smartlook.sdk.common.storage.extensions.statFsFreeSpace -import com.smartlook.sdk.common.storage.policy.SizeCache -import com.smartlook.sdk.common.storage.policy.StoragePolicy -import com.smartlook.sdk.common.storage.preferences.FilePermanentCache -import com.smartlook.sdk.common.storage.preferences.Preferences -import com.smartlook.sdk.common.utils.runOnBackgroundThread +import com.splunk.sdk.common.storage.extensions.MB +import com.splunk.sdk.common.storage.extensions.createNewFileOnPath +import com.splunk.sdk.common.storage.extensions.oldestChildDir +import com.splunk.sdk.common.storage.extensions.statFsFreeSpace +import com.splunk.sdk.common.storage.policy.SizeCache +import com.splunk.sdk.common.storage.policy.StoragePolicy +import com.splunk.sdk.common.storage.preferences.FilePermanentCache +import com.splunk.sdk.common.storage.preferences.Preferences +import com.splunk.sdk.common.utils.runOnBackgroundThread import java.io.File import java.lang.Long.min diff --git a/common/storage/src/main/java/com/smartlook/sdk/common/storage/extensions/FileExt.kt b/common/storage/src/main/java/com/splunk/sdk/common/storage/extensions/FileExt.kt similarity index 93% rename from common/storage/src/main/java/com/smartlook/sdk/common/storage/extensions/FileExt.kt rename to common/storage/src/main/java/com/splunk/sdk/common/storage/extensions/FileExt.kt index c92d7ab7..74c21133 100644 --- a/common/storage/src/main/java/com/smartlook/sdk/common/storage/extensions/FileExt.kt +++ b/common/storage/src/main/java/com/splunk/sdk/common/storage/extensions/FileExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.storage.extensions +package com.splunk.sdk.common.storage.extensions import android.os.StatFs import java.io.File diff --git a/common/storage/src/main/java/com/smartlook/sdk/common/storage/extensions/FileStatExt.kt b/common/storage/src/main/java/com/splunk/sdk/common/storage/extensions/FileStatExt.kt similarity index 85% rename from common/storage/src/main/java/com/smartlook/sdk/common/storage/extensions/FileStatExt.kt rename to common/storage/src/main/java/com/splunk/sdk/common/storage/extensions/FileStatExt.kt index f1692c4e..8e2c997c 100644 --- a/common/storage/src/main/java/com/smartlook/sdk/common/storage/extensions/FileStatExt.kt +++ b/common/storage/src/main/java/com/splunk/sdk/common/storage/extensions/FileStatExt.kt @@ -1,8 +1,8 @@ -package com.smartlook.sdk.common.storage.extensions +package com.splunk.sdk.common.storage.extensions import android.os.Build import android.os.StatFs -import com.smartlook.sdk.common.utils.runOnAndroidAtLeast +import com.splunk.sdk.common.utils.runOnAndroidAtLeast internal val StatFs.blockSizeCompat: Long get() = runOnAndroidAtLeast(Build.VERSION_CODES.JELLY_BEAN_MR2) { blockSizeLong } ?: blockSizeDeprecated diff --git a/common/storage/src/main/java/com/smartlook/sdk/common/storage/extensions/IntExt.kt b/common/storage/src/main/java/com/splunk/sdk/common/storage/extensions/IntExt.kt similarity index 57% rename from common/storage/src/main/java/com/smartlook/sdk/common/storage/extensions/IntExt.kt rename to common/storage/src/main/java/com/splunk/sdk/common/storage/extensions/IntExt.kt index cb422bde..3936a48e 100644 --- a/common/storage/src/main/java/com/smartlook/sdk/common/storage/extensions/IntExt.kt +++ b/common/storage/src/main/java/com/splunk/sdk/common/storage/extensions/IntExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.storage.extensions +package com.splunk.sdk.common.storage.extensions internal val Int.MB: Long get() = (this * 1024 * 1024).toLong() diff --git a/common/storage/src/main/java/com/smartlook/sdk/common/storage/policy/SizeCache.kt b/common/storage/src/main/java/com/splunk/sdk/common/storage/policy/SizeCache.kt similarity index 91% rename from common/storage/src/main/java/com/smartlook/sdk/common/storage/policy/SizeCache.kt rename to common/storage/src/main/java/com/splunk/sdk/common/storage/policy/SizeCache.kt index 9790aadd..70f3de3f 100644 --- a/common/storage/src/main/java/com/smartlook/sdk/common/storage/policy/SizeCache.kt +++ b/common/storage/src/main/java/com/splunk/sdk/common/storage/policy/SizeCache.kt @@ -1,8 +1,8 @@ -package com.smartlook.sdk.common.storage.policy +package com.splunk.sdk.common.storage.policy import com.cisco.android.common.logger.Logger -import com.smartlook.sdk.common.utils.extensions.safeSubmit -import com.smartlook.sdk.common.utils.thread.NamedThreadFactory +import com.splunk.sdk.common.utils.extensions.safeSubmit +import com.splunk.sdk.common.utils.thread.NamedThreadFactory import java.io.File import java.util.concurrent.ExecutorService import java.util.concurrent.Executors diff --git a/common/storage/src/main/java/com/smartlook/sdk/common/storage/policy/StoragePolicy.kt b/common/storage/src/main/java/com/splunk/sdk/common/storage/policy/StoragePolicy.kt similarity index 85% rename from common/storage/src/main/java/com/smartlook/sdk/common/storage/policy/StoragePolicy.kt rename to common/storage/src/main/java/com/splunk/sdk/common/storage/policy/StoragePolicy.kt index a2127049..83482a5a 100644 --- a/common/storage/src/main/java/com/smartlook/sdk/common/storage/policy/StoragePolicy.kt +++ b/common/storage/src/main/java/com/splunk/sdk/common/storage/policy/StoragePolicy.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.storage.policy +package com.splunk.sdk.common.storage.policy import java.io.File diff --git a/common/storage/src/main/java/com/smartlook/sdk/common/storage/preferences/FilePermanentCache.kt b/common/storage/src/main/java/com/splunk/sdk/common/storage/preferences/FilePermanentCache.kt similarity index 93% rename from common/storage/src/main/java/com/smartlook/sdk/common/storage/preferences/FilePermanentCache.kt rename to common/storage/src/main/java/com/splunk/sdk/common/storage/preferences/FilePermanentCache.kt index ec650a24..a95e8407 100644 --- a/common/storage/src/main/java/com/smartlook/sdk/common/storage/preferences/FilePermanentCache.kt +++ b/common/storage/src/main/java/com/splunk/sdk/common/storage/preferences/FilePermanentCache.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.storage.preferences +package com.splunk.sdk.common.storage.preferences import com.cisco.android.common.logger.Logger import java.io.File diff --git a/common/storage/src/main/java/com/smartlook/sdk/common/storage/preferences/IPermanentCache.kt b/common/storage/src/main/java/com/splunk/sdk/common/storage/preferences/IPermanentCache.kt similarity index 62% rename from common/storage/src/main/java/com/smartlook/sdk/common/storage/preferences/IPermanentCache.kt rename to common/storage/src/main/java/com/splunk/sdk/common/storage/preferences/IPermanentCache.kt index f5a7f13e..1f8c5b6f 100644 --- a/common/storage/src/main/java/com/smartlook/sdk/common/storage/preferences/IPermanentCache.kt +++ b/common/storage/src/main/java/com/splunk/sdk/common/storage/preferences/IPermanentCache.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.storage.preferences +package com.splunk.sdk.common.storage.preferences interface IPermanentCache { fun load(): String diff --git a/common/storage/src/main/java/com/smartlook/sdk/common/storage/preferences/IPreferences.kt b/common/storage/src/main/java/com/splunk/sdk/common/storage/preferences/IPreferences.kt similarity index 93% rename from common/storage/src/main/java/com/smartlook/sdk/common/storage/preferences/IPreferences.kt rename to common/storage/src/main/java/com/splunk/sdk/common/storage/preferences/IPreferences.kt index fc5a1481..d818a66f 100644 --- a/common/storage/src/main/java/com/smartlook/sdk/common/storage/preferences/IPreferences.kt +++ b/common/storage/src/main/java/com/splunk/sdk/common/storage/preferences/IPreferences.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.storage.preferences +package com.splunk.sdk.common.storage.preferences interface IPreferences { fun putString(key: String, value: String): IPreferences diff --git a/common/storage/src/main/java/com/smartlook/sdk/common/storage/preferences/Preferences.kt b/common/storage/src/main/java/com/splunk/sdk/common/storage/preferences/Preferences.kt similarity index 96% rename from common/storage/src/main/java/com/smartlook/sdk/common/storage/preferences/Preferences.kt rename to common/storage/src/main/java/com/splunk/sdk/common/storage/preferences/Preferences.kt index 01968cfc..60bfd3b2 100644 --- a/common/storage/src/main/java/com/smartlook/sdk/common/storage/preferences/Preferences.kt +++ b/common/storage/src/main/java/com/splunk/sdk/common/storage/preferences/Preferences.kt @@ -1,8 +1,8 @@ -package com.smartlook.sdk.common.storage.preferences +package com.splunk.sdk.common.storage.preferences import com.cisco.android.common.logger.Logger -import com.smartlook.sdk.common.utils.Lock -import com.smartlook.sdk.common.utils.extensions.safeSubmit +import com.splunk.sdk.common.utils.Lock +import com.splunk.sdk.common.utils.extensions.safeSubmit import org.json.JSONException import java.util.concurrent.Executors import kotlin.collections.set diff --git a/common/storage/src/main/java/com/smartlook/sdk/common/storage/preferences/Value.kt b/common/storage/src/main/java/com/splunk/sdk/common/storage/preferences/Value.kt similarity index 96% rename from common/storage/src/main/java/com/smartlook/sdk/common/storage/preferences/Value.kt rename to common/storage/src/main/java/com/splunk/sdk/common/storage/preferences/Value.kt index 1b18d58e..6c4cfcd9 100644 --- a/common/storage/src/main/java/com/smartlook/sdk/common/storage/preferences/Value.kt +++ b/common/storage/src/main/java/com/splunk/sdk/common/storage/preferences/Value.kt @@ -1,6 +1,6 @@ -package com.smartlook.sdk.common.storage.preferences +package com.splunk.sdk.common.storage.preferences -import com.smartlook.sdk.common.utils.extensions.getFloat +import com.splunk.sdk.common.utils.extensions.getFloat import org.json.JSONObject import kotlin.collections.component1 import kotlin.collections.component2 diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/AppStateObserver.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/AppStateObserver.kt similarity index 96% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/AppStateObserver.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/AppStateObserver.kt index 08586e57..3dff179f 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/AppStateObserver.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/AppStateObserver.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils +package com.splunk.sdk.common.utils import android.app.Activity import android.app.Application @@ -12,9 +12,9 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentManager -import com.smartlook.sdk.common.utils.adapters.ActivityLifecycleCallbacksAdapter -import com.smartlook.sdk.common.utils.extensions.getStatic -import com.smartlook.sdk.common.utils.extensions.toKClass +import com.splunk.sdk.common.utils.adapters.ActivityLifecycleCallbacksAdapter +import com.splunk.sdk.common.utils.extensions.getStatic +import com.splunk.sdk.common.utils.extensions.toKClass import java.lang.ref.WeakReference // MARK Required Proguard rules diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/Barrier.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/Barrier.kt similarity index 96% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/Barrier.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/Barrier.kt index 5602a068..98ff7006 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/Barrier.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/Barrier.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils +package com.splunk.sdk.common.utils class Barrier( @Volatile private var lockCount: Int = 0 diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/Common.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/Common.kt similarity index 91% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/Common.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/Common.kt index 50d35863..e5b8b9e9 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/Common.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/Common.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils +package com.splunk.sdk.common.utils import android.os.Build import androidx.annotation.ChecksSdkIntAtLeast diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/FragmentTransactionObserver.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/FragmentTransactionObserver.kt similarity index 82% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/FragmentTransactionObserver.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/FragmentTransactionObserver.kt index 7303ea0f..73a38168 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/FragmentTransactionObserver.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/FragmentTransactionObserver.kt @@ -1,10 +1,10 @@ -package com.smartlook.sdk.common.utils +package com.splunk.sdk.common.utils import android.view.View import androidx.fragment.app.Fragment -import com.smartlook.sdk.common.utils.extensions.get -import com.smartlook.sdk.common.utils.extensions.getFragmentSpecialEffectsControllerViewTag -import com.smartlook.sdk.common.utils.extensions.invoke +import com.splunk.sdk.common.utils.extensions.get +import com.splunk.sdk.common.utils.extensions.getFragmentSpecialEffectsControllerViewTag +import com.splunk.sdk.common.utils.extensions.invoke // MARK Required Proguard rules diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/HashCalculationUtils.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/HashCalculationUtils.kt similarity index 96% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/HashCalculationUtils.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/HashCalculationUtils.kt index 321d2cfd..7c209dbb 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/HashCalculationUtils.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/HashCalculationUtils.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils +package com.splunk.sdk.common.utils import java.io.File import java.io.FileInputStream diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/Lock.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/Lock.kt similarity index 92% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/Lock.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/Lock.kt index dc153ccf..0f88be5f 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/Lock.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/Lock.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils +package com.splunk.sdk.common.utils class Lock(isLocked: Boolean = false) { diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/Threads.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/Threads.kt similarity index 93% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/Threads.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/Threads.kt index 76b42e40..0cf6d0fb 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/Threads.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/Threads.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils +package com.splunk.sdk.common.utils import android.os.Handler import android.os.Looper diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/adapters/ActivityLifecycleCallbacksAdapter.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/adapters/ActivityLifecycleCallbacksAdapter.kt similarity index 93% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/adapters/ActivityLifecycleCallbacksAdapter.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/adapters/ActivityLifecycleCallbacksAdapter.kt index aabe75dc..a93aa8d8 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/adapters/ActivityLifecycleCallbacksAdapter.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/adapters/ActivityLifecycleCallbacksAdapter.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.adapters +package com.splunk.sdk.common.utils.adapters import android.app.Activity import android.app.Application diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ActivityExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ActivityExt.kt similarity index 74% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ActivityExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ActivityExt.kt index 792277dd..3c6cf55d 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ActivityExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ActivityExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions import android.app.Activity import android.view.ViewGroup diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/AnyExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/AnyExt.kt similarity index 96% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/AnyExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/AnyExt.kt index 13df1474..36659994 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/AnyExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/AnyExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions import java.lang.reflect.Field import kotlin.reflect.KClass diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/BitmapExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/BitmapExt.kt similarity index 68% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/BitmapExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/BitmapExt.kt index 45d84c07..120fae69 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/BitmapExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/BitmapExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions import android.graphics.Bitmap diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/CollectionExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/CollectionExt.kt similarity index 87% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/CollectionExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/CollectionExt.kt index 5553bffe..c9e07e55 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/CollectionExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/CollectionExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions /** * Function is using indices instead of iterator if possible. diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ContextExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ContextExt.kt similarity index 86% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ContextExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ContextExt.kt index 4e91939f..b406fe82 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ContextExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ContextExt.kt @@ -1,8 +1,8 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions import android.content.Context import android.os.Build -import com.smartlook.sdk.common.utils.runOnAndroidAtLeast +import com.splunk.sdk.common.utils.runOnAndroidAtLeast import java.io.File private var fragmentSpecialEffectsControllerViewTag: Int? = 0 diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ExecutorServiceExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ExecutorServiceExt.kt similarity index 81% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ExecutorServiceExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ExecutorServiceExt.kt index 6d207d99..568f8be7 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ExecutorServiceExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ExecutorServiceExt.kt @@ -1,6 +1,6 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions -import com.smartlook.sdk.common.utils.runOnUiThread +import com.splunk.sdk.common.utils.runOnUiThread import java.util.concurrent.ExecutorService import java.util.concurrent.Future diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/FieldExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/FieldExt.kt similarity index 91% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/FieldExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/FieldExt.kt index c3d6a4a4..f433d763 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/FieldExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/FieldExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions import android.annotation.SuppressLint import android.os.Build diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/JSONArrayExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/JSONArrayExt.kt similarity index 82% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/JSONArrayExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/JSONArrayExt.kt index 975df991..652f78ab 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/JSONArrayExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/JSONArrayExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions import org.json.JSONArray diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/JSONObjectExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/JSONObjectExt.kt similarity index 95% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/JSONObjectExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/JSONObjectExt.kt index fb60db4a..f00b45b0 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/JSONObjectExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/JSONObjectExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions import org.json.JSONObject diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/KClassExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/KClassExt.kt similarity index 92% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/KClassExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/KClassExt.kt index d09d8b61..8d0fbc98 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/KClassExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/KClassExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions import java.lang.reflect.Field import kotlin.reflect.KClass diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ListExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ListExt.kt similarity index 78% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ListExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ListExt.kt index aa81ecda..f4b14ba3 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ListExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ListExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions /** * Function is using indices instead of iterator. diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/MutableCollectionExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/MutableCollectionExt.kt similarity index 82% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/MutableCollectionExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/MutableCollectionExt.kt index 153a727a..23f27a45 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/MutableCollectionExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/MutableCollectionExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions operator fun MutableCollection.plusAssign(element: E?) { add(element ?: return) diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ResourcesExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ResourcesExt.kt similarity index 82% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ResourcesExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ResourcesExt.kt index 11aefd3d..f3217c13 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ResourcesExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ResourcesExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions import android.content.res.Resources import android.util.TypedValue diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ScheduledExecutorServiceExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ScheduledExecutorServiceExt.kt similarity index 84% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ScheduledExecutorServiceExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ScheduledExecutorServiceExt.kt index 74e141ee..04d07550 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ScheduledExecutorServiceExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ScheduledExecutorServiceExt.kt @@ -1,6 +1,6 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions -import com.smartlook.sdk.common.utils.runOnUiThread +import com.splunk.sdk.common.utils.runOnUiThread import java.util.concurrent.ScheduledExecutorService import java.util.concurrent.ScheduledFuture import java.util.concurrent.TimeUnit diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/StringBuilderExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/StringBuilderExt.kt similarity index 75% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/StringBuilderExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/StringBuilderExt.kt index c0974f87..dd8b09bd 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/StringBuilderExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/StringBuilderExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions operator fun StringBuilder.plusAssign(value: Char) { append(value) diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/StringExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/StringExt.kt similarity index 89% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/StringExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/StringExt.kt index f50bf421..6a0cf61f 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/StringExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/StringExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions import org.json.JSONArray import org.json.JSONObject diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ViewExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ViewExt.kt similarity index 91% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ViewExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ViewExt.kt index b4e1b166..c3c6b2f1 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ViewExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ViewExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions import android.app.Activity import android.app.Application diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ViewGroupExt.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ViewGroupExt.kt similarity index 86% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ViewGroupExt.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ViewGroupExt.kt index c538b42b..c8f8b2a1 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/extensions/ViewGroupExt.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/extensions/ViewGroupExt.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.extensions +package com.splunk.sdk.common.utils.extensions import android.view.View import android.view.ViewGroup diff --git a/common/utils/src/main/java/com/smartlook/sdk/common/utils/thread/NamedThreadFactory.kt b/common/utils/src/main/java/com/splunk/sdk/common/utils/thread/NamedThreadFactory.kt similarity index 89% rename from common/utils/src/main/java/com/smartlook/sdk/common/utils/thread/NamedThreadFactory.kt rename to common/utils/src/main/java/com/splunk/sdk/common/utils/thread/NamedThreadFactory.kt index 226e9ef0..7665d438 100644 --- a/common/utils/src/main/java/com/smartlook/sdk/common/utils/thread/NamedThreadFactory.kt +++ b/common/utils/src/main/java/com/splunk/sdk/common/utils/thread/NamedThreadFactory.kt @@ -1,4 +1,4 @@ -package com.smartlook.sdk.common.utils.thread +package com.splunk.sdk.common.utils.thread import java.util.concurrent.ThreadFactory import java.util.concurrent.atomic.AtomicInteger diff --git a/instrumentation/buildtime/build-info-injector/build.gradle.kts b/instrumentation/buildtime/build-info-injector/build.gradle.kts index 3339fd1a..9d726e3c 100644 --- a/instrumentation/buildtime/build-info-injector/build.gradle.kts +++ b/instrumentation/buildtime/build-info-injector/build.gradle.kts @@ -41,7 +41,7 @@ gradlePlugin { plugins { create("androidBuildInfoInjectorPlugin") { id = "$defaultGroupId.${artifactPrefix}build-info-injector-plugin" - implementationClass = "com.cisco.android.rum.buildInfoInjector.BuildInfoInjectorPlugin" + implementationClass = "com.splunk.rum.buildInfoInjector.BuildInfoInjectorPlugin" displayName = "Cisco Android Build Info Injector Plugin" } } diff --git a/instrumentation/buildtime/build-info-injector/src/main/java/com/cisco/android/rum/buildInfoInjector/BuildInfoInjectorPlugin.kt b/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/BuildInfoInjectorPlugin.kt similarity index 96% rename from instrumentation/buildtime/build-info-injector/src/main/java/com/cisco/android/rum/buildInfoInjector/BuildInfoInjectorPlugin.kt rename to instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/BuildInfoInjectorPlugin.kt index 855cf9ce..b8c4d874 100644 --- a/instrumentation/buildtime/build-info-injector/src/main/java/com/cisco/android/rum/buildInfoInjector/BuildInfoInjectorPlugin.kt +++ b/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/BuildInfoInjectorPlugin.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.cisco.android.rum.buildInfoInjector +package com.splunk.rum.buildInfoInjector import com.android.build.api.variant.ApplicationAndroidComponentsExtension import com.android.build.api.variant.ApplicationVariant -import com.cisco.android.rum.buildInfoInjector.utils.MappingFileModifier -import com.cisco.android.rum.buildInfoInjector.utils.ObfuscationTypeAnalyzer +import com.splunk.rum.buildInfoInjector.utils.MappingFileModifier +import com.splunk.rum.buildInfoInjector.utils.ObfuscationTypeAnalyzer import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.logging.Logger diff --git a/instrumentation/buildtime/build-info-injector/src/main/java/com/cisco/android/rum/buildInfoInjector/utils/MappingFileModifier.kt b/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/utils/MappingFileModifier.kt similarity index 97% rename from instrumentation/buildtime/build-info-injector/src/main/java/com/cisco/android/rum/buildInfoInjector/utils/MappingFileModifier.kt rename to instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/utils/MappingFileModifier.kt index 21941259..36dce021 100644 --- a/instrumentation/buildtime/build-info-injector/src/main/java/com/cisco/android/rum/buildInfoInjector/utils/MappingFileModifier.kt +++ b/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/utils/MappingFileModifier.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.buildInfoInjector.utils +package com.splunk.rum.buildInfoInjector.utils import com.android.build.api.variant.ApplicationVariant import org.gradle.api.Project @@ -45,7 +45,7 @@ class MappingFileModifier(private val pluginLogger: Logger) { } private fun locateMappingFile(project: Project, variant: ApplicationVariant): File? { - val mappingFilePath = "${project.buildDir}/outputs/mapping/${variant.name}/${MAPPING_FILE_NAME}" + val mappingFilePath = "${project.buildDir}/outputs/mapping/${variant.name}/$MAPPING_FILE_NAME" val mappingFile = project.file(mappingFilePath) if (project.file(mappingFile).isFile) { diff --git a/instrumentation/buildtime/build-info-injector/src/main/java/com/cisco/android/rum/buildInfoInjector/utils/ObfuscationTypeAnalyzer.kt b/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/utils/ObfuscationTypeAnalyzer.kt similarity index 98% rename from instrumentation/buildtime/build-info-injector/src/main/java/com/cisco/android/rum/buildInfoInjector/utils/ObfuscationTypeAnalyzer.kt rename to instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/utils/ObfuscationTypeAnalyzer.kt index e0d328ed..fa459e3f 100644 --- a/instrumentation/buildtime/build-info-injector/src/main/java/com/cisco/android/rum/buildInfoInjector/utils/ObfuscationTypeAnalyzer.kt +++ b/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/utils/ObfuscationTypeAnalyzer.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.buildInfoInjector.utils +package com.splunk.rum.buildInfoInjector.utils import com.android.build.gradle.AppExtension import org.gradle.api.Project diff --git a/instrumentation/buildtime/networkrequest/bci/build.gradle.kts b/instrumentation/buildtime/networkrequest/bci/build.gradle.kts index 52d22c83..e716d6e0 100644 --- a/instrumentation/buildtime/networkrequest/bci/build.gradle.kts +++ b/instrumentation/buildtime/networkrequest/bci/build.gradle.kts @@ -16,7 +16,7 @@ ext { } android { - namespace = "com.cisco.android.rum.networkrequest.bci" + namespace = "com.splunk.rum.networkrequest.bci" compileSdk = 33 defaultConfig { diff --git a/instrumentation/buildtime/networkrequest/bci/src/main/java/com/cisco/android/rum/bci/httpurlconnection/HttpUrlConnectionPlugin.java b/instrumentation/buildtime/networkrequest/bci/src/main/java/com/splunk/rum/bci/httpurlconnection/HttpUrlConnectionPlugin.java similarity index 99% rename from instrumentation/buildtime/networkrequest/bci/src/main/java/com/cisco/android/rum/bci/httpurlconnection/HttpUrlConnectionPlugin.java rename to instrumentation/buildtime/networkrequest/bci/src/main/java/com/splunk/rum/bci/httpurlconnection/HttpUrlConnectionPlugin.java index 27d02ed4..b64adeb1 100644 --- a/instrumentation/buildtime/networkrequest/bci/src/main/java/com/cisco/android/rum/bci/httpurlconnection/HttpUrlConnectionPlugin.java +++ b/instrumentation/buildtime/networkrequest/bci/src/main/java/com/splunk/rum/bci/httpurlconnection/HttpUrlConnectionPlugin.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.cisco.android.rum.bci.httpurlconnection; +package com.splunk.rum.bci.httpurlconnection; import static net.bytebuddy.matcher.ElementMatchers.is; import static net.bytebuddy.matcher.ElementMatchers.isMethod; -import com.cisco.android.rum.library.httpurlconnection.HttpUrlReplacements; +import com.splunk.rum.library.httpurlconnection.HttpUrlReplacements; import net.bytebuddy.asm.MemberSubstitution; import net.bytebuddy.build.AndroidDescriptor; diff --git a/instrumentation/buildtime/networkrequest/bci/src/main/java/com/cisco/android/rum/bci/okhttp3/OkHttpCallbackAdvice.java b/instrumentation/buildtime/networkrequest/bci/src/main/java/com/splunk/rum/bci/okhttp3/OkHttpCallbackAdvice.java similarity index 86% rename from instrumentation/buildtime/networkrequest/bci/src/main/java/com/cisco/android/rum/bci/okhttp3/OkHttpCallbackAdvice.java rename to instrumentation/buildtime/networkrequest/bci/src/main/java/com/splunk/rum/bci/okhttp3/OkHttpCallbackAdvice.java index f993cedd..0747c345 100644 --- a/instrumentation/buildtime/networkrequest/bci/src/main/java/com/cisco/android/rum/bci/okhttp3/OkHttpCallbackAdvice.java +++ b/instrumentation/buildtime/networkrequest/bci/src/main/java/com/splunk/rum/bci/okhttp3/OkHttpCallbackAdvice.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.cisco.android.rum.bci.okhttp3; +package com.splunk.rum.bci.okhttp3; -import com.cisco.android.rum.library.okhttp3.tracing.OkHttpCallbackAdviceHelper; -import com.cisco.android.rum.library.okhttp3.tracing.TracingCallback; +import com.splunk.rum.library.okhttp3.tracing.OkHttpCallbackAdviceHelper; +import com.splunk.rum.library.okhttp3.tracing.TracingCallback; import net.bytebuddy.asm.Advice; diff --git a/instrumentation/buildtime/networkrequest/bci/src/main/java/com/cisco/android/rum/bci/okhttp3/OkHttpCallbackPlugin.java b/instrumentation/buildtime/networkrequest/bci/src/main/java/com/splunk/rum/bci/okhttp3/OkHttpCallbackPlugin.java similarity index 97% rename from instrumentation/buildtime/networkrequest/bci/src/main/java/com/cisco/android/rum/bci/okhttp3/OkHttpCallbackPlugin.java rename to instrumentation/buildtime/networkrequest/bci/src/main/java/com/splunk/rum/bci/okhttp3/OkHttpCallbackPlugin.java index 77417ba2..b3a36769 100644 --- a/instrumentation/buildtime/networkrequest/bci/src/main/java/com/cisco/android/rum/bci/okhttp3/OkHttpCallbackPlugin.java +++ b/instrumentation/buildtime/networkrequest/bci/src/main/java/com/splunk/rum/bci/okhttp3/OkHttpCallbackPlugin.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.bci.okhttp3; +package com.splunk.rum.bci.okhttp3; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; diff --git a/instrumentation/buildtime/networkrequest/bci/src/main/java/com/cisco/android/rum/bci/okhttp3/OkHttpClientAdvice.java b/instrumentation/buildtime/networkrequest/bci/src/main/java/com/splunk/rum/bci/okhttp3/OkHttpClientAdvice.java similarity index 93% rename from instrumentation/buildtime/networkrequest/bci/src/main/java/com/cisco/android/rum/bci/okhttp3/OkHttpClientAdvice.java rename to instrumentation/buildtime/networkrequest/bci/src/main/java/com/splunk/rum/bci/okhttp3/OkHttpClientAdvice.java index e41bfeee..f3b464b2 100644 --- a/instrumentation/buildtime/networkrequest/bci/src/main/java/com/cisco/android/rum/bci/okhttp3/OkHttpClientAdvice.java +++ b/instrumentation/buildtime/networkrequest/bci/src/main/java/com/splunk/rum/bci/okhttp3/OkHttpClientAdvice.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.cisco.android.rum.bci.okhttp3; +package com.splunk.rum.bci.okhttp3; -import com.cisco.android.rum.library.okhttp3.OkHttp3Singletons; +import com.splunk.rum.library.okhttp3.OkHttp3Singletons; import net.bytebuddy.asm.Advice; diff --git a/instrumentation/buildtime/networkrequest/bci/src/main/java/com/cisco/android/rum/bci/okhttp3/OkHttpClientPlugin.java b/instrumentation/buildtime/networkrequest/bci/src/main/java/com/splunk/rum/bci/okhttp3/OkHttpClientPlugin.java similarity index 97% rename from instrumentation/buildtime/networkrequest/bci/src/main/java/com/cisco/android/rum/bci/okhttp3/OkHttpClientPlugin.java rename to instrumentation/buildtime/networkrequest/bci/src/main/java/com/splunk/rum/bci/okhttp3/OkHttpClientPlugin.java index d174d02a..678b49ec 100644 --- a/instrumentation/buildtime/networkrequest/bci/src/main/java/com/cisco/android/rum/bci/okhttp3/OkHttpClientPlugin.java +++ b/instrumentation/buildtime/networkrequest/bci/src/main/java/com/splunk/rum/bci/okhttp3/OkHttpClientPlugin.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.bci.okhttp3; +package com.splunk.rum.bci.okhttp3; import net.bytebuddy.asm.Advice; import net.bytebuddy.build.Plugin; diff --git a/instrumentation/buildtime/networkrequest/bci/src/main/resources/META-INF/net.bytebuddy/build.plugins b/instrumentation/buildtime/networkrequest/bci/src/main/resources/META-INF/net.bytebuddy/build.plugins index bc467de1..9f34b0ae 100644 --- a/instrumentation/buildtime/networkrequest/bci/src/main/resources/META-INF/net.bytebuddy/build.plugins +++ b/instrumentation/buildtime/networkrequest/bci/src/main/resources/META-INF/net.bytebuddy/build.plugins @@ -1,3 +1,3 @@ -com.cisco.android.rum.bci.httpurlconnection.HttpUrlConnectionPlugin -com.cisco.android.rum.bci.okhttp3.OkHttpClientPlugin -com.cisco.android.rum.bci.okhttp3.OkHttpCallbackPlugin +com.splunk.rum.bci.httpurlconnection.HttpUrlConnectionPlugin +com.splunk.rum.bci.okhttp3.OkHttpClientPlugin +com.splunk.rum.bci.okhttp3.OkHttpCallbackPlugin diff --git a/instrumentation/buildtime/plugin/build.gradle.kts b/instrumentation/buildtime/plugin/build.gradle.kts index 549d5b50..9d1d77af 100644 --- a/instrumentation/buildtime/plugin/build.gradle.kts +++ b/instrumentation/buildtime/plugin/build.gradle.kts @@ -46,7 +46,7 @@ gradlePlugin { plugins { create("androidInstrumentationPlugin") { id = "$defaultGroupId.${artifactPrefix}plugin" - implementationClass = "com.cisco.android.rum.plugin.AndroidInstrumentationPlugin" + implementationClass = "com.splunk.rum.plugin.AndroidInstrumentationPlugin" displayName = "Cisco Android Auto-Instrumentation Plugin" } } diff --git a/instrumentation/buildtime/plugin/src/main/java/com/cisco/android/rum/plugin/AndroidInstrumentationPlugin.java b/instrumentation/buildtime/plugin/src/main/java/com/splunk/rum/plugin/AndroidInstrumentationPlugin.java similarity index 94% rename from instrumentation/buildtime/plugin/src/main/java/com/cisco/android/rum/plugin/AndroidInstrumentationPlugin.java rename to instrumentation/buildtime/plugin/src/main/java/com/splunk/rum/plugin/AndroidInstrumentationPlugin.java index 195f2595..15c5866d 100644 --- a/instrumentation/buildtime/plugin/src/main/java/com/cisco/android/rum/plugin/AndroidInstrumentationPlugin.java +++ b/instrumentation/buildtime/plugin/src/main/java/com/splunk/rum/plugin/AndroidInstrumentationPlugin.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.cisco.android.rum.plugin; +package com.splunk.rum.plugin; -import com.cisco.android.rum.buildInfoInjector.BuildInfoInjectorPlugin; +import com.splunk.rum.buildInfoInjector.BuildInfoInjectorPlugin; import net.bytebuddy.build.gradle.android.ByteBuddyAndroidPlugin; import org.gradle.api.Plugin; import org.gradle.api.Project; diff --git a/instrumentation/runtime/anr/build.gradle.kts b/instrumentation/runtime/anr/build.gradle.kts index 774d6f1b..03e392f0 100644 --- a/instrumentation/runtime/anr/build.gradle.kts +++ b/instrumentation/runtime/anr/build.gradle.kts @@ -21,7 +21,7 @@ ext { } android { - namespace = "com.cisco.android.rum.anr" + namespace = "com.splunk.rum.anr" } dependencies { diff --git a/instrumentation/runtime/anr/proguard-rules.pro b/instrumentation/runtime/anr/proguard-rules.pro index b1ddd996..20685429 100644 --- a/instrumentation/runtime/anr/proguard-rules.pro +++ b/instrumentation/runtime/anr/proguard-rules.pro @@ -1 +1 @@ --repackageclasses 'com.cisco.android.rum.anr' \ No newline at end of file +-repackageclasses 'com.splunk.rum.anr' \ No newline at end of file diff --git a/instrumentation/runtime/anr/src/main/java/com/cisco/android/rum/anr/ANRWatchDog.kt b/instrumentation/runtime/anr/src/main/java/com/splunk/rum/anr/ANRWatchDog.kt similarity index 98% rename from instrumentation/runtime/anr/src/main/java/com/cisco/android/rum/anr/ANRWatchDog.kt rename to instrumentation/runtime/anr/src/main/java/com/splunk/rum/anr/ANRWatchDog.kt index 4e248b3b..ff195ea6 100644 --- a/instrumentation/runtime/anr/src/main/java/com/cisco/android/rum/anr/ANRWatchDog.kt +++ b/instrumentation/runtime/anr/src/main/java/com/splunk/rum/anr/ANRWatchDog.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.anr +package com.splunk.rum.anr import android.os.Debug import android.os.Handler diff --git a/instrumentation/runtime/anr/src/main/java/com/cisco/android/rum/anr/AnrReportingHandler.kt b/instrumentation/runtime/anr/src/main/java/com/splunk/rum/anr/AnrReportingHandler.kt similarity index 98% rename from instrumentation/runtime/anr/src/main/java/com/cisco/android/rum/anr/AnrReportingHandler.kt rename to instrumentation/runtime/anr/src/main/java/com/splunk/rum/anr/AnrReportingHandler.kt index 19ac2e51..fcf8d775 100644 --- a/instrumentation/runtime/anr/src/main/java/com/cisco/android/rum/anr/AnrReportingHandler.kt +++ b/instrumentation/runtime/anr/src/main/java/com/splunk/rum/anr/AnrReportingHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.anr +package com.splunk.rum.anr import android.app.Application import android.content.Context @@ -22,7 +22,7 @@ import android.os.Handler import android.os.Looper import com.cisco.android.common.logger.Logger import com.cisco.mrum.common.otel.api.OpenTelemetry -import com.smartlook.sdk.common.utils.AppStateObserver +import com.splunk.sdk.common.utils.AppStateObserver import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.api.common.Attributes import io.opentelemetry.api.logs.Severity diff --git a/instrumentation/runtime/anr/src/test/java/com/cisco/android/rum/anr/ANRWatchDogTest.kt b/instrumentation/runtime/anr/src/test/java/com/splunk/rum/anr/ANRWatchDogTest.kt similarity index 97% rename from instrumentation/runtime/anr/src/test/java/com/cisco/android/rum/anr/ANRWatchDogTest.kt rename to instrumentation/runtime/anr/src/test/java/com/splunk/rum/anr/ANRWatchDogTest.kt index 7f345f3e..9fb295d9 100644 --- a/instrumentation/runtime/anr/src/test/java/com/cisco/android/rum/anr/ANRWatchDogTest.kt +++ b/instrumentation/runtime/anr/src/test/java/com/splunk/rum/anr/ANRWatchDogTest.kt @@ -14,9 +14,10 @@ * limitations under the License. */ -package com.cisco.android.rum.anr +package com.splunk.rum.anr import android.os.Handler +import com.splunk.rum.anr.ANRWatchDog import io.mockk.every import io.mockk.mockk import io.mockk.verify diff --git a/instrumentation/runtime/anr/src/test/java/com/cisco/android/rum/anr/AnrReportingHandlerTest.kt b/instrumentation/runtime/anr/src/test/java/com/splunk/rum/anr/AnrReportingHandlerTest.kt similarity index 99% rename from instrumentation/runtime/anr/src/test/java/com/cisco/android/rum/anr/AnrReportingHandlerTest.kt rename to instrumentation/runtime/anr/src/test/java/com/splunk/rum/anr/AnrReportingHandlerTest.kt index 9dd35de2..bc22054d 100644 --- a/instrumentation/runtime/anr/src/test/java/com/cisco/android/rum/anr/AnrReportingHandlerTest.kt +++ b/instrumentation/runtime/anr/src/test/java/com/splunk/rum/anr/AnrReportingHandlerTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.anr +package com.splunk.rum.anr import android.app.Application import android.content.Context @@ -32,6 +32,7 @@ import org.junit.Assert.assertNull import java.util.concurrent.ScheduledThreadPoolExecutor import java.util.concurrent.TimeUnit import com.cisco.mrum.common.otel.api.OpenTelemetry +import com.splunk.rum.anr.AnrReportingHandler import io.mockk.Runs import io.mockk.mockkObject import io.mockk.just diff --git a/instrumentation/runtime/crash/build.gradle.kts b/instrumentation/runtime/crash/build.gradle.kts index 55fa4059..e82a6838 100644 --- a/instrumentation/runtime/crash/build.gradle.kts +++ b/instrumentation/runtime/crash/build.gradle.kts @@ -20,7 +20,7 @@ ext { } android { - namespace = "com.cisco.android.rum.crash" + namespace = "com.splunk.rum.crash" } dependencies { diff --git a/instrumentation/runtime/crash/proguard-rules.pro b/instrumentation/runtime/crash/proguard-rules.pro index 4c688266..5de5b32a 100644 --- a/instrumentation/runtime/crash/proguard-rules.pro +++ b/instrumentation/runtime/crash/proguard-rules.pro @@ -1 +1 @@ --repackageclasses 'com.cisco.android.rum.crash' \ No newline at end of file +-repackageclasses 'com.splunk.rum.crash' \ No newline at end of file diff --git a/instrumentation/runtime/crash/src/main/java/com/cisco/android/rum/crash/CrashReportingHandler.kt b/instrumentation/runtime/crash/src/main/java/com/splunk/rum/crash/CrashReportingHandler.kt similarity index 98% rename from instrumentation/runtime/crash/src/main/java/com/cisco/android/rum/crash/CrashReportingHandler.kt rename to instrumentation/runtime/crash/src/main/java/com/splunk/rum/crash/CrashReportingHandler.kt index 7f8c532e..ecfd032a 100644 --- a/instrumentation/runtime/crash/src/main/java/com/cisco/android/rum/crash/CrashReportingHandler.kt +++ b/instrumentation/runtime/crash/src/main/java/com/splunk/rum/crash/CrashReportingHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.crash +package com.splunk.rum.crash import android.app.Application import android.content.Context @@ -23,7 +23,7 @@ import android.os.HandlerThread import android.util.Log import com.cisco.android.common.logger.Logger import com.cisco.mrum.common.otel.api.OpenTelemetry -import com.smartlook.sdk.common.utils.AppStateObserver +import com.splunk.sdk.common.utils.AppStateObserver import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.api.common.Attributes import org.json.JSONObject diff --git a/instrumentation/runtime/crash/src/test/java/com/cisco/android/rum/crash/CrashReportingHandlerTest.kt b/instrumentation/runtime/crash/src/test/java/com/splunk/rum/crash/CrashReportingHandlerTest.kt similarity index 98% rename from instrumentation/runtime/crash/src/test/java/com/cisco/android/rum/crash/CrashReportingHandlerTest.kt rename to instrumentation/runtime/crash/src/test/java/com/splunk/rum/crash/CrashReportingHandlerTest.kt index 29dd43da..11c42393 100644 --- a/instrumentation/runtime/crash/src/test/java/com/cisco/android/rum/crash/CrashReportingHandlerTest.kt +++ b/instrumentation/runtime/crash/src/test/java/com/splunk/rum/crash/CrashReportingHandlerTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.crash +package com.splunk.rum.crash import android.app.Application import android.content.Context @@ -26,6 +26,7 @@ import org.junit.Assert.assertNotEquals import org.junit.Assert.assertTrue import org.junit.Test import android.view.Choreographer +import com.splunk.rum.crash.CrashReportingHandler import io.mockk.mockkStatic import io.mockk.Runs import io.mockk.just diff --git a/instrumentation/runtime/networkrequest/library/build.gradle.kts b/instrumentation/runtime/networkrequest/library/build.gradle.kts index 50483cd7..059dc4d7 100644 --- a/instrumentation/runtime/networkrequest/library/build.gradle.kts +++ b/instrumentation/runtime/networkrequest/library/build.gradle.kts @@ -17,7 +17,7 @@ ext { } android { - namespace = "com.cisco.android.rum.networkrequest.library" + namespace = "com.splunk.rum.networkrequest.library" compileSdk = 33 defaultConfig { diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/common/HttpConfigUtil.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/common/HttpConfigUtil.java similarity index 90% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/common/HttpConfigUtil.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/common/HttpConfigUtil.java index 93c45fb9..44fa2748 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/common/HttpConfigUtil.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/common/HttpConfigUtil.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.cisco.android.rum.library.common; +package com.splunk.rum.library.common; import android.util.Log; -import com.cisco.android.rum.integration.networkrequest.configurer.NetworkRequestConfigurer; +import com.splunk.rum.integration.networkrequest.configurer.NetworkRequestConfigurer; public class HttpConfigUtil { private static final String TAG = "HttpConfigUtil"; diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/common/HttpInstrumentationConfig.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/common/HttpInstrumentationConfig.java similarity index 99% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/common/HttpInstrumentationConfig.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/common/HttpInstrumentationConfig.java index 13331ac8..1a0ded6f 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/common/HttpInstrumentationConfig.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/common/HttpInstrumentationConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.library.common; +package com.splunk.rum.library.common; import java.util.ArrayList; import java.util.HashMap; diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/httpurlconnection/HttpUrlInstrumentationConfig.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/httpurlconnection/HttpUrlInstrumentationConfig.java similarity index 97% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/httpurlconnection/HttpUrlInstrumentationConfig.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/httpurlconnection/HttpUrlInstrumentationConfig.java index bbfde938..1b4fdb9e 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/httpurlconnection/HttpUrlInstrumentationConfig.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/httpurlconnection/HttpUrlInstrumentationConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.library.httpurlconnection; +package com.splunk.rum.library.httpurlconnection; /** * Configuration for automatic instrumentation of HttpURLConnection/HttpsURLConnection requests. diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/httpurlconnection/HttpUrlReplacements.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/httpurlconnection/HttpUrlReplacements.java similarity index 97% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/httpurlconnection/HttpUrlReplacements.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/httpurlconnection/HttpUrlReplacements.java index edfe6482..36c14308 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/httpurlconnection/HttpUrlReplacements.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/httpurlconnection/HttpUrlReplacements.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.cisco.android.rum.library.httpurlconnection; +package com.splunk.rum.library.httpurlconnection; import android.os.SystemClock; import android.util.Log; -import com.cisco.android.rum.library.common.HttpConfigUtil; -import com.cisco.android.rum.library.httpurlconnection.tracing.HttpUrlConnectionSingletons; -import com.cisco.android.rum.library.httpurlconnection.tracing.RequestPropertySetter; +import com.splunk.rum.library.common.HttpConfigUtil; +import com.splunk.rum.library.httpurlconnection.tracing.HttpUrlConnectionSingletons; +import com.splunk.rum.library.httpurlconnection.tracing.RequestPropertySetter; import java.io.IOException; import java.io.InputStream; diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/httpurlconnection/tracing/HttpUrlConnectionSingletons.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/httpurlconnection/tracing/HttpUrlConnectionSingletons.java similarity index 97% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/httpurlconnection/tracing/HttpUrlConnectionSingletons.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/httpurlconnection/tracing/HttpUrlConnectionSingletons.java index 47b5c43e..0b2b9d67 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/httpurlconnection/tracing/HttpUrlConnectionSingletons.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/httpurlconnection/tracing/HttpUrlConnectionSingletons.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.cisco.android.rum.library.httpurlconnection.tracing; +package com.splunk.rum.library.httpurlconnection.tracing; import com.cisco.mrum.common.otel.api.OpenTelemetry; -import com.cisco.android.rum.library.common.HttpInstrumentationConfig; +import com.splunk.rum.library.common.HttpInstrumentationConfig; import java.net.URLConnection; diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/httpurlconnection/tracing/HttpUrlHttpAttributesGetter.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/httpurlconnection/tracing/HttpUrlHttpAttributesGetter.java similarity index 97% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/httpurlconnection/tracing/HttpUrlHttpAttributesGetter.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/httpurlconnection/tracing/HttpUrlHttpAttributesGetter.java index 21b80ea0..d51bdf4a 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/httpurlconnection/tracing/HttpUrlHttpAttributesGetter.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/httpurlconnection/tracing/HttpUrlHttpAttributesGetter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.library.httpurlconnection.tracing; +package com.splunk.rum.library.httpurlconnection.tracing; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/httpurlconnection/tracing/RequestPropertySetter.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/httpurlconnection/tracing/RequestPropertySetter.java similarity index 93% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/httpurlconnection/tracing/RequestPropertySetter.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/httpurlconnection/tracing/RequestPropertySetter.java index b6ba2033..191a6ceb 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/httpurlconnection/tracing/RequestPropertySetter.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/httpurlconnection/tracing/RequestPropertySetter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.library.httpurlconnection.tracing; +package com.splunk.rum.library.httpurlconnection.tracing; import java.net.URLConnection; diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/OkHttp3Singletons.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/OkHttp3Singletons.java similarity index 88% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/OkHttp3Singletons.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/OkHttp3Singletons.java index 203e292c..66a1ca9f 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/OkHttp3Singletons.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/OkHttp3Singletons.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.cisco.android.rum.library.okhttp3; +package com.splunk.rum.library.okhttp3; import static java.util.Collections.singletonList; -import com.cisco.android.rum.library.common.HttpConfigUtil; -import com.cisco.android.rum.library.common.HttpInstrumentationConfig; -import com.cisco.android.rum.library.okhttp3.tracing.ConnectionErrorWrapperInterceptor; -import com.cisco.android.rum.library.okhttp3.tracing.OkHttpCallbackAdviceHelper; -import com.cisco.android.rum.library.okhttp3.tracing.OkHttpCustomConfigArgument; -import com.cisco.android.rum.library.okhttp3.tracing.ResendCountContextInterceptor; -import com.cisco.android.rum.library.okhttp3.tracing.TracingInterceptor; +import com.splunk.rum.library.common.HttpConfigUtil; +import com.splunk.rum.library.common.HttpInstrumentationConfig; +import com.splunk.rum.library.okhttp3.tracing.ConnectionErrorWrapperInterceptor; +import com.splunk.rum.library.okhttp3.tracing.OkHttpCallbackAdviceHelper; +import com.splunk.rum.library.okhttp3.tracing.OkHttpCustomConfigArgument; +import com.splunk.rum.library.okhttp3.tracing.ResendCountContextInterceptor; +import com.splunk.rum.library.okhttp3.tracing.TracingInterceptor; import com.cisco.mrum.common.otel.api.OpenTelemetry; import io.opentelemetry.context.Context; diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/ConnectionErrorWrapperInterceptor.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/ConnectionErrorWrapperInterceptor.java similarity index 96% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/ConnectionErrorWrapperInterceptor.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/ConnectionErrorWrapperInterceptor.java index 20d72ff3..85466889 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/ConnectionErrorWrapperInterceptor.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/ConnectionErrorWrapperInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.library.okhttp3.tracing; +package com.splunk.rum.library.okhttp3.tracing; import java.io.IOException; diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelper.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelper.java similarity index 96% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelper.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelper.java index 6ef53ecb..a53dc515 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelper.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.library.okhttp3.tracing; +package com.splunk.rum.library.okhttp3.tracing; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.util.VirtualField; diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/OkHttpCustomConfigArgument.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/OkHttpCustomConfigArgument.java similarity index 94% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/OkHttpCustomConfigArgument.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/OkHttpCustomConfigArgument.java index 0f126868..55689710 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/OkHttpCustomConfigArgument.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/OkHttpCustomConfigArgument.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.library.okhttp3.tracing; +package com.splunk.rum.library.okhttp3.tracing; public final class OkHttpCustomConfigArgument { private final boolean isTracingEnabled; diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/OkHttpInterceptorUtils.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/OkHttpInterceptorUtils.java similarity index 96% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/OkHttpInterceptorUtils.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/OkHttpInterceptorUtils.java index 02c331bc..7c29b6cf 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/OkHttpInterceptorUtils.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/OkHttpInterceptorUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.library.okhttp3.tracing; +package com.splunk.rum.library.okhttp3.tracing; import android.util.Log; diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/RequestPropertySetter.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/RequestPropertySetter.java similarity index 94% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/RequestPropertySetter.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/RequestPropertySetter.java index a86e82d8..4b715e75 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/RequestPropertySetter.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/RequestPropertySetter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.library.okhttp3.tracing; +package com.splunk.rum.library.okhttp3.tracing; import io.opentelemetry.context.propagation.TextMapSetter; import okhttp3.Request; diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/ResendCountContextInterceptor.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/ResendCountContextInterceptor.java similarity index 96% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/ResendCountContextInterceptor.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/ResendCountContextInterceptor.java index b9596f7d..cc1ae6c0 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/ResendCountContextInterceptor.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/ResendCountContextInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.library.okhttp3.tracing; +package com.splunk.rum.library.okhttp3.tracing; import java.io.IOException; diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/TracingCallback.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/TracingCallback.java similarity index 96% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/TracingCallback.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/TracingCallback.java index 5cda0a06..09381c81 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/TracingCallback.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/TracingCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.library.okhttp3.tracing; +package com.splunk.rum.library.okhttp3.tracing; import java.io.IOException; diff --git a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/TracingInterceptor.java b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/TracingInterceptor.java similarity index 97% rename from instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/TracingInterceptor.java rename to instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/TracingInterceptor.java index bcf6f5a1..072473e0 100644 --- a/instrumentation/runtime/networkrequest/library/src/main/java/com/cisco/android/rum/library/okhttp3/tracing/TracingInterceptor.java +++ b/instrumentation/runtime/networkrequest/library/src/main/java/com/splunk/rum/library/okhttp3/tracing/TracingInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.library.okhttp3.tracing; +package com.splunk.rum.library.okhttp3.tracing; import java.io.IOException; diff --git a/instrumentation/runtime/networkrequest/library/src/test/java/com/cisco/android/rum/library/httpurlconnection/HttpUrlReplacementsTest.kt b/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/httpurlconnection/HttpUrlReplacementsTest.kt similarity index 99% rename from instrumentation/runtime/networkrequest/library/src/test/java/com/cisco/android/rum/library/httpurlconnection/HttpUrlReplacementsTest.kt rename to instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/httpurlconnection/HttpUrlReplacementsTest.kt index 78fecf30..4c511cc9 100644 --- a/instrumentation/runtime/networkrequest/library/src/test/java/com/cisco/android/rum/library/httpurlconnection/HttpUrlReplacementsTest.kt +++ b/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/httpurlconnection/HttpUrlReplacementsTest.kt @@ -14,12 +14,13 @@ * limitations under the License. */ -package com.cisco.android.rum.library.httpurlconnection +package com.splunk.rum.library.httpurlconnection import android.os.SystemClock import android.util.Log -import com.cisco.android.rum.library.common.HttpConfigUtil -import com.cisco.android.rum.library.httpurlconnection.tracing.HttpUrlConnectionSingletons +import com.splunk.rum.library.common.HttpConfigUtil +import com.splunk.rum.library.httpurlconnection.HttpUrlReplacements +import com.splunk.rum.library.httpurlconnection.tracing.HttpUrlConnectionSingletons import io.mockk.MockKAnnotations import io.mockk.Runs import io.mockk.every diff --git a/instrumentation/runtime/networkrequest/library/src/test/java/com/cisco/android/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelperTest.kt b/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelperTest.kt similarity index 96% rename from instrumentation/runtime/networkrequest/library/src/test/java/com/cisco/android/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelperTest.kt rename to instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelperTest.kt index 300caff7..1851738d 100644 --- a/instrumentation/runtime/networkrequest/library/src/test/java/com/cisco/android/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelperTest.kt +++ b/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelperTest.kt @@ -14,8 +14,9 @@ * limitations under the License. */ -package com.cisco.android.rum.library.okhttp3.tracing +package com.splunk.rum.library.okhttp3.tracing +import com.splunk.rum.library.okhttp3.tracing.OkHttpCallbackAdviceHelper import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK diff --git a/instrumentation/runtime/networkrequest/library/src/test/java/com/cisco/android/rum/library/okhttp3/tracing/TracingInterceptorTest.kt b/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/okhttp3/tracing/TracingInterceptorTest.kt similarity index 96% rename from instrumentation/runtime/networkrequest/library/src/test/java/com/cisco/android/rum/library/okhttp3/tracing/TracingInterceptorTest.kt rename to instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/okhttp3/tracing/TracingInterceptorTest.kt index 81723367..aa287792 100644 --- a/instrumentation/runtime/networkrequest/library/src/test/java/com/cisco/android/rum/library/okhttp3/tracing/TracingInterceptorTest.kt +++ b/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/okhttp3/tracing/TracingInterceptorTest.kt @@ -14,8 +14,10 @@ * limitations under the License. */ -package com.cisco.android.rum.library.okhttp3.tracing +package com.splunk.rum.library.okhttp3.tracing +import com.splunk.rum.library.okhttp3.tracing.OkHttpInterceptorUtils +import com.splunk.rum.library.okhttp3.tracing.TracingInterceptor import io.mockk.MockKAnnotations import io.mockk.Runs import io.mockk.every diff --git a/integration-run/src/test/java/com/smartlook/intergrationrun/ApiTestJava.java b/integration-run/src/test/java/com/smartlook/intergrationrun/ApiTestJava.java index 2b6e4ac3..02a2aeb5 100644 --- a/integration-run/src/test/java/com/smartlook/intergrationrun/ApiTestJava.java +++ b/integration-run/src/test/java/com/smartlook/intergrationrun/ApiTestJava.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.smartlook.intergrationrun; +package com.splunk.intergrationrun; import android.app.Activity; import android.content.Context; @@ -22,13 +22,13 @@ import androidx.fragment.app.Fragment; -import com.smartlook.android.core.api.Preferences; -import com.smartlook.android.core.api.Sensitivity; -import com.smartlook.android.core.api.Smartlook; -import com.smartlook.android.core.api.User; -import com.smartlook.android.core.api.enumeration.Status; -import com.smartlook.android.core.api.model.Properties; -import com.smartlook.android.core.api.model.RecordingMask; +import com.splunk.android.core.api.Preferences; +import com.splunk.android.core.api.Sensitivity; +import com.splunk.android.core.api.Smartlook; +import com.splunk.android.core.api.User; +import com.splunk.android.core.api.enumeration.Status; +import com.splunk.android.core.api.model.Properties; +import com.splunk.android.core.api.model.RecordingMask; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/integration/agent/api/build.gradle.kts b/integration/agent/api/build.gradle.kts index 6cb0eef2..6c38bb24 100644 --- a/integration/agent/api/build.gradle.kts +++ b/integration/agent/api/build.gradle.kts @@ -20,7 +20,7 @@ ext { } android { - namespace = "com.cisco.android.rum.integration.agent.api" + namespace = "com.splunk.rum.integration.agent.api" } dependencies { diff --git a/integration/agent/api/proguard-rules.pro b/integration/agent/api/proguard-rules.pro index 84f30d06..4d3098b9 100644 --- a/integration/agent/api/proguard-rules.pro +++ b/integration/agent/api/proguard-rules.pro @@ -1 +1 @@ --repackageclasses 'com.cisco.android.rum.integration.agent.api' \ No newline at end of file +-repackageclasses 'com.splunk.rum.integration.agent.api' \ No newline at end of file diff --git a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/AgentConfiguration.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/AgentConfiguration.kt similarity index 95% rename from integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/AgentConfiguration.kt rename to integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/AgentConfiguration.kt index c591689f..7aa88a93 100644 --- a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/AgentConfiguration.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/AgentConfiguration.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.api +package com.splunk.rum.integration.agent.api import java.net.URL diff --git a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/CiscoRUMAgent.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/CiscoRUMAgent.kt similarity index 91% rename from integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/CiscoRUMAgent.kt rename to integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/CiscoRUMAgent.kt index 5ba6d119..5a3733e1 100644 --- a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/CiscoRUMAgent.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/CiscoRUMAgent.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.api +package com.splunk.rum.integration.agent.api import android.app.Application import com.cisco.android.rum.integration.agent.api.internal.MRUMAgentCore -import com.cisco.android.rum.integration.agent.module.ModuleConfiguration +import com.splunk.rum.integration.agent.module.ModuleConfiguration /** * The [CiscoRUMAgent] class is responsible for initializing and providing access to the RUM agent. @@ -53,7 +53,7 @@ class CiscoRUMAgent private constructor() { * @return The initialized [CiscoRUMAgent] instance. */ @JvmStatic - fun install(application: Application, agentConfiguration: AgentConfiguration, vararg moduleConfigurations: ModuleConfiguration): CiscoRUMAgent { + fun install(application: Application, agentConfiguration: com.splunk.rum.integration.agent.api.AgentConfiguration, vararg moduleConfigurations: ModuleConfiguration): CiscoRUMAgent { if (instanceInternal != null) return instance diff --git a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/attributes/AttributeConstants.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/attributes/AttributeConstants.kt similarity index 94% rename from integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/attributes/AttributeConstants.kt rename to integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/attributes/AttributeConstants.kt index 102363a8..4f751347 100644 --- a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/attributes/AttributeConstants.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/attributes/AttributeConstants.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.api.attributes +package com.splunk.rum.integration.agent.api.attributes import io.opentelemetry.api.common.AttributeKey diff --git a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/attributes/GenericAttributesLogProcessor.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/attributes/GenericAttributesLogProcessor.kt similarity index 86% rename from integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/attributes/GenericAttributesLogProcessor.kt rename to integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/attributes/GenericAttributesLogProcessor.kt index de50fcca..9ba837fd 100644 --- a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/attributes/GenericAttributesLogProcessor.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/attributes/GenericAttributesLogProcessor.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.api.attributes +package com.splunk.rum.integration.agent.api.attributes -import com.cisco.android.rum.integration.agent.api.attributes.AttributeConstants.DOMAIN +import com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants.DOMAIN import io.opentelemetry.context.Context import io.opentelemetry.sdk.logs.LogRecordProcessor import io.opentelemetry.sdk.logs.ReadWriteLogRecord diff --git a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/configuration/ConfigurationManager.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/configuration/ConfigurationManager.kt similarity index 96% rename from integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/configuration/ConfigurationManager.kt rename to integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/configuration/ConfigurationManager.kt index e532c8ff..cea96c73 100644 --- a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/configuration/ConfigurationManager.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/configuration/ConfigurationManager.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.api.configuration +package com.splunk.rum.integration.agent.api.configuration import android.content.Context import com.cisco.android.common.logger.Logger diff --git a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/extension/ConfigurationExt.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/extension/ConfigurationExt.kt similarity index 94% rename from integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/extension/ConfigurationExt.kt rename to integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/extension/ConfigurationExt.kt index 2b0b4e7c..51f39f21 100644 --- a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/extension/ConfigurationExt.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/extension/ConfigurationExt.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.api.extension +package com.splunk.rum.integration.agent.api.extension import com.cisco.android.rum.integration.agent.api.AgentConfiguration import io.opentelemetry.sdk.resources.Resource diff --git a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/internal/MRUMAgentCore.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/internal/MRUMAgentCore.kt similarity index 78% rename from integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/internal/MRUMAgentCore.kt rename to integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/internal/MRUMAgentCore.kt index 611d3085..493d7465 100644 --- a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/internal/MRUMAgentCore.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/internal/MRUMAgentCore.kt @@ -14,27 +14,27 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.api.internal +package com.splunk.rum.integration.agent.api.internal import android.app.Application import com.cisco.android.common.logger.Logger import com.cisco.android.rum.integration.agent.api.AgentConfiguration import com.cisco.android.rum.integration.agent.api.attributes.GenericAttributesLogProcessor import com.cisco.android.rum.integration.agent.api.configuration.ConfigurationManager -import com.cisco.android.rum.integration.agent.api.extension.toResource +import com.splunk.rum.integration.agent.api.extension.toResource import com.cisco.android.rum.integration.agent.api.sessionId.SessionIdLogProcessor import com.cisco.android.rum.integration.agent.api.sessionId.SessionIdSpanProcessor import com.cisco.android.rum.integration.agent.api.sessionId.SessionStartEventManager import com.cisco.android.rum.integration.agent.api.sessionPulse.SessionPulseEventManager import com.cisco.android.rum.integration.agent.api.state.StateLogRecordProcessor -import com.cisco.android.rum.integration.agent.internal.AgentIntegration +import com.splunk.rum.integration.agent.internal.AgentIntegration import com.cisco.android.rum.integration.agent.internal.BuildConfig -import com.cisco.android.rum.integration.agent.internal.state.StateManager -import com.cisco.android.rum.integration.agent.module.ModuleConfiguration +import com.splunk.rum.integration.agent.internal.state.StateManager +import com.splunk.rum.integration.agent.module.ModuleConfiguration import com.cisco.mrum.common.otel.api.OpenTelemetryInitializer import com.cisco.mrum.common.otel.internal.storage.OtelStorage -import com.smartlook.sdk.common.storage.Storage -import com.smartlook.sdk.common.utils.HashCalculationUtils +import com.splunk.sdk.common.storage.Storage +import com.splunk.sdk.common.utils.HashCalculationUtils import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.sdk.resources.Resource import io.opentelemetry.sdk.resources.ResourceBuilder @@ -46,7 +46,7 @@ internal object MRUMAgentCore { private const val SERVICE_HASH_RESOURCE_KEY = "service.hash" fun install(application: Application, agentConfiguration: AgentConfiguration, moduleConfigurations: List) { - Logger.d(TAG, "install(agentConfiguration: $agentConfiguration, moduleConfigurations: $moduleConfigurations)") + Logger.d(com.splunk.rum.integration.agent.api.internal.MRUMAgentCore.TAG, "install(agentConfiguration: $agentConfiguration, moduleConfigurations: $moduleConfigurations)") val storage = Storage.attach(application) val otelStorage = OtelStorage.obtainInstance(storage.preferences) @@ -75,7 +75,7 @@ internal object MRUMAgentCore { .addLogRecordProcessor(StateLogRecordProcessor(stateManager)) .addLogRecordProcessor(SessionIdLogProcessor(agentIntegration.sessionManager)) - val hash = obtainServiceHashResource(application) + val hash = com.splunk.rum.integration.agent.api.internal.MRUMAgentCore.obtainServiceHashResource(application) if (hash != null) { openTelemetryInitializer.joinResources(hash) } @@ -88,11 +88,11 @@ internal object MRUMAgentCore { fun obtainServiceHashResource(application: Application): Resource? { val sourceDir = application.applicationInfo.sourceDir if (sourceDir == null) { - Logger.d(TAG, "Unable to calculate service hash, application source directory null") + Logger.d(com.splunk.rum.integration.agent.api.internal.MRUMAgentCore.TAG, "Unable to calculate service hash, application source directory null") return null } - return ResourceBuilder().put(AttributeKey.stringKey(SERVICE_HASH_RESOURCE_KEY), + return ResourceBuilder().put(AttributeKey.stringKey(com.splunk.rum.integration.agent.api.internal.MRUMAgentCore.SERVICE_HASH_RESOURCE_KEY), HashCalculationUtils.calculateSha256(File(sourceDir))) .build() } diff --git a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/sessionId/SessionIdLogProcessor.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionIdLogProcessor.kt similarity index 83% rename from integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/sessionId/SessionIdLogProcessor.kt rename to integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionIdLogProcessor.kt index 503364f5..ba690fc8 100644 --- a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/sessionId/SessionIdLogProcessor.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionIdLogProcessor.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.api.sessionId +package com.splunk.rum.integration.agent.api.sessionId import com.cisco.android.common.logger.Logger -import com.cisco.android.rum.integration.agent.api.attributes.AttributeConstants.SESSION_ID_KEY -import com.cisco.android.rum.integration.agent.internal.session.SessionManager +import com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants.SESSION_ID_KEY +import com.splunk.rum.integration.agent.internal.session.SessionManager import io.opentelemetry.context.Context import io.opentelemetry.sdk.logs.LogRecordProcessor import io.opentelemetry.sdk.logs.ReadWriteLogRecord diff --git a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/sessionId/SessionIdSpanProcessor.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionIdSpanProcessor.kt similarity index 83% rename from integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/sessionId/SessionIdSpanProcessor.kt rename to integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionIdSpanProcessor.kt index d09235fc..3297d95d 100644 --- a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/sessionId/SessionIdSpanProcessor.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionIdSpanProcessor.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.api.sessionId +package com.splunk.rum.integration.agent.api.sessionId -import com.cisco.android.rum.integration.agent.api.attributes.AttributeConstants.SESSION_ID_KEY -import com.cisco.android.rum.integration.agent.internal.session.SessionManager +import com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants.SESSION_ID_KEY +import com.splunk.rum.integration.agent.internal.session.SessionManager import io.opentelemetry.context.Context import io.opentelemetry.sdk.trace.ReadWriteSpan import io.opentelemetry.sdk.trace.ReadableSpan diff --git a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/sessionId/SessionStartEventManager.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionStartEventManager.kt similarity index 58% rename from integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/sessionId/SessionStartEventManager.kt rename to integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionStartEventManager.kt index 08f0c72f..6d937020 100644 --- a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/sessionId/SessionStartEventManager.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionStartEventManager.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.api.sessionId +package com.splunk.rum.integration.agent.api.sessionId import com.cisco.android.common.logger.Logger -import com.cisco.android.rum.integration.agent.api.attributes.AttributeConstants -import com.cisco.android.rum.integration.agent.internal.session.SessionManager +import com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants +import com.splunk.rum.integration.agent.internal.session.SessionManager import com.cisco.mrum.common.otel.api.OpenTelemetry import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.api.common.Attributes @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit internal class SessionStartEventManager(sessionManager: SessionManager) { init { - Logger.d(TAG, "init()") + Logger.d(com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager.Companion.TAG, "init()") sessionManager.sessionListeners += object : SessionManager.SessionListener { override fun onSessionChanged(sessionId: String) { @@ -37,13 +37,13 @@ internal class SessionStartEventManager(sessionManager: SessionManager) { } private fun createSessionStartEvent(sessionId: String, userId: String) { - Logger.d(TAG, "createSessionStartEvent() sessionId: $sessionId, userId: $userId") + Logger.d(com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager.Companion.TAG, "createSessionStartEvent() sessionId: $sessionId, userId: $userId") val instance = OpenTelemetry.instance ?: return val now = System.currentTimeMillis() val attributes = Attributes.of( - AttributeConstants.NAME, "session_start", + com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants.NAME, "session_start", AttributeKey.stringKey("enduser.anon_id"), userId, ) // TODO Scope @@ -58,12 +58,13 @@ internal class SessionStartEventManager(sessionManager: SessionManager) { companion object { private const val TAG = "SessionStartEventManager" - private var instanceInternal: SessionStartEventManager? = null - fun obtainInstance(sessionManager: SessionManager): SessionStartEventManager { - if (instanceInternal == null) - instanceInternal = SessionStartEventManager(sessionManager) + private var instanceInternal: com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager? = null + fun obtainInstance(sessionManager: SessionManager): com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager { + if (com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager.Companion.instanceInternal == null) + com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager.Companion.instanceInternal = + com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager(sessionManager) - return requireNotNull(instanceInternal) + return requireNotNull(com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager.Companion.instanceInternal) } } } diff --git a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/sessionPulse/SessionPulseEventManager.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionPulse/SessionPulseEventManager.kt similarity index 87% rename from integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/sessionPulse/SessionPulseEventManager.kt rename to integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionPulse/SessionPulseEventManager.kt index f7ee73a8..e2ac375d 100644 --- a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/sessionPulse/SessionPulseEventManager.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionPulse/SessionPulseEventManager.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.api.sessionPulse +package com.splunk.rum.integration.agent.api.sessionPulse import com.cisco.android.common.logger.Logger -import com.cisco.android.rum.integration.agent.api.attributes.AttributeConstants -import com.cisco.android.rum.integration.agent.internal.session.SessionManager +import com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants +import com.splunk.rum.integration.agent.internal.session.SessionManager import com.cisco.mrum.common.otel.api.OpenTelemetry import io.opentelemetry.api.common.Attributes import java.util.concurrent.TimeUnit @@ -42,7 +42,7 @@ internal class SessionPulseEventManager(sessionManager: SessionManager) { val now = System.currentTimeMillis() val attributes = Attributes.of( - AttributeConstants.NAME, "session_pulse", + com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants.NAME, "session_pulse", ) // TODO Scope instance.sdkLoggerProvider diff --git a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/state/StateLogRecordProcessor.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/state/StateLogRecordProcessor.kt similarity index 81% rename from integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/state/StateLogRecordProcessor.kt rename to integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/state/StateLogRecordProcessor.kt index 95eee483..8ed1f936 100644 --- a/integration/agent/api/src/main/java/com/cisco/android/rum/integration/agent/api/state/StateLogRecordProcessor.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/state/StateLogRecordProcessor.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.api.state +package com.splunk.rum.integration.agent.api.state -import com.cisco.android.rum.integration.agent.api.attributes.AttributeConstants.STATE -import com.cisco.android.rum.integration.agent.internal.state.StateManager +import com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants.STATE +import com.splunk.rum.integration.agent.internal.state.StateManager import io.opentelemetry.context.Context import io.opentelemetry.sdk.logs.LogRecordProcessor import io.opentelemetry.sdk.logs.ReadWriteLogRecord diff --git a/integration/agent/api/src/test/java/com/cisco/android/rum/integration/agent/api/JavaIntegration.java b/integration/agent/api/src/test/java/com/splunk/rum/integration/agent/api/JavaIntegration.java similarity index 92% rename from integration/agent/api/src/test/java/com/cisco/android/rum/integration/agent/api/JavaIntegration.java rename to integration/agent/api/src/test/java/com/splunk/rum/integration/agent/api/JavaIntegration.java index 89028a09..4b34f07a 100644 --- a/integration/agent/api/src/test/java/com/cisco/android/rum/integration/agent/api/JavaIntegration.java +++ b/integration/agent/api/src/test/java/com/splunk/rum/integration/agent/api/JavaIntegration.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.api; +package com.splunk.rum.integration.agent.api; import android.app.Application; -import com.cisco.android.rum.integration.agent.module.ModuleConfiguration; +import com.splunk.rum.integration.agent.module.ModuleConfiguration; import com.cisco.android.rum.integration.agent.api.AgentConfiguration; import com.cisco.android.rum.integration.agent.api.CiscoRUMAgent; diff --git a/integration/agent/internal/build.gradle.kts b/integration/agent/internal/build.gradle.kts index 3f831f9d..3165cfb1 100644 --- a/integration/agent/internal/build.gradle.kts +++ b/integration/agent/internal/build.gradle.kts @@ -19,7 +19,7 @@ ext { } android { - namespace = "com.cisco.android.rum.integration.agent.internal" + namespace = "com.splunk.rum.integration.agent.internal" } dependencies { diff --git a/integration/agent/internal/proguard-rules.pro b/integration/agent/internal/proguard-rules.pro index a04fbb81..c8355548 100644 --- a/integration/agent/internal/proguard-rules.pro +++ b/integration/agent/internal/proguard-rules.pro @@ -1 +1 @@ --repackageclasses 'com.cisco.android.rum.integration.agent.internal' \ No newline at end of file +-repackageclasses 'com.splunk.rum.integration.agent.internal' \ No newline at end of file diff --git a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/AgentIntegration.kt b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/AgentIntegration.kt similarity index 86% rename from integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/AgentIntegration.kt rename to integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/AgentIntegration.kt index a89c5381..31645259 100644 --- a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/AgentIntegration.kt +++ b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/AgentIntegration.kt @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.internal +package com.splunk.rum.integration.agent.internal import android.content.Context import com.cisco.android.common.logger.Logger import com.cisco.android.common.logger.consumers.AndroidLogConsumer -import com.cisco.android.rum.integration.agent.internal.config.ModuleConfigurationManager -import com.cisco.android.rum.integration.agent.internal.config.RemoteModuleConfiguration -import com.cisco.android.rum.integration.agent.internal.session.SessionManager -import com.cisco.android.rum.integration.agent.module.ModuleConfiguration +import com.splunk.rum.integration.agent.internal.config.ModuleConfigurationManager +import com.splunk.rum.integration.agent.internal.config.RemoteModuleConfiguration +import com.splunk.rum.integration.agent.internal.session.SessionManager +import com.splunk.rum.integration.agent.module.ModuleConfiguration import com.cisco.mrum.common.otel.internal.storage.OtelStorage -import com.smartlook.sdk.common.storage.Storage -import com.smartlook.sdk.common.storage.preferences.FilePermanentCache -import com.smartlook.sdk.common.storage.preferences.Preferences -import com.smartlook.sdk.common.utils.extensions.forEachFast -import com.smartlook.sdk.common.utils.extensions.noBackupFilesDirCompat -import com.smartlook.sdk.common.utils.extensions.optLongNull +import com.splunk.sdk.common.storage.Storage +import com.splunk.sdk.common.storage.preferences.FilePermanentCache +import com.splunk.sdk.common.storage.preferences.Preferences +import com.splunk.sdk.common.utils.extensions.forEachFast +import com.splunk.sdk.common.utils.extensions.noBackupFilesDirCompat +import com.splunk.sdk.common.utils.extensions.optLongNull import java.io.File class AgentIntegration private constructor( diff --git a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/config/ModuleConfigurationManager.kt b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/config/ModuleConfigurationManager.kt similarity index 84% rename from integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/config/ModuleConfigurationManager.kt rename to integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/config/ModuleConfigurationManager.kt index 843e11fe..70ca586a 100644 --- a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/config/ModuleConfigurationManager.kt +++ b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/config/ModuleConfigurationManager.kt @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.internal.config +package com.splunk.rum.integration.agent.internal.config -import com.cisco.android.rum.integration.agent.internal.extension.deserializeToRemoteModuleConfiguration -import com.cisco.android.rum.integration.agent.internal.extension.deserializeToRemoteModuleConfigurations -import com.cisco.android.rum.integration.agent.internal.extension.serializeToString -import com.cisco.android.rum.integration.agent.module.ModuleConfiguration +import com.splunk.rum.integration.agent.internal.extension.deserializeToRemoteModuleConfiguration +import com.splunk.rum.integration.agent.internal.extension.deserializeToRemoteModuleConfigurations +import com.splunk.rum.integration.agent.internal.extension.serializeToString +import com.splunk.rum.integration.agent.module.ModuleConfiguration import com.cisco.mrum.common.otel.internal.storage.OtelStorage -import com.smartlook.android.common.http.HttpClient -import com.smartlook.android.common.http.model.Header -import com.smartlook.android.common.http.model.Response -import com.smartlook.sdk.common.storage.preferences.IPreferences -import com.smartlook.sdk.common.utils.extensions.forEachFast -import com.smartlook.sdk.common.utils.extensions.mapNotNull -import com.smartlook.sdk.common.utils.extensions.optLongNull -import com.smartlook.sdk.common.utils.extensions.plusAssign -import com.smartlook.sdk.common.utils.extensions.toJSONObject +import com.splunk.android.common.http.HttpClient +import com.splunk.android.common.http.model.Header +import com.splunk.android.common.http.model.Response +import com.splunk.sdk.common.storage.preferences.IPreferences +import com.splunk.sdk.common.utils.extensions.forEachFast +import com.splunk.sdk.common.utils.extensions.mapNotNull +import com.splunk.sdk.common.utils.extensions.optLongNull +import com.splunk.sdk.common.utils.extensions.plusAssign +import com.splunk.sdk.common.utils.extensions.toJSONObject import org.json.JSONException class ModuleConfigurationManager internal constructor( diff --git a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/config/RemoteModuleConfiguration.kt b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/config/RemoteModuleConfiguration.kt similarity index 91% rename from integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/config/RemoteModuleConfiguration.kt rename to integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/config/RemoteModuleConfiguration.kt index cc8ba903..fbde3d46 100644 --- a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/config/RemoteModuleConfiguration.kt +++ b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/config/RemoteModuleConfiguration.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.internal.config +package com.splunk.rum.integration.agent.internal.config import org.json.JSONObject diff --git a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/config/ServerClock.kt b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/config/ServerClock.kt similarity index 92% rename from integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/config/ServerClock.kt rename to integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/config/ServerClock.kt index 94dd7208..45f870fe 100644 --- a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/config/ServerClock.kt +++ b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/config/ServerClock.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.internal.config +package com.splunk.rum.integration.agent.internal.config internal class ServerClock( val serverTimestamp: Long, diff --git a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/extension/ModuleConfigurationsExt.kt b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/extension/ModuleConfigurationsExt.kt similarity index 85% rename from integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/extension/ModuleConfigurationsExt.kt rename to integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/extension/ModuleConfigurationsExt.kt index 5faf8946..74133a89 100644 --- a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/extension/ModuleConfigurationsExt.kt +++ b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/extension/ModuleConfigurationsExt.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.internal.extension +package com.splunk.rum.integration.agent.internal.extension -import com.cisco.android.rum.integration.agent.module.ModuleConfiguration +import com.splunk.rum.integration.agent.module.ModuleConfiguration inline fun List.find(): T? { for (i in indices) { diff --git a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/extension/RemoteModuleConfigurationsExt.kt b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/extension/RemoteModuleConfigurationsExt.kt similarity index 87% rename from integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/extension/RemoteModuleConfigurationsExt.kt rename to integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/extension/RemoteModuleConfigurationsExt.kt index 5166b2e7..3bc8adbe 100644 --- a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/extension/RemoteModuleConfigurationsExt.kt +++ b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/extension/RemoteModuleConfigurationsExt.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.internal.extension +package com.splunk.rum.integration.agent.internal.extension -import com.smartlook.sdk.common.utils.extensions.map -import com.smartlook.sdk.common.utils.extensions.toJSONArray -import com.cisco.android.rum.integration.agent.internal.config.RemoteModuleConfiguration +import com.splunk.sdk.common.utils.extensions.map +import com.splunk.sdk.common.utils.extensions.toJSONArray +import com.splunk.rum.integration.agent.internal.config.RemoteModuleConfiguration import org.json.JSONArray import org.json.JSONObject diff --git a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/session/SessionManager.kt b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/session/SessionManager.kt similarity index 94% rename from integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/session/SessionManager.kt rename to integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/session/SessionManager.kt index b95dd74a..07cc2e47 100644 --- a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/session/SessionManager.kt +++ b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/session/SessionManager.kt @@ -14,18 +14,17 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.internal.session +package com.splunk.rum.integration.agent.internal.session import android.app.Application import android.content.Context import android.os.Handler import android.os.HandlerThread -import android.util.Log -import com.smartlook.sdk.common.id.NanoId -import com.smartlook.sdk.common.storage.preferences.IPreferences -import com.smartlook.sdk.common.utils.AppStateObserver -import com.smartlook.sdk.common.utils.extensions.forEachFast -import com.smartlook.sdk.common.utils.extensions.safeSchedule +import com.splunk.sdk.common.id.NanoId +import com.splunk.sdk.common.storage.preferences.IPreferences +import com.splunk.sdk.common.utils.AppStateObserver +import com.splunk.sdk.common.utils.extensions.forEachFast +import com.splunk.sdk.common.utils.extensions.safeSchedule import java.util.concurrent.Executors import java.util.concurrent.ScheduledFuture diff --git a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/state/StateManager.kt b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/state/StateManager.kt similarity index 93% rename from integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/state/StateManager.kt rename to integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/state/StateManager.kt index 26186eb7..34495302 100644 --- a/integration/agent/internal/src/main/java/com/cisco/android/rum/integration/agent/internal/state/StateManager.kt +++ b/integration/agent/internal/src/main/java/com/splunk/rum/integration/agent/internal/state/StateManager.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.internal.state +package com.splunk.rum.integration.agent.internal.state import android.app.Application import android.content.Context -import com.smartlook.sdk.common.utils.AppStateObserver +import com.splunk.sdk.common.utils.AppStateObserver class StateManager(context: Context) { diff --git a/integration/agent/module/build.gradle.kts b/integration/agent/module/build.gradle.kts index 2f76dce5..9a2a029b 100644 --- a/integration/agent/module/build.gradle.kts +++ b/integration/agent/module/build.gradle.kts @@ -19,5 +19,5 @@ ext { } android { - namespace = "com.cisco.android.rum.integration.agent.module" + namespace = "com.splunk.rum.integration.agent.module" } diff --git a/integration/agent/module/proguard-rules.pro b/integration/agent/module/proguard-rules.pro index 497fd0fb..db7100b5 100644 --- a/integration/agent/module/proguard-rules.pro +++ b/integration/agent/module/proguard-rules.pro @@ -1 +1 @@ --repackageclasses 'com.cisco.android.rum.integration.agent.module' \ No newline at end of file +-repackageclasses 'com.splunk.rum.integration.agent.module' \ No newline at end of file diff --git a/integration/agent/module/src/main/java/com/cisco/android/rum/integration/agent/module/ModuleConfiguration.kt b/integration/agent/module/src/main/java/com/splunk/rum/integration/agent/module/ModuleConfiguration.kt similarity index 91% rename from integration/agent/module/src/main/java/com/cisco/android/rum/integration/agent/module/ModuleConfiguration.kt rename to integration/agent/module/src/main/java/com/splunk/rum/integration/agent/module/ModuleConfiguration.kt index e32409ac..12e7d1f0 100644 --- a/integration/agent/module/src/main/java/com/cisco/android/rum/integration/agent/module/ModuleConfiguration.kt +++ b/integration/agent/module/src/main/java/com/splunk/rum/integration/agent/module/ModuleConfiguration.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.agent.module +package com.splunk.rum.integration.agent.module interface ModuleConfiguration diff --git a/integration/anr/build.gradle.kts b/integration/anr/build.gradle.kts index 84f6c60c..495021c8 100644 --- a/integration/anr/build.gradle.kts +++ b/integration/anr/build.gradle.kts @@ -19,7 +19,7 @@ ext { } android { - namespace = "com.cisco.android.rum.integration.anr" + namespace = "com.splunk.rum.integration.anr" } dependencies { diff --git a/integration/anr/consumer-rules.pro b/integration/anr/consumer-rules.pro index d9761802..f7c5fc78 100644 --- a/integration/anr/consumer-rules.pro +++ b/integration/anr/consumer-rules.pro @@ -1,5 +1,5 @@ --keep public class com.cisco.android.rum.integration.anr.installer.ANRInstaller --keep public class com.cisco.android.rum.integration.anr.configurer.ANRConfigurer --keepclassmembers class com.cisco.android.rum.integration.anr.configurer.ANRConfigurer { +-keep public class com.splunk.rum.integration.anr.installer.ANRInstaller +-keep public class com.splunk.rum.integration.anr.configurer.ANRConfigurer +-keepclassmembers class com.splunk.rum.integration.anr.configurer.ANRConfigurer { public static boolean isANRReportingEnabled; } \ No newline at end of file diff --git a/integration/anr/proguard-rules.pro b/integration/anr/proguard-rules.pro index 955fedb4..d60f1f59 100644 --- a/integration/anr/proguard-rules.pro +++ b/integration/anr/proguard-rules.pro @@ -1,6 +1,6 @@ --keep public class com.cisco.android.rum.integration.anr.installer.ANRInstaller --keep public class com.cisco.android.rum.integration.anr.configurer.ANRConfigurer --keepclassmembers class com.cisco.android.rum.integration.anr.configurer.ANRConfigurer { +-keep public class com.splunk.rum.integration.anr.installer.ANRInstaller +-keep public class com.splunk.rum.integration.anr.configurer.ANRConfigurer +-keepclassmembers class com.splunk.rum.integration.anr.configurer.ANRConfigurer { public static boolean isANRReportingEnabled; } --repackageclasses 'com.cisco.android.rum.integration.anr' \ No newline at end of file +-repackageclasses 'com.splunk.rum.integration.anr' \ No newline at end of file diff --git a/integration/anr/src/main/AndroidManifest.xml b/integration/anr/src/main/AndroidManifest.xml index 864e2d4d..151ee3d5 100644 --- a/integration/anr/src/main/AndroidManifest.xml +++ b/integration/anr/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ diff --git a/integration/anr/src/main/java/com/cisco/android/rum/integration/anr/api/ANRModuleConfiguration.kt b/integration/anr/src/main/java/com/splunk/rum/integration/anr/api/ANRModuleConfiguration.kt similarity index 83% rename from integration/anr/src/main/java/com/cisco/android/rum/integration/anr/api/ANRModuleConfiguration.kt rename to integration/anr/src/main/java/com/splunk/rum/integration/anr/api/ANRModuleConfiguration.kt index 7e81aa65..4ba8fa61 100644 --- a/integration/anr/src/main/java/com/cisco/android/rum/integration/anr/api/ANRModuleConfiguration.kt +++ b/integration/anr/src/main/java/com/splunk/rum/integration/anr/api/ANRModuleConfiguration.kt @@ -14,8 +14,8 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.anr.api +package com.splunk.rum.integration.anr.api -import com.cisco.android.rum.integration.agent.module.ModuleConfiguration +import com.splunk.rum.integration.agent.module.ModuleConfiguration class ANRModuleConfiguration : ModuleConfiguration diff --git a/integration/anr/src/main/java/com/cisco/android/rum/integration/anr/configurer/ANRConfigurer.kt b/integration/anr/src/main/java/com/splunk/rum/integration/anr/configurer/ANRConfigurer.kt similarity index 86% rename from integration/anr/src/main/java/com/cisco/android/rum/integration/anr/configurer/ANRConfigurer.kt rename to integration/anr/src/main/java/com/splunk/rum/integration/anr/configurer/ANRConfigurer.kt index d46f206f..14560dac 100644 --- a/integration/anr/src/main/java/com/cisco/android/rum/integration/anr/configurer/ANRConfigurer.kt +++ b/integration/anr/src/main/java/com/splunk/rum/integration/anr/configurer/ANRConfigurer.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.anr.configurer +package com.splunk.rum.integration.anr.configurer import android.annotation.SuppressLint import android.content.Context import com.cisco.android.common.logger.Logger -import com.cisco.android.rum.anr.AnrReportingHandler -import com.cisco.android.rum.integration.agent.internal.AgentIntegration -import com.cisco.android.rum.integration.agent.internal.config.ModuleConfigurationManager -import com.cisco.android.rum.integration.agent.internal.config.RemoteModuleConfiguration -import com.cisco.android.rum.integration.agent.internal.extension.find -import com.smartlook.sdk.common.utils.extensions.optBooleanNull -import com.smartlook.sdk.common.utils.extensions.optLongNull +import com.splunk.rum.anr.AnrReportingHandler +import com.splunk.rum.integration.agent.internal.AgentIntegration +import com.splunk.rum.integration.agent.internal.config.ModuleConfigurationManager +import com.splunk.rum.integration.agent.internal.config.RemoteModuleConfiguration +import com.splunk.rum.integration.agent.internal.extension.find +import com.splunk.sdk.common.utils.extensions.optBooleanNull +import com.splunk.sdk.common.utils.extensions.optLongNull @SuppressLint("LongLogTag") object ANRConfigurer { diff --git a/integration/anr/src/main/java/com/cisco/android/rum/integration/anr/installer/ANRInstaller.kt b/integration/anr/src/main/java/com/splunk/rum/integration/anr/installer/ANRInstaller.kt similarity index 92% rename from integration/anr/src/main/java/com/cisco/android/rum/integration/anr/installer/ANRInstaller.kt rename to integration/anr/src/main/java/com/splunk/rum/integration/anr/installer/ANRInstaller.kt index 119a48ba..38eac79b 100644 --- a/integration/anr/src/main/java/com/cisco/android/rum/integration/anr/installer/ANRInstaller.kt +++ b/integration/anr/src/main/java/com/splunk/rum/integration/anr/installer/ANRInstaller.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.anr.installer +package com.splunk.rum.integration.anr.installer import android.content.ContentProvider import android.content.ContentValues import android.database.Cursor import android.net.Uri -import com.cisco.android.rum.integration.anr.configurer.ANRConfigurer +import com.splunk.rum.integration.anr.configurer.ANRConfigurer class ANRInstaller : ContentProvider() { override fun onCreate(): Boolean { diff --git a/integration/crash/build.gradle.kts b/integration/crash/build.gradle.kts index 2caaaecc..69b93579 100644 --- a/integration/crash/build.gradle.kts +++ b/integration/crash/build.gradle.kts @@ -19,7 +19,7 @@ ext { } android { - namespace = "com.cisco.android.rum.integration.crash" + namespace = "com.splunk.rum.integration.crash" } dependencies { diff --git a/integration/crash/consumer-rules.pro b/integration/crash/consumer-rules.pro index cc820359..27225426 100644 --- a/integration/crash/consumer-rules.pro +++ b/integration/crash/consumer-rules.pro @@ -1,5 +1,5 @@ --keep public class com.cisco.android.rum.integration.crash.installer.CrashInstaller --keep public class com.cisco.android.rum.integration.crash.configurer.CrashConfigurer --keepclassmembers class com.cisco.android.rum.integration.crash.configurer.CrashConfigurer { +-keep public class com.splunk.rum.integration.crash.installer.CrashInstaller +-keep public class com.splunk.rum.integration.crash.configurer.CrashConfigurer +-keepclassmembers class com.splunk.rum.integration.crash.configurer.CrashConfigurer { public static boolean isCrashReportingEnabled; } \ No newline at end of file diff --git a/integration/crash/proguard-rules.pro b/integration/crash/proguard-rules.pro index 70b00900..ed64b755 100644 --- a/integration/crash/proguard-rules.pro +++ b/integration/crash/proguard-rules.pro @@ -1,6 +1,6 @@ --keep public class com.cisco.android.rum.integration.crash.installer.CrashInstaller --keep public class com.cisco.android.rum.integration.crash.configurer.CrashConfigurer --keepclassmembers class com.cisco.android.rum.integration.crash.configurer.CrashConfigurer { +-keep public class com.splunk.rum.integration.crash.installer.CrashInstaller +-keep public class com.splunk.rum.integration.crash.configurer.CrashConfigurer +-keepclassmembers class com.splunk.rum.integration.crash.configurer.CrashConfigurer { public static boolean isCrashReportingEnabled; } --repackageclasses 'com.cisco.android.rum.integration.crash' +-repackageclasses 'com.splunk.rum.integration.crash' diff --git a/integration/crash/src/main/AndroidManifest.xml b/integration/crash/src/main/AndroidManifest.xml index 804f814b..1d93753e 100644 --- a/integration/crash/src/main/AndroidManifest.xml +++ b/integration/crash/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ diff --git a/integration/crash/src/main/java/com/cisco/android/rum/integration/crash/api/CrashModuleConfiguration.kt b/integration/crash/src/main/java/com/splunk/rum/integration/crash/api/CrashModuleConfiguration.kt similarity index 83% rename from integration/crash/src/main/java/com/cisco/android/rum/integration/crash/api/CrashModuleConfiguration.kt rename to integration/crash/src/main/java/com/splunk/rum/integration/crash/api/CrashModuleConfiguration.kt index 2e2c4972..c1772f93 100644 --- a/integration/crash/src/main/java/com/cisco/android/rum/integration/crash/api/CrashModuleConfiguration.kt +++ b/integration/crash/src/main/java/com/splunk/rum/integration/crash/api/CrashModuleConfiguration.kt @@ -14,8 +14,8 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.crash.api +package com.splunk.rum.integration.crash.api -import com.cisco.android.rum.integration.agent.module.ModuleConfiguration +import com.splunk.rum.integration.agent.module.ModuleConfiguration class CrashModuleConfiguration : ModuleConfiguration \ No newline at end of file diff --git a/integration/crash/src/main/java/com/cisco/android/rum/integration/crash/configurer/CrashConfigurer.kt b/integration/crash/src/main/java/com/splunk/rum/integration/crash/configurer/CrashConfigurer.kt similarity index 86% rename from integration/crash/src/main/java/com/cisco/android/rum/integration/crash/configurer/CrashConfigurer.kt rename to integration/crash/src/main/java/com/splunk/rum/integration/crash/configurer/CrashConfigurer.kt index 47cf55a6..74e9f02a 100644 --- a/integration/crash/src/main/java/com/cisco/android/rum/integration/crash/configurer/CrashConfigurer.kt +++ b/integration/crash/src/main/java/com/splunk/rum/integration/crash/configurer/CrashConfigurer.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.crash.configurer +package com.splunk.rum.integration.crash.configurer import android.annotation.SuppressLint import android.content.Context import com.cisco.android.common.logger.Logger -import com.cisco.android.rum.crash.CrashReportingHandler -import com.cisco.android.rum.integration.agent.internal.AgentIntegration -import com.cisco.android.rum.integration.agent.internal.config.ModuleConfigurationManager -import com.cisco.android.rum.integration.agent.internal.config.RemoteModuleConfiguration -import com.cisco.android.rum.integration.agent.internal.extension.find -import com.smartlook.sdk.common.utils.extensions.optBooleanNull +import com.splunk.rum.crash.CrashReportingHandler +import com.splunk.rum.integration.agent.internal.AgentIntegration +import com.splunk.rum.integration.agent.internal.config.ModuleConfigurationManager +import com.splunk.rum.integration.agent.internal.config.RemoteModuleConfiguration +import com.splunk.rum.integration.agent.internal.extension.find +import com.splunk.sdk.common.utils.extensions.optBooleanNull @SuppressLint("LongLogTag") object CrashConfigurer { diff --git a/integration/crash/src/main/java/com/cisco/android/rum/integration/crash/installer/CrashInstaller.kt b/integration/crash/src/main/java/com/splunk/rum/integration/crash/installer/CrashInstaller.kt similarity index 91% rename from integration/crash/src/main/java/com/cisco/android/rum/integration/crash/installer/CrashInstaller.kt rename to integration/crash/src/main/java/com/splunk/rum/integration/crash/installer/CrashInstaller.kt index 30bd4dcb..11bfc1cb 100644 --- a/integration/crash/src/main/java/com/cisco/android/rum/integration/crash/installer/CrashInstaller.kt +++ b/integration/crash/src/main/java/com/splunk/rum/integration/crash/installer/CrashInstaller.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.crash.installer +package com.splunk.rum.integration.crash.installer import android.content.ContentProvider import android.content.ContentValues import android.database.Cursor import android.net.Uri -import com.cisco.android.rum.integration.crash.configurer.CrashConfigurer +import com.splunk.rum.integration.crash.configurer.CrashConfigurer class CrashInstaller : ContentProvider() { override fun onCreate(): Boolean { diff --git a/integration/networkrequest/build.gradle.kts b/integration/networkrequest/build.gradle.kts index 683a64d3..9fcb7577 100644 --- a/integration/networkrequest/build.gradle.kts +++ b/integration/networkrequest/build.gradle.kts @@ -19,7 +19,7 @@ ext { } android { - namespace = "com.cisco.android.rum.integration.networkrequest" + namespace = "com.splunk.rum.integration.networkrequest" } dependencies { diff --git a/integration/networkrequest/consumer-rules.pro b/integration/networkrequest/consumer-rules.pro index 954d9625..50382737 100644 --- a/integration/networkrequest/consumer-rules.pro +++ b/integration/networkrequest/consumer-rules.pro @@ -1,5 +1,5 @@ --keep public class com.cisco.android.rum.integration.networkrequest.installer.NetworkRequestInstaller --keep public class com.cisco.android.rum.integration.networkrequest.configurer.NetworkRequestConfigurer --keepclassmembers class com.cisco.android.rum.integration.networkrequest.configurer.NetworkRequestConfigurer { +-keep public class com.splunk.rum.integration.networkrequest.installer.NetworkRequestInstaller +-keep public class com.splunk.rum.integration.networkrequest.configurer.NetworkRequestConfigurer +-keepclassmembers class com.splunk.rum.integration.networkrequest.configurer.NetworkRequestConfigurer { public static boolean isNetworkTracingEnabled; } \ No newline at end of file diff --git a/integration/networkrequest/proguard-rules.pro b/integration/networkrequest/proguard-rules.pro index 8c49735b..4b7668d0 100644 --- a/integration/networkrequest/proguard-rules.pro +++ b/integration/networkrequest/proguard-rules.pro @@ -1,6 +1,6 @@ --keep public class com.cisco.android.rum.integration.networkrequest.installer.NetworkRequestInstaller --keep public class com.cisco.android.rum.integration.networkrequest.configurer.NetworkRequestConfigurer --keepclassmembers class com.cisco.android.rum.integration.networkrequest.configurer.NetworkRequestConfigurer { +-keep public class com.splunk.rum.integration.networkrequest.installer.NetworkRequestInstaller +-keep public class com.splunk.rum.integration.networkrequest.configurer.NetworkRequestConfigurer +-keepclassmembers class com.splunk.rum.integration.networkrequest.configurer.NetworkRequestConfigurer { public static boolean isNetworkTracingEnabled; } --repackageclasses 'com.cisco.android.rum.integration.networkrequest' +-repackageclasses 'com.splunk.rum.integration.networkrequest' diff --git a/integration/networkrequest/src/main/AndroidManifest.xml b/integration/networkrequest/src/main/AndroidManifest.xml index 53e69358..86cdae03 100644 --- a/integration/networkrequest/src/main/AndroidManifest.xml +++ b/integration/networkrequest/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ diff --git a/integration/networkrequest/src/main/java/com/cisco/android/rum/integration/networkrequest/api/NetworkRequestModuleConfiguration.kt b/integration/networkrequest/src/main/java/com/splunk/rum/integration/networkrequest/api/NetworkRequestModuleConfiguration.kt similarity index 83% rename from integration/networkrequest/src/main/java/com/cisco/android/rum/integration/networkrequest/api/NetworkRequestModuleConfiguration.kt rename to integration/networkrequest/src/main/java/com/splunk/rum/integration/networkrequest/api/NetworkRequestModuleConfiguration.kt index 5e84ea53..a81aa795 100644 --- a/integration/networkrequest/src/main/java/com/cisco/android/rum/integration/networkrequest/api/NetworkRequestModuleConfiguration.kt +++ b/integration/networkrequest/src/main/java/com/splunk/rum/integration/networkrequest/api/NetworkRequestModuleConfiguration.kt @@ -14,8 +14,8 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.networkrequest.api +package com.splunk.rum.integration.networkrequest.api -import com.cisco.android.rum.integration.agent.module.ModuleConfiguration +import com.splunk.rum.integration.agent.module.ModuleConfiguration class NetworkRequestModuleConfiguration : ModuleConfiguration diff --git a/integration/networkrequest/src/main/java/com/cisco/android/rum/integration/networkrequest/configurer/NetworkRequestConfigurer.kt b/integration/networkrequest/src/main/java/com/splunk/rum/integration/networkrequest/configurer/NetworkRequestConfigurer.kt similarity index 84% rename from integration/networkrequest/src/main/java/com/cisco/android/rum/integration/networkrequest/configurer/NetworkRequestConfigurer.kt rename to integration/networkrequest/src/main/java/com/splunk/rum/integration/networkrequest/configurer/NetworkRequestConfigurer.kt index 8c40f3a2..b353a98a 100644 --- a/integration/networkrequest/src/main/java/com/cisco/android/rum/integration/networkrequest/configurer/NetworkRequestConfigurer.kt +++ b/integration/networkrequest/src/main/java/com/splunk/rum/integration/networkrequest/configurer/NetworkRequestConfigurer.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.networkrequest.configurer +package com.splunk.rum.integration.networkrequest.configurer import android.content.Context import com.cisco.android.common.logger.Logger -import com.cisco.android.rum.integration.agent.internal.AgentIntegration -import com.cisco.android.rum.integration.agent.internal.config.ModuleConfigurationManager -import com.cisco.android.rum.integration.agent.internal.config.RemoteModuleConfiguration -import com.cisco.android.rum.integration.agent.internal.extension.find -import com.smartlook.sdk.common.utils.extensions.optBooleanNull +import com.splunk.rum.integration.agent.internal.AgentIntegration +import com.splunk.rum.integration.agent.internal.config.ModuleConfigurationManager +import com.splunk.rum.integration.agent.internal.config.RemoteModuleConfiguration +import com.splunk.rum.integration.agent.internal.extension.find +import com.splunk.sdk.common.utils.extensions.optBooleanNull object NetworkRequestConfigurer { diff --git a/integration/networkrequest/src/main/java/com/cisco/android/rum/integration/networkrequest/installer/NetworkRequestInstaller.kt b/integration/networkrequest/src/main/java/com/splunk/rum/integration/networkrequest/installer/NetworkRequestInstaller.kt similarity index 90% rename from integration/networkrequest/src/main/java/com/cisco/android/rum/integration/networkrequest/installer/NetworkRequestInstaller.kt rename to integration/networkrequest/src/main/java/com/splunk/rum/integration/networkrequest/installer/NetworkRequestInstaller.kt index f1eff1c3..20d03634 100644 --- a/integration/networkrequest/src/main/java/com/cisco/android/rum/integration/networkrequest/installer/NetworkRequestInstaller.kt +++ b/integration/networkrequest/src/main/java/com/splunk/rum/integration/networkrequest/installer/NetworkRequestInstaller.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.cisco.android.rum.integration.networkrequest.installer +package com.splunk.rum.integration.networkrequest.installer import android.content.ContentProvider import android.content.ContentValues import android.database.Cursor import android.net.Uri -import com.cisco.android.rum.integration.networkrequest.configurer.NetworkRequestConfigurer +import com.splunk.rum.integration.networkrequest.configurer.NetworkRequestConfigurer internal class NetworkRequestInstaller : ContentProvider() { From d16311c55d16d4dbf06186bf6d87382af2c5a767 Mon Sep 17 00:00:00 2001 From: Ondrej Synak Date: Thu, 9 Jan 2025 13:00:40 +0100 Subject: [PATCH 2/3] Fix imports after renaming the packages --- .../networkrequests/HttpUrlConnectionTest.kt | 1 + .../networkrequests/NetworkRequestsUtil.kt | 2 +- .../networkrequests/NetworkRequestsTest.kt | 2 +- .../BuildInfoInjectorPlugin.kt | 8 ++++---- .../utils/MappingFileModifier.kt | 2 +- .../utils/ObfuscationTypeAnalyzer.kt | 2 +- .../com/splunk/rum/anr/AnrReportingHandler.kt | 2 +- .../com/splunk/rum/anr/ANRWatchDogTest.kt | 1 - .../splunk/rum/anr/AnrReportingHandlerTest.kt | 9 ++++----- .../rum/crash/CrashReportingHandlerTest.kt | 1 - .../HttpUrlReplacementsTest.kt | 2 -- .../tracing/OkHttpCallbackAdviceHelperTest.kt | 1 - .../okhttp3/tracing/TracingInterceptorTest.kt | 4 +--- .../integration/agent/api/CiscoRUMAgent.kt | 3 +-- .../GenericAttributesLogProcessor.kt | 2 +- .../api/configuration/ConfigurationManager.kt | 2 +- .../agent/api/extension/ConfigurationExt.kt | 2 +- .../agent/api/internal/MRUMAgentCore.kt | 18 ++++++++--------- .../api/sessionId/SessionIdLogProcessor.kt | 2 +- .../api/sessionId/SessionIdSpanProcessor.kt | 2 +- .../api/sessionId/SessionStartEventManager.kt | 20 +++++++++---------- .../sessionPulse/SessionPulseEventManager.kt | 6 +++--- .../api/state/StateLogRecordProcessor.kt | 2 +- .../anr/configurer/ANRConfigurer.kt | 2 +- .../crash/api/CrashModuleConfiguration.kt | 2 +- 25 files changed, 46 insertions(+), 54 deletions(-) diff --git a/app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/HttpUrlConnectionTest.kt b/app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/HttpUrlConnectionTest.kt index 1c3242a0..e5cb92f8 100644 --- a/app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/HttpUrlConnectionTest.kt +++ b/app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/HttpUrlConnectionTest.kt @@ -26,6 +26,7 @@ import org.junit.Test class HttpUrlConnectionTest : BaseTest() { private var startingMillis: Long = System.currentTimeMillis() + @Before fun getIntoScreen() { screen { diff --git a/app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/NetworkRequestsUtil.kt b/app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/NetworkRequestsUtil.kt index 3bc5c317..2ec2b4fc 100644 --- a/app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/NetworkRequestsUtil.kt +++ b/app/src/androidTest/java/com/splunk/app/tests/component/networkrequests/NetworkRequestsUtil.kt @@ -40,4 +40,4 @@ object NetworkRequestsUtil { ) ) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/splunk/app/tests/e2e/networkrequests/NetworkRequestsTest.kt b/app/src/androidTest/java/com/splunk/app/tests/e2e/networkrequests/NetworkRequestsTest.kt index b1018256..d1c97cfb 100644 --- a/app/src/androidTest/java/com/splunk/app/tests/e2e/networkrequests/NetworkRequestsTest.kt +++ b/app/src/androidTest/java/com/splunk/app/tests/e2e/networkrequests/NetworkRequestsTest.kt @@ -23,7 +23,7 @@ import com.splunk.app.screens.screen import com.splunk.app.tests.e2e.BaseTestE2E import org.junit.Test -class NetworkRequestsTest: BaseTestE2E() { +class NetworkRequestsTest : BaseTestE2E() { @Test fun selectSeveralNetworkRequests() { diff --git a/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/BuildInfoInjectorPlugin.kt b/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/BuildInfoInjectorPlugin.kt index b8c4d874..9c8e38bd 100644 --- a/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/BuildInfoInjectorPlugin.kt +++ b/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/BuildInfoInjectorPlugin.kt @@ -28,7 +28,7 @@ import java.io.FileInputStream import java.security.MessageDigest import java.util.Locale -class BuildInfoInjectorPlugin : Plugin { +class BuildInfoInjectorPlugin : Plugin { // TODO: ADD SONAR COVERAGE TO THIS AND UTILS CLASSES @@ -39,7 +39,7 @@ class BuildInfoInjectorPlugin : Plugin { val extension = project.extensions.getByName("androidComponents") as ApplicationAndroidComponentsExtension extension.onVariants { variant -> project.afterEvaluate { - executePluginTask(project, variant) + executePluginTask(project, variant) } } } @@ -80,7 +80,7 @@ class BuildInfoInjectorPlugin : Plugin { packageTask?.finalizedBy(appendBuildInfoToMappingFileTask) } - private fun obtainApkFile(project: Project, logger: Logger, variantName: String, buildTypeName: String?, flavorName: String?): File? { + private fun obtainApkFile(project: Project, logger: Logger, variantName: String, buildTypeName: String?, flavorName: String?): File? { if (buildTypeName == null) { logger.error("APK file is needed to calculate build info," + " unable to determine the buildType and apk directory for build variant: $variantName" ) @@ -131,4 +131,4 @@ class BuildInfoInjectorPlugin : Plugin { } return hexString.toString() } -} \ No newline at end of file +} diff --git a/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/utils/MappingFileModifier.kt b/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/utils/MappingFileModifier.kt index 36dce021..8178fb37 100644 --- a/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/utils/MappingFileModifier.kt +++ b/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/utils/MappingFileModifier.kt @@ -79,4 +79,4 @@ class MappingFileModifier(private val pluginLogger: Logger) { return buildInfoJsonStringBuilder.toString() } -} \ No newline at end of file +} diff --git a/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/utils/ObfuscationTypeAnalyzer.kt b/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/utils/ObfuscationTypeAnalyzer.kt index fa459e3f..6689b369 100644 --- a/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/utils/ObfuscationTypeAnalyzer.kt +++ b/instrumentation/buildtime/build-info-injector/src/main/java/com/splunk/rum/buildInfoInjector/utils/ObfuscationTypeAnalyzer.kt @@ -75,4 +75,4 @@ class ObfuscationTypeAnalyzer { fun isDexGuardGradlePluginApplied(project: Project): Boolean { return project.plugins.hasPlugin("dexguard") } -} \ No newline at end of file +} diff --git a/instrumentation/runtime/anr/src/main/java/com/splunk/rum/anr/AnrReportingHandler.kt b/instrumentation/runtime/anr/src/main/java/com/splunk/rum/anr/AnrReportingHandler.kt index fcf8d775..43708e19 100644 --- a/instrumentation/runtime/anr/src/main/java/com/splunk/rum/anr/AnrReportingHandler.kt +++ b/instrumentation/runtime/anr/src/main/java/com/splunk/rum/anr/AnrReportingHandler.kt @@ -145,4 +145,4 @@ class AnrReportingHandler( currentAppState = CurrentAppState.CREATED } } -} \ No newline at end of file +} diff --git a/instrumentation/runtime/anr/src/test/java/com/splunk/rum/anr/ANRWatchDogTest.kt b/instrumentation/runtime/anr/src/test/java/com/splunk/rum/anr/ANRWatchDogTest.kt index 9fb295d9..b50c8bff 100644 --- a/instrumentation/runtime/anr/src/test/java/com/splunk/rum/anr/ANRWatchDogTest.kt +++ b/instrumentation/runtime/anr/src/test/java/com/splunk/rum/anr/ANRWatchDogTest.kt @@ -17,7 +17,6 @@ package com.splunk.rum.anr import android.os.Handler -import com.splunk.rum.anr.ANRWatchDog import io.mockk.every import io.mockk.mockk import io.mockk.verify diff --git a/instrumentation/runtime/anr/src/test/java/com/splunk/rum/anr/AnrReportingHandlerTest.kt b/instrumentation/runtime/anr/src/test/java/com/splunk/rum/anr/AnrReportingHandlerTest.kt index bc22054d..fe0fe52f 100644 --- a/instrumentation/runtime/anr/src/test/java/com/splunk/rum/anr/AnrReportingHandlerTest.kt +++ b/instrumentation/runtime/anr/src/test/java/com/splunk/rum/anr/AnrReportingHandlerTest.kt @@ -32,7 +32,6 @@ import org.junit.Assert.assertNull import java.util.concurrent.ScheduledThreadPoolExecutor import java.util.concurrent.TimeUnit import com.cisco.mrum.common.otel.api.OpenTelemetry -import com.splunk.rum.anr.AnrReportingHandler import io.mockk.Runs import io.mockk.mockkObject import io.mockk.just @@ -231,10 +230,10 @@ class AnrReportingHandlerTest { } private fun TestSetup.thenANRLogRecordBodyContainsExpectedElements(result: String) { - assertTrue(result.contains("\"exception.stacktrace\":\"java.base\\/java.lang.Thread.getStackTrace")); - assertTrue(result.contains("\"thread.id\":1")); - assertTrue(result.contains("\"thread.name\":\"TestThread\"")); - assertTrue(result.contains("\"android.state\":\"created\"")); + assertTrue(result.contains("\"exception.stacktrace\":\"java.base\\/java.lang.Thread.getStackTrace")) + assertTrue(result.contains("\"thread.id\":1")) + assertTrue(result.contains("\"thread.name\":\"TestThread\"")) + assertTrue(result.contains("\"android.state\":\"created\"")) } private fun TestSetup.givenOpentelemetryInstanceAndLogRecordBuilder(): Pair { diff --git a/instrumentation/runtime/crash/src/test/java/com/splunk/rum/crash/CrashReportingHandlerTest.kt b/instrumentation/runtime/crash/src/test/java/com/splunk/rum/crash/CrashReportingHandlerTest.kt index 11c42393..cc2e7897 100644 --- a/instrumentation/runtime/crash/src/test/java/com/splunk/rum/crash/CrashReportingHandlerTest.kt +++ b/instrumentation/runtime/crash/src/test/java/com/splunk/rum/crash/CrashReportingHandlerTest.kt @@ -26,7 +26,6 @@ import org.junit.Assert.assertNotEquals import org.junit.Assert.assertTrue import org.junit.Test import android.view.Choreographer -import com.splunk.rum.crash.CrashReportingHandler import io.mockk.mockkStatic import io.mockk.Runs import io.mockk.just diff --git a/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/httpurlconnection/HttpUrlReplacementsTest.kt b/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/httpurlconnection/HttpUrlReplacementsTest.kt index 4c511cc9..94e1cadf 100644 --- a/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/httpurlconnection/HttpUrlReplacementsTest.kt +++ b/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/httpurlconnection/HttpUrlReplacementsTest.kt @@ -19,7 +19,6 @@ package com.splunk.rum.library.httpurlconnection import android.os.SystemClock import android.util.Log import com.splunk.rum.library.common.HttpConfigUtil -import com.splunk.rum.library.httpurlconnection.HttpUrlReplacements import com.splunk.rum.library.httpurlconnection.tracing.HttpUrlConnectionSingletons import io.mockk.MockKAnnotations import io.mockk.Runs @@ -921,7 +920,6 @@ class HttpUrlReplacementsTest { // Then assertEquals(expectedValue, result) verifyReplaceAndReplaceThrowableFunctionalityIsCalled(mockUrlConnection) - } @Test diff --git a/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelperTest.kt b/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelperTest.kt index 1851738d..8a30bfcf 100644 --- a/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelperTest.kt +++ b/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/okhttp3/tracing/OkHttpCallbackAdviceHelperTest.kt @@ -16,7 +16,6 @@ package com.splunk.rum.library.okhttp3.tracing -import com.splunk.rum.library.okhttp3.tracing.OkHttpCallbackAdviceHelper import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK diff --git a/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/okhttp3/tracing/TracingInterceptorTest.kt b/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/okhttp3/tracing/TracingInterceptorTest.kt index aa287792..7b39a9f2 100644 --- a/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/okhttp3/tracing/TracingInterceptorTest.kt +++ b/instrumentation/runtime/networkrequest/library/src/test/java/com/splunk/rum/library/okhttp3/tracing/TracingInterceptorTest.kt @@ -16,8 +16,6 @@ package com.splunk.rum.library.okhttp3.tracing -import com.splunk.rum.library.okhttp3.tracing.OkHttpInterceptorUtils -import com.splunk.rum.library.okhttp3.tracing.TracingInterceptor import io.mockk.MockKAnnotations import io.mockk.Runs import io.mockk.every @@ -156,4 +154,4 @@ class TracingInterceptorTest { } just Runs every { instrumenter.end(any(), any(), any(), any()) } just Runs } -} \ No newline at end of file +} diff --git a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/CiscoRUMAgent.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/CiscoRUMAgent.kt index 5a3733e1..704aea79 100644 --- a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/CiscoRUMAgent.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/CiscoRUMAgent.kt @@ -17,7 +17,7 @@ package com.splunk.rum.integration.agent.api import android.app.Application -import com.cisco.android.rum.integration.agent.api.internal.MRUMAgentCore +import com.splunk.rum.integration.agent.api.internal.MRUMAgentCore import com.splunk.rum.integration.agent.module.ModuleConfiguration /** @@ -40,7 +40,6 @@ class CiscoRUMAgent private constructor() { val instance: CiscoRUMAgent get() = instanceInternal ?: throw RuntimeException("Must call install() before fetching instance") - /** * Initializes the RUM agent with the provided application context and configurations. * This method must be called before accessing the [instance] property. diff --git a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/attributes/GenericAttributesLogProcessor.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/attributes/GenericAttributesLogProcessor.kt index 9ba837fd..eb9f9104 100644 --- a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/attributes/GenericAttributesLogProcessor.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/attributes/GenericAttributesLogProcessor.kt @@ -16,7 +16,7 @@ package com.splunk.rum.integration.agent.api.attributes -import com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants.DOMAIN +import com.splunk.rum.integration.agent.api.attributes.AttributeConstants.DOMAIN import io.opentelemetry.context.Context import io.opentelemetry.sdk.logs.LogRecordProcessor import io.opentelemetry.sdk.logs.ReadWriteLogRecord diff --git a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/configuration/ConfigurationManager.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/configuration/ConfigurationManager.kt index cea96c73..4dbb9b26 100644 --- a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/configuration/ConfigurationManager.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/configuration/ConfigurationManager.kt @@ -18,7 +18,7 @@ package com.splunk.rum.integration.agent.api.configuration import android.content.Context import com.cisco.android.common.logger.Logger -import com.cisco.android.rum.integration.agent.api.AgentConfiguration +import com.splunk.rum.integration.agent.api.AgentConfiguration import com.cisco.mrum.common.otel.internal.storage.OtelStorage internal class ConfigurationManager private constructor( diff --git a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/extension/ConfigurationExt.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/extension/ConfigurationExt.kt index 51f39f21..956fa315 100644 --- a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/extension/ConfigurationExt.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/extension/ConfigurationExt.kt @@ -16,7 +16,7 @@ package com.splunk.rum.integration.agent.api.extension -import com.cisco.android.rum.integration.agent.api.AgentConfiguration +import com.splunk.rum.integration.agent.api.AgentConfiguration import io.opentelemetry.sdk.resources.Resource import io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME import io.opentelemetry.semconv.ResourceAttributes.SERVICE_VERSION diff --git a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/internal/MRUMAgentCore.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/internal/MRUMAgentCore.kt index 493d7465..c1d0b68b 100644 --- a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/internal/MRUMAgentCore.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/internal/MRUMAgentCore.kt @@ -18,17 +18,17 @@ package com.splunk.rum.integration.agent.api.internal import android.app.Application import com.cisco.android.common.logger.Logger -import com.cisco.android.rum.integration.agent.api.AgentConfiguration -import com.cisco.android.rum.integration.agent.api.attributes.GenericAttributesLogProcessor -import com.cisco.android.rum.integration.agent.api.configuration.ConfigurationManager +import com.splunk.rum.integration.agent.api.AgentConfiguration +import com.splunk.rum.integration.agent.api.attributes.GenericAttributesLogProcessor +import com.splunk.rum.integration.agent.api.configuration.ConfigurationManager import com.splunk.rum.integration.agent.api.extension.toResource -import com.cisco.android.rum.integration.agent.api.sessionId.SessionIdLogProcessor -import com.cisco.android.rum.integration.agent.api.sessionId.SessionIdSpanProcessor -import com.cisco.android.rum.integration.agent.api.sessionId.SessionStartEventManager -import com.cisco.android.rum.integration.agent.api.sessionPulse.SessionPulseEventManager -import com.cisco.android.rum.integration.agent.api.state.StateLogRecordProcessor +import com.splunk.rum.integration.agent.api.sessionId.SessionIdLogProcessor +import com.splunk.rum.integration.agent.api.sessionId.SessionIdSpanProcessor +import com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager +import com.splunk.rum.integration.agent.api.sessionPulse.SessionPulseEventManager +import com.splunk.rum.integration.agent.api.state.StateLogRecordProcessor import com.splunk.rum.integration.agent.internal.AgentIntegration -import com.cisco.android.rum.integration.agent.internal.BuildConfig +import com.splunk.rum.integration.agent.internal.BuildConfig import com.splunk.rum.integration.agent.internal.state.StateManager import com.splunk.rum.integration.agent.module.ModuleConfiguration import com.cisco.mrum.common.otel.api.OpenTelemetryInitializer diff --git a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionIdLogProcessor.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionIdLogProcessor.kt index ba690fc8..e5d7a8a1 100644 --- a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionIdLogProcessor.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionIdLogProcessor.kt @@ -17,7 +17,7 @@ package com.splunk.rum.integration.agent.api.sessionId import com.cisco.android.common.logger.Logger -import com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants.SESSION_ID_KEY +import com.splunk.rum.integration.agent.api.attributes.AttributeConstants.SESSION_ID_KEY import com.splunk.rum.integration.agent.internal.session.SessionManager import io.opentelemetry.context.Context import io.opentelemetry.sdk.logs.LogRecordProcessor diff --git a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionIdSpanProcessor.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionIdSpanProcessor.kt index 3297d95d..08b46212 100644 --- a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionIdSpanProcessor.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionIdSpanProcessor.kt @@ -16,7 +16,7 @@ package com.splunk.rum.integration.agent.api.sessionId -import com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants.SESSION_ID_KEY +import com.splunk.rum.integration.agent.api.attributes.AttributeConstants.SESSION_ID_KEY import com.splunk.rum.integration.agent.internal.session.SessionManager import io.opentelemetry.context.Context import io.opentelemetry.sdk.trace.ReadWriteSpan diff --git a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionStartEventManager.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionStartEventManager.kt index 6d937020..1eb897d9 100644 --- a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionStartEventManager.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionId/SessionStartEventManager.kt @@ -17,7 +17,7 @@ package com.splunk.rum.integration.agent.api.sessionId import com.cisco.android.common.logger.Logger -import com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants +import com.splunk.rum.integration.agent.api.attributes.AttributeConstants import com.splunk.rum.integration.agent.internal.session.SessionManager import com.cisco.mrum.common.otel.api.OpenTelemetry import io.opentelemetry.api.common.AttributeKey @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit internal class SessionStartEventManager(sessionManager: SessionManager) { init { - Logger.d(com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager.Companion.TAG, "init()") + Logger.d(TAG, "init()") sessionManager.sessionListeners += object : SessionManager.SessionListener { override fun onSessionChanged(sessionId: String) { @@ -37,13 +37,13 @@ internal class SessionStartEventManager(sessionManager: SessionManager) { } private fun createSessionStartEvent(sessionId: String, userId: String) { - Logger.d(com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager.Companion.TAG, "createSessionStartEvent() sessionId: $sessionId, userId: $userId") + Logger.d(TAG, "createSessionStartEvent() sessionId: $sessionId, userId: $userId") val instance = OpenTelemetry.instance ?: return val now = System.currentTimeMillis() val attributes = Attributes.of( - com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants.NAME, "session_start", + AttributeConstants.NAME, "session_start", AttributeKey.stringKey("enduser.anon_id"), userId, ) // TODO Scope @@ -58,13 +58,13 @@ internal class SessionStartEventManager(sessionManager: SessionManager) { companion object { private const val TAG = "SessionStartEventManager" - private var instanceInternal: com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager? = null - fun obtainInstance(sessionManager: SessionManager): com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager { - if (com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager.Companion.instanceInternal == null) - com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager.Companion.instanceInternal = - com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager(sessionManager) + private var instanceInternal: SessionStartEventManager? = null + fun obtainInstance(sessionManager: SessionManager): SessionStartEventManager { + if (instanceInternal == null) + instanceInternal = + SessionStartEventManager(sessionManager) - return requireNotNull(com.splunk.rum.integration.agent.api.sessionId.SessionStartEventManager.Companion.instanceInternal) + return requireNotNull(instanceInternal) } } } diff --git a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionPulse/SessionPulseEventManager.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionPulse/SessionPulseEventManager.kt index e2ac375d..7a69a8fa 100644 --- a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionPulse/SessionPulseEventManager.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/sessionPulse/SessionPulseEventManager.kt @@ -17,9 +17,9 @@ package com.splunk.rum.integration.agent.api.sessionPulse import com.cisco.android.common.logger.Logger -import com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants -import com.splunk.rum.integration.agent.internal.session.SessionManager import com.cisco.mrum.common.otel.api.OpenTelemetry +import com.splunk.rum.integration.agent.api.attributes.AttributeConstants.NAME +import com.splunk.rum.integration.agent.internal.session.SessionManager import io.opentelemetry.api.common.Attributes import java.util.concurrent.TimeUnit @@ -42,7 +42,7 @@ internal class SessionPulseEventManager(sessionManager: SessionManager) { val now = System.currentTimeMillis() val attributes = Attributes.of( - com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants.NAME, "session_pulse", + NAME, "session_pulse", ) // TODO Scope instance.sdkLoggerProvider diff --git a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/state/StateLogRecordProcessor.kt b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/state/StateLogRecordProcessor.kt index 8ed1f936..46580bda 100644 --- a/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/state/StateLogRecordProcessor.kt +++ b/integration/agent/api/src/main/java/com/splunk/rum/integration/agent/api/state/StateLogRecordProcessor.kt @@ -16,7 +16,7 @@ package com.splunk.rum.integration.agent.api.state -import com.splunk.android.rum.integration.agent.api.attributes.AttributeConstants.STATE +import com.splunk.rum.integration.agent.api.attributes.AttributeConstants.STATE import com.splunk.rum.integration.agent.internal.state.StateManager import io.opentelemetry.context.Context import io.opentelemetry.sdk.logs.LogRecordProcessor diff --git a/integration/anr/src/main/java/com/splunk/rum/integration/anr/configurer/ANRConfigurer.kt b/integration/anr/src/main/java/com/splunk/rum/integration/anr/configurer/ANRConfigurer.kt index 14560dac..911e8d3d 100644 --- a/integration/anr/src/main/java/com/splunk/rum/integration/anr/configurer/ANRConfigurer.kt +++ b/integration/anr/src/main/java/com/splunk/rum/integration/anr/configurer/ANRConfigurer.kt @@ -93,4 +93,4 @@ object ANRConfigurer { } } } -} \ No newline at end of file +} diff --git a/integration/crash/src/main/java/com/splunk/rum/integration/crash/api/CrashModuleConfiguration.kt b/integration/crash/src/main/java/com/splunk/rum/integration/crash/api/CrashModuleConfiguration.kt index c1772f93..c7358111 100644 --- a/integration/crash/src/main/java/com/splunk/rum/integration/crash/api/CrashModuleConfiguration.kt +++ b/integration/crash/src/main/java/com/splunk/rum/integration/crash/api/CrashModuleConfiguration.kt @@ -18,4 +18,4 @@ package com.splunk.rum.integration.crash.api import com.splunk.rum.integration.agent.module.ModuleConfiguration -class CrashModuleConfiguration : ModuleConfiguration \ No newline at end of file +class CrashModuleConfiguration : ModuleConfiguration From f4d82bdfe8282be2810339d08a5961b2907ce856 Mon Sep 17 00:00:00 2001 From: Ondrej Synak Date: Thu, 9 Jan 2025 13:10:56 +0100 Subject: [PATCH 3/3] Fix imports after renaming the packages --- app/build.gradle.kts | 4 ++-- app/src/main/java/com/splunk/app/App.kt | 4 ++-- .../com/splunk/rum/integration/agent/api/JavaIntegration.java | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index cf8c3322..310a3f2d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,10 +14,10 @@ plugins { apply() android { - namespace = "com.smartlook.app" + namespace = "com.splunk.app" defaultConfig { - applicationId = "com.smartlook.app" + applicationId = "com.splunk.app" versionCode = Configurations.sdkVersionCode versionName = Configurations.sdkVersionName diff --git a/app/src/main/java/com/splunk/app/App.kt b/app/src/main/java/com/splunk/app/App.kt index e52146d3..7ad01f87 100644 --- a/app/src/main/java/com/splunk/app/App.kt +++ b/app/src/main/java/com/splunk/app/App.kt @@ -17,8 +17,8 @@ package com.splunk.app import android.app.Application -import com.cisco.android.rum.integration.agent.api.AgentConfiguration -import com.cisco.android.rum.integration.agent.api.CiscoRUMAgent +import com.splunk.rum.integration.agent.api.AgentConfiguration +import com.splunk.rum.integration.agent.api.CiscoRUMAgent import java.net.URL class App : Application() { diff --git a/integration/agent/api/src/test/java/com/splunk/rum/integration/agent/api/JavaIntegration.java b/integration/agent/api/src/test/java/com/splunk/rum/integration/agent/api/JavaIntegration.java index 4b34f07a..5f5de054 100644 --- a/integration/agent/api/src/test/java/com/splunk/rum/integration/agent/api/JavaIntegration.java +++ b/integration/agent/api/src/test/java/com/splunk/rum/integration/agent/api/JavaIntegration.java @@ -19,8 +19,6 @@ import android.app.Application; import com.splunk.rum.integration.agent.module.ModuleConfiguration; -import com.cisco.android.rum.integration.agent.api.AgentConfiguration; -import com.cisco.android.rum.integration.agent.api.CiscoRUMAgent; import java.net.MalformedURLException; import java.net.URL;