Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename integration and instrumentation packages to start with com.splunk.rum #1149

Open
wants to merge 3 commits into
base: feature/next-gen
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ plugins {
apply<ConfigAndroidApp>()

android {
namespace = "com.smartlook.app"
namespace = "com.splunk.app"

defaultConfig {
applicationId = "com.smartlook.app"
applicationId = "com.splunk.app"
versionCode = Configurations.sdkVersionCode
versionName = Configurations.sdkVersionName

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.smartlook.app.lib
package com.splunk.app.lib

import okhttp3.OkHttpClient
import okhttp3.Request
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,19 @@
* 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

class HttpUrlConnectionTest : BaseTest() {
private var startingMillis: Long = System.currentTimeMillis()

@Before
fun getIntoScreen() {
screen<MainScreen> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -40,4 +40,4 @@ object NetworkRequestsUtil {
)
)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
* 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() {
class NetworkRequestsTest : BaseTestE2E() {

@Test
fun selectSeveralNetworkRequests() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* 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
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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
* limitations under the License.
*/

package com.smartlook.app.ui
package com.splunk.app.ui

import android.os.Bundle
import android.view.LayoutInflater
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<T : ViewBinding> : Fragment() {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<FragmentMenuBinding>() {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading
Loading