Extract modules from core

android-agent/build.gradle.kts

@@ -9,6 +9,7 @@ android {
 
 dependencies {
     api(project(":core"))
+    implementation(project(":common"))
     implementation(libs.opentelemetry.instrumentation.api)
 
     // Default instrumentations:

android-agent/src/main/kotlin/io/opentelemetry/android/agent/OtelRumConfigExtensions.kt

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.android.agent
 
+import io.opentelemetry.android.common.internal.features.networkattrs.data.CurrentNetwork
 import io.opentelemetry.android.config.OtelRumConfig
 import io.opentelemetry.android.instrumentation.AndroidInstrumentationLoader
 import io.opentelemetry.android.instrumentation.activity.ActivityLifecycleInstrumentation
@@ -15,7 +16,6 @@ import io.opentelemetry.android.instrumentation.crash.CrashReporterInstrumentati
 import io.opentelemetry.android.instrumentation.fragment.FragmentLifecycleInstrumentation
 import io.opentelemetry.android.instrumentation.network.NetworkChangeInstrumentation
 import io.opentelemetry.android.instrumentation.slowrendering.SlowRenderingInstrumentation
-import io.opentelemetry.android.internal.services.network.data.CurrentNetwork
 import io.opentelemetry.api.trace.Tracer
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor
 import java.time.Duration

common/build.gradle.kts

@@ -0,0 +1,24 @@
+plugins {
+    id("otel.android-library-conventions")
+}
+
+description = "OpenTelemetry android common utils"
+
+android {
+    namespace = "io.opentelemetry.android.common"
+
+    defaultConfig {
+        consumerProguardFiles("consumer-rules.pro")
+    }
+}
+
+dependencies {
+    api(platform(libs.opentelemetry.platform.alpha))
+    api(libs.opentelemetry.api)
+    implementation(libs.opentelemetry.sdk)
+    implementation(libs.opentelemetry.instrumentation.api)
+    implementation(libs.opentelemetry.semconv.incubating)
+    implementation(libs.androidx.core)
+
+    testImplementation(libs.robolectric)
+}

core/src/main/java/io/opentelemetry/android/RuntimeDetailsExtractor.java → common/src/main/java/io/opentelemetry/android/common/RuntimeDetailsExtractor.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.android;
+package io.opentelemetry.android.common;
 
 import static io.opentelemetry.android.common.RumConstants.BATTERY_PERCENT_KEY;
 import static io.opentelemetry.android.common.RumConstants.HEAP_FREE_KEY;

core/src/main/java/io/opentelemetry/android/internal/features/networkattrs/CurrentNetworkAttributesExtractor.java → common/src/main/java/io/opentelemetry/android/common/internal/features/networkattrs/CurrentNetworkAttributesExtractor.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.android.internal.features.networkattrs;
+package io.opentelemetry.android.common.internal.features.networkattrs;
 
 import static io.opentelemetry.semconv.incubating.NetworkIncubatingAttributes.NETWORK_CARRIER_ICC;
 import static io.opentelemetry.semconv.incubating.NetworkIncubatingAttributes.NETWORK_CARRIER_MCC;
@@ -13,7 +13,7 @@
 import static io.opentelemetry.semconv.incubating.NetworkIncubatingAttributes.NETWORK_CONNECTION_TYPE;
 
 import androidx.annotation.Nullable;
-import io.opentelemetry.android.internal.services.network.data.CurrentNetwork;
+import io.opentelemetry.android.common.internal.features.networkattrs.data.CurrentNetwork;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;

core/src/main/java/io/opentelemetry/android/internal/services/network/data/Carrier.kt → common/src/main/java/io/opentelemetry/android/common/internal/features/networkattrs/data/Carrier.kt

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.android.internal.services.network.data
+package io.opentelemetry.android.common.internal.features.networkattrs.data
 
 import android.os.Build
 import android.telephony.TelephonyManager

core/src/main/java/io/opentelemetry/android/internal/services/network/data/CurrentNetwork.java → common/src/main/java/io/opentelemetry/android/common/internal/features/networkattrs/data/CurrentNetwork.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.android.internal.services.network.data;
+package io.opentelemetry.android.common.internal.features.networkattrs.data;
 
 import android.os.Build;
 import androidx.annotation.Nullable;

core/src/main/java/io/opentelemetry/android/internal/services/network/data/NetworkState.java → common/src/main/java/io/opentelemetry/android/common/internal/features/networkattrs/data/NetworkState.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.android.internal.services.network.data;
+package io.opentelemetry.android.common.internal.features.networkattrs.data;
 
 import static io.opentelemetry.semconv.incubating.NetworkIncubatingAttributes.NetworkConnectionTypeIncubatingValues;
 

core/src/test/java/io/opentelemetry/android/RuntimeDetailsExtractorTest.java → common/src/test/java/io/opentelemetry/android/common/RuntimeDetailsExtractorTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.android;
+package io.opentelemetry.android.common;
 
 import static io.opentelemetry.android.common.RumConstants.BATTERY_PERCENT_KEY;
 import static io.opentelemetry.android.common.RumConstants.HEAP_FREE_KEY;

core/src/test/java/io/opentelemetry/android/internal/features/networkattrs/CurrentNetworkAttributesExtractorTest.java → common/src/test/java/io/opentelemetry/android/common/internal/features/networkattrs/CurrentNetworkAttributesExtractorTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.android.internal.features.networkattrs;
+package io.opentelemetry.android.common.internal.features.networkattrs;
 
 import static io.opentelemetry.semconv.incubating.NetworkIncubatingAttributes.NETWORK_CARRIER_ICC;
 import static io.opentelemetry.semconv.incubating.NetworkIncubatingAttributes.NETWORK_CARRIER_MCC;
@@ -14,9 +14,9 @@
 import static org.assertj.core.api.Assertions.entry;
 
 import android.os.Build;
-import io.opentelemetry.android.internal.services.network.data.Carrier;
-import io.opentelemetry.android.internal.services.network.data.CurrentNetwork;
-import io.opentelemetry.android.internal.services.network.data.NetworkState;
+import io.opentelemetry.android.common.internal.features.networkattrs.data.Carrier;
+import io.opentelemetry.android.common.internal.features.networkattrs.data.CurrentNetwork;
+import io.opentelemetry.android.common.internal.features.networkattrs.data.NetworkState;
 import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;

core/build.gradle.kts

@@ -62,9 +62,11 @@ android {
 }
 
 dependencies {
+    implementation(project(":instrumentation:android-instrumentation"))
+    implementation(project(":services"))
+    implementation(project(":common"))
+
     implementation(libs.androidx.core)
-    implementation(libs.androidx.navigation.fragment)
-    implementation(libs.androidx.lifecycle.process)
 
     api(platform(libs.opentelemetry.platform.alpha))
     api(libs.opentelemetry.api)
@@ -74,6 +76,7 @@ dependencies {
     implementation(libs.opentelemetry.instrumentation.api)
     implementation(libs.opentelemetry.semconv.incubating)
     implementation(libs.opentelemetry.diskBuffering)
+
     testImplementation(libs.opentelemetry.api.incubator)
     testImplementation(libs.androidx.test.core)
     testImplementation(libs.awaitility)

core/src/main/java/io/opentelemetry/android/internal/features/networkattrs/NetworkAttributesSpanAppender.java

@@ -5,8 +5,9 @@
 
 package io.opentelemetry.android.internal.features.networkattrs;
 
+import io.opentelemetry.android.common.internal.features.networkattrs.CurrentNetworkAttributesExtractor;
+import io.opentelemetry.android.common.internal.features.networkattrs.data.CurrentNetwork;
 import io.opentelemetry.android.internal.services.network.CurrentNetworkProvider;
-import io.opentelemetry.android.internal.services.network.data.CurrentNetwork;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.trace.ReadWriteSpan;

core/src/test/java/io/opentelemetry/android/OpenTelemetryRumBuilderTest.java

@@ -34,8 +34,8 @@
 import io.opentelemetry.android.instrumentation.AndroidInstrumentation;
 import io.opentelemetry.android.instrumentation.AndroidInstrumentationLoader;
 import io.opentelemetry.android.instrumentation.InstallationContext;
+import io.opentelemetry.android.instrumentation.internal.AndroidInstrumentationLoaderImpl;
 import io.opentelemetry.android.internal.initialization.InitializationEvents;
-import io.opentelemetry.android.internal.instrumentation.AndroidInstrumentationLoaderImpl;
 import io.opentelemetry.android.internal.services.CacheStorage;
 import io.opentelemetry.android.internal.services.Preferences;
 import io.opentelemetry.android.internal.services.ServiceManager;

core/src/test/java/io/opentelemetry/android/internal/features/networkattrs/NetworkAttributesSpanAppenderTest.java

@@ -12,9 +12,9 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import io.opentelemetry.android.common.internal.features.networkattrs.data.CurrentNetwork;
+import io.opentelemetry.android.common.internal.features.networkattrs.data.NetworkState;
 import io.opentelemetry.android.internal.services.network.CurrentNetworkProvider;
-import io.opentelemetry.android.internal.services.network.data.CurrentNetwork;
-import io.opentelemetry.android.internal.services.network.data.NetworkState;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.trace.ReadWriteSpan;

instrumentation/activity/build.gradle.kts

@@ -17,7 +17,9 @@ dependencies {
     api(platform(libs.opentelemetry.platform.alpha))
     api(libs.opentelemetry.api)
     api(project(":instrumentation:common-api"))
-    api(project(":core"))
+    api(project(":instrumentation:android-instrumentation"))
+    implementation(project(":services"))
+    implementation(project(":common"))
     implementation(libs.opentelemetry.sdk)
     implementation(libs.androidx.core)
     implementation(libs.androidx.navigation.fragment)

instrumentation/android-instrumentation/build.gradle.kts

@@ -0,0 +1,21 @@
+plugins {
+    id("otel.android-library-conventions")
+    id("otel.publish-conventions")
+}
+
+description = "OpenTelemetry Android Instrumentation Auto Service"
+
+android {
+    namespace = "io.opentelemetry.android.instrumentation"
+
+    defaultConfig {
+        consumerProguardFiles("consumer-rules.pro")
+    }
+}
+
+dependencies {
+    implementation(project(":services"))
+
+    api(platform(libs.opentelemetry.platform.alpha))
+    api(libs.opentelemetry.api)
+}

core/src/main/java/io/opentelemetry/android/instrumentation/AndroidInstrumentation.kt → instrumentation/android-instrumentation/src/main/java/io/opentelemetry/android/instrumentation/AndroidInstrumentation.kt

@@ -5,8 +5,6 @@
 
 package io.opentelemetry.android.instrumentation
 
-import io.opentelemetry.android.OpenTelemetryRum
-
 /**
  * This interface defines a tool that automatically generates telemetry for a specific use-case,
  * without the need for end users to directly interact with the OpenTelemetry SDK to create telemetry manually.

core/src/main/java/io/opentelemetry/android/instrumentation/AndroidInstrumentationLoader.kt → instrumentation/android-instrumentation/src/main/java/io/opentelemetry/android/instrumentation/AndroidInstrumentationLoader.kt

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.android.instrumentation
 
-import io.opentelemetry.android.internal.instrumentation.AndroidInstrumentationLoaderImpl
+import io.opentelemetry.android.instrumentation.internal.AndroidInstrumentationLoaderImpl
 
 /**
  * Loads and provides [AndroidInstrumentation] instances from the runtime classpath.

core/src/main/java/io/opentelemetry/android/internal/instrumentation/AndroidInstrumentationLoaderImpl.kt → instrumentation/android-instrumentation/src/main/java/io/opentelemetry/android/instrumentation/internal/AndroidInstrumentationLoaderImpl.kt

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.android.internal.instrumentation
+package io.opentelemetry.android.instrumentation.internal
 
 import io.opentelemetry.android.instrumentation.AndroidInstrumentation
 import io.opentelemetry.android.instrumentation.AndroidInstrumentationLoader

instrumentation/android-instrumentation/src/test/java/io/opentelemetry/android/instrumentation/TestAndroidInstrumentation.kt

@@ -0,0 +1,15 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.android.instrumentation
+
+class TestAndroidInstrumentation : AndroidInstrumentation {
+    var installed = false
+        private set
+
+    override fun install(ctx: InstallationContext) {
+        installed = true
+    }
+}

core/src/test/java/io/opentelemetry/android/internal/instrumentation/AndroidInstrumentationLoaderImplTest.kt → instrumentation/android-instrumentation/src/test/java/io/opentelemetry/android/instrumentation/internal/AndroidInstrumentationLoaderImplTest.kt

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.android.internal.instrumentation
+package io.opentelemetry.android.instrumentation.internal
 
 import io.mockk.mockk
 import io.opentelemetry.android.instrumentation.TestAndroidInstrumentation

instrumentation/android-instrumentation/src/test/resources/META-INF/services/io.opentelemetry.android.instrumentation.AndroidInstrumentation

@@ -0,0 +1 @@
+io.opentelemetry.android.instrumentation.TestAndroidInstrumentation

instrumentation/anr/build.gradle.kts

@@ -18,9 +18,10 @@ android {
 }
 
 dependencies {
+    api(project(":instrumentation:android-instrumentation"))
+    implementation(project(":services"))
     api(platform(libs.opentelemetry.platform.alpha))
     api(libs.opentelemetry.api)
-    api(project(":core"))
     implementation(libs.androidx.core)
     implementation(libs.opentelemetry.semconv)
     implementation(libs.opentelemetry.sdk)

instrumentation/common-api/build.gradle.kts

@@ -14,7 +14,7 @@ android {
 }
 
 dependencies {
-    api(project(":core"))
+    implementation(project(":common"))
     api(platform(libs.opentelemetry.platform.alpha))
     api(libs.opentelemetry.api)
     implementation(libs.androidx.navigation.fragment)

instrumentation/crash/build.gradle.kts

@@ -14,9 +14,11 @@ android {
 }
 
 dependencies {
+    api(project(":instrumentation:android-instrumentation"))
+    implementation(project(":common"))
+    implementation(project(":services"))
     api(platform(libs.opentelemetry.platform.alpha))
     api(libs.opentelemetry.api)
-    api(project(":core"))
     implementation(libs.androidx.core)
     implementation(libs.opentelemetry.semconv.incubating)
     implementation(libs.opentelemetry.sdk)

instrumentation/crash/src/main/java/io/opentelemetry/android/instrumentation/crash/CrashReporterInstrumentation.java

@@ -7,7 +7,7 @@
 
 import androidx.annotation.NonNull;
 import com.google.auto.service.AutoService;
-import io.opentelemetry.android.RuntimeDetailsExtractor;
+import io.opentelemetry.android.common.RuntimeDetailsExtractor;
 import io.opentelemetry.android.instrumentation.AndroidInstrumentation;
 import io.opentelemetry.android.instrumentation.InstallationContext;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;

instrumentation/fragment/build.gradle.kts

@@ -17,7 +17,9 @@ dependencies {
     api(platform(libs.opentelemetry.platform.alpha))
     api(libs.opentelemetry.api)
     api(project(":instrumentation:common-api"))
-    api(project(":core"))
+    api(project(":instrumentation:android-instrumentation"))
+    implementation(project(":services"))
+    implementation(project(":common"))
     implementation(libs.androidx.core)
     api(libs.androidx.navigation.fragment)
     implementation(libs.opentelemetry.sdk)

instrumentation/httpurlconnection/library/build.gradle.kts

@@ -10,10 +10,10 @@ android {
 }
 
 dependencies {
+    api(project(":instrumentation:android-instrumentation"))
     api(platform(libs.opentelemetry.platform.alpha))
     api(libs.opentelemetry.api)
     api(libs.opentelemetry.context)
-    api(project(":core"))
     implementation(libs.opentelemetry.instrumentation.apiSemconv)
     implementation(libs.opentelemetry.instrumentation.api)
 }

instrumentation/network/build.gradle.kts

@@ -19,10 +19,11 @@ android {
 }
 
 dependencies {
+    api(project(":instrumentation:android-instrumentation"))
+    implementation(project(":services"))
+    implementation(project(":common"))
     api(platform(libs.opentelemetry.platform.alpha))
     api(libs.opentelemetry.api)
-    api(project(":core"))
-    api(project(":instrumentation:common-api"))
     implementation(libs.androidx.core)
     implementation(libs.opentelemetry.semconv.incubating)
     implementation(libs.opentelemetry.sdk)

instrumentation/network/src/main/java/io/opentelemetry/android/instrumentation/network/NetworkApplicationListener.java

@@ -7,10 +7,10 @@
 
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
 
+import io.opentelemetry.android.common.internal.features.networkattrs.data.CurrentNetwork;
 import io.opentelemetry.android.internal.services.applifecycle.ApplicationStateListener;
 import io.opentelemetry.android.internal.services.network.CurrentNetworkProvider;
 import io.opentelemetry.android.internal.services.network.NetworkChangeListener;
-import io.opentelemetry.android.internal.services.network.data.CurrentNetwork;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;

instrumentation/network/src/main/java/io/opentelemetry/android/instrumentation/network/NetworkChangeAttributesExtractor.java

@@ -8,9 +8,9 @@
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
 import static io.opentelemetry.semconv.incubating.NetworkIncubatingAttributes.NETWORK_CONNECTION_TYPE;
 
-import io.opentelemetry.android.internal.features.networkattrs.CurrentNetworkAttributesExtractor;
-import io.opentelemetry.android.internal.services.network.data.CurrentNetwork;
-import io.opentelemetry.android.internal.services.network.data.NetworkState;
+import io.opentelemetry.android.common.internal.features.networkattrs.CurrentNetworkAttributesExtractor;
+import io.opentelemetry.android.common.internal.features.networkattrs.data.CurrentNetwork;
+import io.opentelemetry.android.common.internal.features.networkattrs.data.NetworkState;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;

instrumentation/network/src/main/java/io/opentelemetry/android/instrumentation/network/NetworkChangeInstrumentation.java

@@ -7,9 +7,9 @@
 
 import androidx.annotation.NonNull;
 import com.google.auto.service.AutoService;
+import io.opentelemetry.android.common.internal.features.networkattrs.data.CurrentNetwork;
 import io.opentelemetry.android.instrumentation.AndroidInstrumentation;
 import io.opentelemetry.android.instrumentation.InstallationContext;
-import io.opentelemetry.android.internal.services.network.data.CurrentNetwork;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import java.util.ArrayList;
 import java.util.Collections;