Reorganizing dirs (#391)

* Renaming test-tools dir * Moving animalsniffer signature project to internal tools * Clean up * Renaming android-plugin * Renaming android-sdk * Renaming android-api * Renaming android-common * Renaming android-test * Renaming android-test * Renaming root module * Updated tests * Running debug variant tests * Uploading test failed reports * Uploading test failed reports
elastic · Feb 17, 2025 · b297c6a · b297c6a
1 parent d3a7c8e
commit b297c6a
Show file tree

Hide file tree

Showing 201 changed files with 55 additions and 62 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,7 +53,8 @@ jobs:
         with:
           name: test-results
           path: |
-            **/build/test-results/testRelease*/TEST-*.xml
+            **/build/reports/tests/testDebugUnitTest/**/*
+            **/build/test-results/testDebug*/TEST-*.xml
             **/build/test-results/test/TEST-*.xml
             **/build/outputs/androidTest-results/**/TEST-*.xml
 

diff --git a/android-api/build.gradle.kts → agent-api/build.gradle.kts b/android-api/build.gradle.kts → agent-api/build.gradle.kts
diff --git a/android-api/metadata/notice.properties → agent-api/metadata/notice.properties b/android-api/metadata/notice.properties → agent-api/metadata/notice.properties
diff --git a/...stic/otel/android/api/ElasticOtelAgent.kt → ...stic/otel/android/api/ElasticOtelAgent.kt b/...stic/otel/android/api/ElasticOtelAgent.kt → ...stic/otel/android/api/ElasticOtelAgent.kt
diff --git a/...c/otel/android/api/clock/ClockProvider.kt → ...c/otel/android/api/clock/ClockProvider.kt b/...c/otel/android/api/clock/ClockProvider.kt → ...c/otel/android/api/clock/ClockProvider.kt
diff --git a/...l/android/api/flusher/LogRecordFlusher.kt → ...l/android/api/flusher/LogRecordFlusher.kt b/...l/android/api/flusher/LogRecordFlusher.kt → ...l/android/api/flusher/LogRecordFlusher.kt
diff --git a/...otel/android/api/flusher/MetricFlusher.kt → ...otel/android/api/flusher/MetricFlusher.kt b/...otel/android/api/flusher/MetricFlusher.kt → ...otel/android/api/flusher/MetricFlusher.kt
diff --git a/...c/otel/android/api/flusher/SpanFlusher.kt → ...c/otel/android/api/flusher/SpanFlusher.kt b/...c/otel/android/api/flusher/SpanFlusher.kt → ...c/otel/android/api/flusher/SpanFlusher.kt
diff --git a/...id-api/src/main/resources/META-INF/NOTICE → agent-api/src/main/resources/META-INF/NOTICE b/...id-api/src/main/resources/META-INF/NOTICE → agent-api/src/main/resources/META-INF/NOTICE
diff --git a/android-common/build.gradle.kts → agent-common/build.gradle.kts b/android-common/build.gradle.kts → agent-common/build.gradle.kts
diff --git a/android-common/metadata/notice.properties → agent-common/metadata/notice.properties b/android-common/metadata/notice.properties → agent-common/metadata/notice.properties
diff --git a/...id/common/internal/logging/BaseELogger.kt → ...id/common/internal/logging/BaseELogger.kt b/...id/common/internal/logging/BaseELogger.kt → ...id/common/internal/logging/BaseELogger.kt
diff --git a/...common/internal/logging/ELoggerFactory.kt → ...common/internal/logging/ELoggerFactory.kt b/...common/internal/logging/ELoggerFactory.kt → ...common/internal/logging/ELoggerFactory.kt
diff --git a/...l/android/common/internal/logging/Elog.kt → ...l/android/common/internal/logging/Elog.kt b/...l/android/common/internal/logging/Elog.kt → ...l/android/common/internal/logging/Elog.kt
diff --git a/...common/src/main/resources/META-INF/NOTICE → ...common/src/main/resources/META-INF/NOTICE b/...common/src/main/resources/META-INF/NOTICE → ...common/src/main/resources/META-INF/NOTICE
diff --git a/android-plugin/build.gradle.kts → agent-plugin/build.gradle.kts b/android-plugin/build.gradle.kts → agent-plugin/build.gradle.kts
@@ -5,15 +5,15 @@ plugins {
 }
 
 dependencies {
-    api(project(":android-common"))
+    api(project(":agent-common"))
     implementation(libs.byteBuddy)
     implementation(libs.byteBuddy.plugin)
     compileOnly(libs.android.plugin)
 }
 
 buildConfig {
     packageName("${group}.generated")
-    buildConfigField("String", "SDK_DEPENDENCY_URI", "\"$group:android-sdk:$version\"")
+    buildConfigField("String", "SDK_DEPENDENCY_URI", "\"$group:agent-sdk:$version\"")
 }
 
 gradlePlugin {

diff --git a/android-plugin/metadata/notice.properties → agent-plugin/metadata/notice.properties b/android-plugin/metadata/notice.properties → agent-plugin/metadata/notice.properties
diff --git a/...otel/android/plugin/ElasticAgentPlugin.kt → ...otel/android/plugin/ElasticAgentPlugin.kt b/...otel/android/plugin/ElasticAgentPlugin.kt → ...otel/android/plugin/ElasticAgentPlugin.kt
diff --git a/...gin/extensions/BytecodeInstrumentation.kt → ...gin/extensions/BytecodeInstrumentation.kt b/...gin/extensions/BytecodeInstrumentation.kt → ...gin/extensions/BytecodeInstrumentation.kt
diff --git a/.../plugin/extensions/ElasticApmExtension.kt → .../plugin/extensions/ElasticApmExtension.kt b/.../plugin/extensions/ElasticApmExtension.kt → .../plugin/extensions/ElasticApmExtension.kt
diff --git a/...d/plugin/internal/BuildVariantListener.kt → ...d/plugin/internal/BuildVariantListener.kt b/...d/plugin/internal/BuildVariantListener.kt → ...d/plugin/internal/BuildVariantListener.kt
diff --git a/...n/internal/ByteBuddyDependencyAttacher.kt → ...n/internal/ByteBuddyDependencyAttacher.kt b/...n/internal/ByteBuddyDependencyAttacher.kt → ...n/internal/ByteBuddyDependencyAttacher.kt
diff --git a/.../plugin/internal/InstrumentationPlugin.kt → .../plugin/internal/InstrumentationPlugin.kt b/.../plugin/internal/InstrumentationPlugin.kt → .../plugin/internal/InstrumentationPlugin.kt
diff --git a/...n/internal/logging/GradleLoggerFactory.kt → ...n/internal/logging/GradleLoggerFactory.kt b/...n/internal/logging/GradleLoggerFactory.kt → ...n/internal/logging/GradleLoggerFactory.kt
diff --git a/...plugin/src/main/resources/META-INF/NOTICE → ...plugin/src/main/resources/META-INF/NOTICE b/...plugin/src/main/resources/META-INF/NOTICE → ...plugin/src/main/resources/META-INF/NOTICE
diff --git a/android-sdk/build.gradle.kts → agent-sdk/build.gradle.kts b/android-sdk/build.gradle.kts → agent-sdk/build.gradle.kts
@@ -21,10 +21,10 @@ android {
 }
 
 dependencies {
-    api(project(":android-api"))
+    api(project(":agent-api"))
     api(project(":instrumentation:api"))
     implementation(libs.stagemonitor.configuration)
-    implementation(project(":android-common"))
+    implementation(project(":agent-common"))
     implementation(libs.opentelemetry.exporter.otlp)
     implementation(libs.bundles.opentelemetry.semconv)
     implementation(libs.opentelemetry.diskBuffering)

diff --git a/android-sdk/metadata/notice.properties → agent-sdk/metadata/notice.properties b/android-sdk/metadata/notice.properties → agent-sdk/metadata/notice.properties
diff --git a/android-sdk/src/main/AndroidManifest.xml → agent-sdk/src/main/AndroidManifest.xml b/android-sdk/src/main/AndroidManifest.xml → agent-sdk/src/main/AndroidManifest.xml
diff --git a/...o/elastic/otel/android/ElasticApmAgent.kt → ...o/elastic/otel/android/ElasticApmAgent.kt b/...o/elastic/otel/android/ElasticApmAgent.kt → ...o/elastic/otel/android/ElasticApmAgent.kt
diff --git a/...connectivity/ConnectivityConfiguration.kt → ...connectivity/ConnectivityConfiguration.kt b/...connectivity/ConnectivityConfiguration.kt → ...connectivity/ConnectivityConfiguration.kt
diff --git a/...tel/android/exporters/ExporterProvider.kt → ...tel/android/exporters/ExporterProvider.kt b/...tel/android/exporters/ExporterProvider.kt → ...tel/android/exporters/ExporterProvider.kt
diff --git a/...android/exporters/NoopExporterProvider.kt → ...android/exporters/NoopExporterProvider.kt b/...android/exporters/NoopExporterProvider.kt → ...android/exporters/NoopExporterProvider.kt
diff --git a/...exporters/configuration/ExportProtocol.kt → ...exporters/configuration/ExportProtocol.kt b/...exporters/configuration/ExportProtocol.kt → ...exporters/configuration/ExportProtocol.kt
diff --git a/...rs/configuration/ExporterConfiguration.kt → ...rs/configuration/ExporterConfiguration.kt b/...rs/configuration/ExporterConfiguration.kt → ...rs/configuration/ExporterConfiguration.kt
diff --git a/.../extensions/ElasticOtelAgentExtensions.kt → .../extensions/ElasticOtelAgentExtensions.kt b/.../extensions/ElasticOtelAgentExtensions.kt → .../extensions/ElasticOtelAgentExtensions.kt
diff --git a/...ures/apmserver/ApmServerAuthentication.kt → ...ures/apmserver/ApmServerAuthentication.kt b/...ures/apmserver/ApmServerAuthentication.kt → ...ures/apmserver/ApmServerAuthentication.kt
diff --git a/...atures/apmserver/ApmServerConnectivity.kt → ...atures/apmserver/ApmServerConnectivity.kt b/...atures/apmserver/ApmServerConnectivity.kt → ...atures/apmserver/ApmServerConnectivity.kt
diff --git a/...id/features/session/SessionIdGenerator.kt → ...id/features/session/SessionIdGenerator.kt b/...id/features/session/SessionIdGenerator.kt → ...id/features/session/SessionIdGenerator.kt
diff --git a/...c/otel/android/interceptor/Interceptor.kt → ...c/otel/android/interceptor/Interceptor.kt b/...c/otel/android/interceptor/Interceptor.kt → ...c/otel/android/interceptor/Interceptor.kt
diff --git a/...d/internal/api/ManagedElasticOtelAgent.kt → ...d/internal/api/ManagedElasticOtelAgent.kt b/...d/internal/api/ManagedElasticOtelAgent.kt → ...d/internal/api/ManagedElasticOtelAgent.kt
diff --git a/...attributes/CommonAttributesInterceptor.kt → ...attributes/CommonAttributesInterceptor.kt b/...attributes/CommonAttributesInterceptor.kt → ...attributes/CommonAttributesInterceptor.kt
diff --git a/...l/attributes/SpanAttributesInterceptor.kt → ...l/attributes/SpanAttributesInterceptor.kt b/...l/attributes/SpanAttributesInterceptor.kt → ...l/attributes/SpanAttributesInterceptor.kt
diff --git a/...d/internal/configuration/Configuration.kt → ...d/internal/configuration/Configuration.kt b/...d/internal/configuration/Configuration.kt → ...d/internal/configuration/Configuration.kt
diff --git a/...rnal/configuration/ConfigurationOption.kt → ...rnal/configuration/ConfigurationOption.kt b/...rnal/configuration/ConfigurationOption.kt → ...rnal/configuration/ConfigurationOption.kt
diff --git a/...tivity/ConnectivityConfigurationHolder.kt → ...tivity/ConnectivityConfigurationHolder.kt b/...tivity/ConnectivityConfigurationHolder.kt → ...tivity/ConnectivityConfigurationHolder.kt
diff --git a/...apmserver/ApmServerConnectivityManager.kt → ...apmserver/ApmServerConnectivityManager.kt b/...apmserver/ApmServerConnectivityManager.kt → ...apmserver/ApmServerConnectivityManager.kt
diff --git a/...es/apmserver/ApmServerExporterProvider.kt → ...es/apmserver/ApmServerExporterProvider.kt b/...es/apmserver/ApmServerExporterProvider.kt → ...es/apmserver/ApmServerExporterProvider.kt
diff --git a/...res/centralconfig/CentralConfiguration.kt → ...res/centralconfig/CentralConfiguration.kt b/...res/centralconfig/CentralConfiguration.kt → ...res/centralconfig/CentralConfiguration.kt
diff --git a/...onfig/CentralConfigurationConnectivity.kt → ...onfig/CentralConfigurationConnectivity.kt b/...onfig/CentralConfigurationConnectivity.kt → ...onfig/CentralConfigurationConnectivity.kt
diff --git a/...tralconfig/CentralConfigurationManager.kt → ...tralconfig/CentralConfigurationManager.kt b/...tralconfig/CentralConfigurationManager.kt → ...tralconfig/CentralConfigurationManager.kt
diff --git a/...ntralconfig/CentralConfigurationSource.kt → ...ntralconfig/CentralConfigurationSource.kt b/...ntralconfig/CentralConfigurationSource.kt → ...ntralconfig/CentralConfigurationSource.kt
diff --git a/...ig/fetcher/CentralConfigurationFetcher.kt → ...ig/fetcher/CentralConfigurationFetcher.kt b/...ig/fetcher/CentralConfigurationFetcher.kt → ...ig/fetcher/CentralConfigurationFetcher.kt
diff --git a/...ures/centralconfig/fetcher/FetchResult.kt → ...ures/centralconfig/fetcher/FetchResult.kt b/...ures/centralconfig/fetcher/FetchResult.kt → ...ures/centralconfig/fetcher/FetchResult.kt
diff --git a/...eatures/clock/ClockExporterGateManager.kt → ...eatures/clock/ClockExporterGateManager.kt b/...eatures/clock/ClockExporterGateManager.kt → ...eatures/clock/ClockExporterGateManager.kt
diff --git a/...es/clock/ElasticClockBroadcastReceiver.kt → ...es/clock/ElasticClockBroadcastReceiver.kt b/...es/clock/ElasticClockBroadcastReceiver.kt → ...es/clock/ElasticClockBroadcastReceiver.kt
diff --git a/...nal/features/clock/ElasticClockManager.kt → ...nal/features/clock/ElasticClockManager.kt b/...nal/features/clock/ElasticClockManager.kt → ...nal/features/clock/ElasticClockManager.kt
diff --git a/...d/internal/features/clock/MutableClock.kt → ...d/internal/features/clock/MutableClock.kt b/...d/internal/features/clock/MutableClock.kt → ...d/internal/features/clock/MutableClock.kt
diff --git a/...features/clock/RemoteTimeOffsetManager.kt → ...features/clock/RemoteTimeOffsetManager.kt b/...features/clock/RemoteTimeOffsetManager.kt → ...features/clock/RemoteTimeOffsetManager.kt
diff --git a/...nternal/features/clock/SystemTimeClock.kt → ...nternal/features/clock/SystemTimeClock.kt b/...nternal/features/clock/SystemTimeClock.kt → ...nternal/features/clock/SystemTimeClock.kt
diff --git a/...ldrop/ConditionalDropLogRecordExporter.kt → ...ldrop/ConditionalDropLogRecordExporter.kt b/...ldrop/ConditionalDropLogRecordExporter.kt → ...ldrop/ConditionalDropLogRecordExporter.kt
diff --git a/...conditionaldrop/ConditionalDropManager.kt → ...conditionaldrop/ConditionalDropManager.kt b/...conditionaldrop/ConditionalDropManager.kt → ...conditionaldrop/ConditionalDropManager.kt
diff --git a/...onaldrop/ConditionalDropMetricExporter.kt → ...onaldrop/ConditionalDropMetricExporter.kt b/...onaldrop/ConditionalDropMetricExporter.kt → ...onaldrop/ConditionalDropMetricExporter.kt
diff --git a/...tionaldrop/ConditionalDropSpanExporter.kt → ...tionaldrop/ConditionalDropSpanExporter.kt b/...tionaldrop/ConditionalDropSpanExporter.kt → ...tionaldrop/ConditionalDropSpanExporter.kt
diff --git a/...al/features/conditionaldrop/SignalType.kt → ...al/features/conditionaldrop/SignalType.kt b/...al/features/conditionaldrop/SignalType.kt → ...al/features/conditionaldrop/SignalType.kt
diff --git a/...skbuffering/DiskBufferingConfiguration.kt → ...skbuffering/DiskBufferingConfiguration.kt b/...skbuffering/DiskBufferingConfiguration.kt → ...skbuffering/DiskBufferingConfiguration.kt
diff --git a/...res/diskbuffering/DiskBufferingManager.kt → ...res/diskbuffering/DiskBufferingManager.kt b/...res/diskbuffering/DiskBufferingManager.kt → ...res/diskbuffering/DiskBufferingManager.kt
diff --git a/...s/diskbuffering/SignalFromDiskExporter.kt → ...s/diskbuffering/SignalFromDiskExporter.kt b/...s/diskbuffering/SignalFromDiskExporter.kt → ...s/diskbuffering/SignalFromDiskExporter.kt
diff --git a/...atures/diskbuffering/tools/DiskManager.kt → ...atures/diskbuffering/tools/DiskManager.kt b/...atures/diskbuffering/tools/DiskManager.kt → ...atures/diskbuffering/tools/DiskManager.kt
diff --git a/...tures/exportergate/ExporterGateManager.kt → ...tures/exportergate/ExporterGateManager.kt b/...tures/exportergate/ExporterGateManager.kt → ...tures/exportergate/ExporterGateManager.kt
diff --git a/...eatures/exportergate/ExporterGateQueue.kt → ...eatures/exportergate/ExporterGateQueue.kt b/...eatures/exportergate/ExporterGateQueue.kt → ...eatures/exportergate/ExporterGateQueue.kt
diff --git a/...res/exportergate/GateLogRecordExporter.kt → ...res/exportergate/GateLogRecordExporter.kt b/...res/exportergate/GateLogRecordExporter.kt → ...res/exportergate/GateLogRecordExporter.kt
diff --git a/...atures/exportergate/GateMetricExporter.kt → ...atures/exportergate/GateMetricExporter.kt b/...atures/exportergate/GateMetricExporter.kt → ...atures/exportergate/GateMetricExporter.kt
diff --git a/...features/exportergate/GateSpanExporter.kt → ...features/exportergate/GateSpanExporter.kt b/...features/exportergate/GateSpanExporter.kt → ...features/exportergate/GateSpanExporter.kt
diff --git a/...rnal/features/exportergate/latch/Latch.kt → ...rnal/features/exportergate/latch/Latch.kt b/...rnal/features/exportergate/latch/Latch.kt → ...rnal/features/exportergate/latch/Latch.kt
diff --git a/...tures/httpinterceptor/HttpSpanExporter.kt → ...tures/httpinterceptor/HttpSpanExporter.kt b/...tures/httpinterceptor/HttpSpanExporter.kt → ...tures/httpinterceptor/HttpSpanExporter.kt
diff --git a/...nterceptor/HttpSpanExporterInterceptor.kt → ...nterceptor/HttpSpanExporterInterceptor.kt b/...nterceptor/HttpSpanExporterInterceptor.kt → ...nterceptor/HttpSpanExporterInterceptor.kt
diff --git a/...ttpinterceptor/HttpSpanNameInterceptor.kt → ...ttpinterceptor/HttpSpanNameInterceptor.kt b/...ttpinterceptor/HttpSpanNameInterceptor.kt → ...ttpinterceptor/HttpSpanNameInterceptor.kt
diff --git a/...instrumentation/InstrumentationManager.kt → ...instrumentation/InstrumentationManager.kt b/...instrumentation/InstrumentationManager.kt → ...instrumentation/InstrumentationManager.kt
diff --git a/...ersistence/SimpleTemporaryFileProvider.kt → ...ersistence/SimpleTemporaryFileProvider.kt b/...ersistence/SimpleTemporaryFileProvider.kt → ...ersistence/SimpleTemporaryFileProvider.kt
diff --git a/...features/sessionmanager/SessionManager.kt → ...features/sessionmanager/SessionManager.kt b/...features/sessionmanager/SessionManager.kt → ...features/sessionmanager/SessionManager.kt
diff --git a/...onmanager/samplerate/SampleRateManager.kt → ...onmanager/samplerate/SampleRateManager.kt b/...onmanager/samplerate/SampleRateManager.kt → ...onmanager/samplerate/SampleRateManager.kt
diff --git a/.../internal/logging/DefaultLoggingPolicy.kt → .../internal/logging/DefaultLoggingPolicy.kt b/.../internal/logging/DefaultLoggingPolicy.kt → .../internal/logging/DefaultLoggingPolicy.kt
diff --git a/...d/internal/logging/SimpleLoggingPolicy.kt → ...d/internal/logging/SimpleLoggingPolicy.kt b/...d/internal/logging/SimpleLoggingPolicy.kt → ...d/internal/logging/SimpleLoggingPolicy.kt
diff --git a/...nal/opentelemetry/ElasticOpenTelemetry.kt → ...nal/opentelemetry/ElasticOpenTelemetry.kt b/...nal/opentelemetry/ElasticOpenTelemetry.kt → ...nal/opentelemetry/ElasticOpenTelemetry.kt
diff --git a/...telemetry/clock/ElapsedTimeOffsetClock.kt → ...telemetry/clock/ElapsedTimeOffsetClock.kt b/...telemetry/clock/ElapsedTimeOffsetClock.kt → ...telemetry/clock/ElapsedTimeOffsetClock.kt
diff --git a/...figurable/ConfigurableExporterProvider.kt → ...figurable/ConfigurableExporterProvider.kt b/...figurable/ConfigurableExporterProvider.kt → ...figurable/ConfigurableExporterProvider.kt
diff --git a/.../configurable/MutableLogRecordExporter.kt → .../configurable/MutableLogRecordExporter.kt b/.../configurable/MutableLogRecordExporter.kt → .../configurable/MutableLogRecordExporter.kt
diff --git a/...ers/configurable/MutableMetricExporter.kt → ...ers/configurable/MutableMetricExporter.kt b/...ers/configurable/MutableMetricExporter.kt → ...ers/configurable/MutableMetricExporter.kt
diff --git a/...rters/configurable/MutableSpanExporter.kt → ...rters/configurable/MutableSpanExporter.kt b/...rters/configurable/MutableSpanExporter.kt → ...rters/configurable/MutableSpanExporter.kt
diff --git a/...try/processors/DefaultProcessorFactory.kt → ...try/processors/DefaultProcessorFactory.kt b/...try/processors/DefaultProcessorFactory.kt → ...try/processors/DefaultProcessorFactory.kt
diff --git a/...sors/logs/LogRecordAttributesProcessor.kt → ...sors/logs/LogRecordAttributesProcessor.kt b/...sors/logs/LogRecordAttributesProcessor.kt → ...sors/logs/LogRecordAttributesProcessor.kt
diff --git a/...ocessors/spans/SpanAttributesProcessor.kt → ...ocessors/spans/SpanAttributesProcessor.kt b/...ocessors/spans/SpanAttributesProcessor.kt → ...ocessors/spans/SpanAttributesProcessor.kt
diff --git a/...cessors/spans/SpanInterceptorProcessor.kt → ...cessors/spans/SpanInterceptorProcessor.kt b/...cessors/spans/SpanInterceptorProcessor.kt → ...cessors/spans/SpanInterceptorProcessor.kt
diff --git a/...otel/android/internal/services/Service.kt → ...otel/android/internal/services/Service.kt b/...otel/android/internal/services/Service.kt → ...otel/android/internal/services/Service.kt
diff --git a/...droid/internal/services/ServiceManager.kt → ...droid/internal/services/ServiceManager.kt b/...droid/internal/services/ServiceManager.kt → ...droid/internal/services/ServiceManager.kt
diff --git a/...ternal/services/appinfo/AppInfoService.kt → ...ternal/services/appinfo/AppInfoService.kt b/...ternal/services/appinfo/AppInfoService.kt → ...ternal/services/appinfo/AppInfoService.kt
diff --git a/...s/backgroundwork/BackgroundWorkService.kt → ...s/backgroundwork/BackgroundWorkService.kt b/...s/backgroundwork/BackgroundWorkService.kt → ...s/backgroundwork/BackgroundWorkService.kt
diff --git a/...ternal/services/network/NetworkService.kt → ...ternal/services/network/NetworkService.kt b/...ternal/services/network/NetworkService.kt → ...ternal/services/network/NetworkService.kt
diff --git a/...rnal/services/network/data/CarrierInfo.kt → ...rnal/services/network/data/CarrierInfo.kt b/...rnal/services/network/data/CarrierInfo.kt → ...rnal/services/network/data/CarrierInfo.kt
diff --git a/...rnal/services/network/data/NetworkType.kt → ...rnal/services/network/data/NetworkType.kt b/...rnal/services/network/data/NetworkType.kt → ...rnal/services/network/data/NetworkType.kt
diff --git a/...network/listener/NetworkChangeListener.kt → ...network/listener/NetworkChangeListener.kt b/...network/listener/NetworkChangeListener.kt → ...network/listener/NetworkChangeListener.kt
diff --git a/...network/query/NetworkApi21QueryManager.kt → ...network/query/NetworkApi21QueryManager.kt b/...network/query/NetworkApi21QueryManager.kt → ...network/query/NetworkApi21QueryManager.kt
diff --git a/...network/query/NetworkApi23QueryManager.kt → ...network/query/NetworkApi23QueryManager.kt b/...network/query/NetworkApi23QueryManager.kt → ...network/query/NetworkApi23QueryManager.kt
diff --git a/...network/query/NetworkApi24QueryManager.kt → ...network/query/NetworkApi24QueryManager.kt b/...network/query/NetworkApi24QueryManager.kt → ...network/query/NetworkApi24QueryManager.kt
diff --git a/...ices/network/query/NetworkQueryManager.kt → ...ices/network/query/NetworkQueryManager.kt b/...ices/network/query/NetworkQueryManager.kt → ...ices/network/query/NetworkQueryManager.kt
diff --git a/...ervices/preferences/PreferencesService.kt → ...ervices/preferences/PreferencesService.kt b/...ervices/preferences/PreferencesService.kt → ...ervices/preferences/PreferencesService.kt
diff --git a/...ndroid/internal/session/DefaultSession.kt → ...ndroid/internal/session/DefaultSession.kt b/...ndroid/internal/session/DefaultSession.kt → ...ndroid/internal/session/DefaultSession.kt
diff --git a/...nternal/session/DefaultSessionProvider.kt → ...nternal/session/DefaultSessionProvider.kt b/...nternal/session/DefaultSessionProvider.kt → ...nternal/session/DefaultSessionProvider.kt
diff --git a/...droid/internal/time/SystemTimeProvider.kt → ...droid/internal/time/SystemTimeProvider.kt b/...droid/internal/time/SystemTimeProvider.kt → ...droid/internal/time/SystemTimeProvider.kt
diff --git a/...el/android/internal/time/ntp/NtpPacket.kt → ...el/android/internal/time/ntp/NtpPacket.kt b/...el/android/internal/time/ntp/NtpPacket.kt → ...el/android/internal/time/ntp/NtpPacket.kt
diff --git a/...l/android/internal/time/ntp/SntpClient.kt → ...l/android/internal/time/ntp/SntpClient.kt b/...l/android/internal/time/ntp/SntpClient.kt → ...l/android/internal/time/ntp/SntpClient.kt
diff --git a/...droid/internal/time/ntp/SntpClientImpl.kt → ...droid/internal/time/ntp/SntpClientImpl.kt b/...droid/internal/time/ntp/SntpClientImpl.kt → ...droid/internal/time/ntp/SntpClientImpl.kt
diff --git a/...el/android/internal/time/ntp/UdpClient.kt → ...el/android/internal/time/ntp/UdpClient.kt b/...el/android/internal/time/ntp/UdpClient.kt → ...el/android/internal/time/ntp/UdpClient.kt
diff --git a/...lities/AttributesOverrideLogRecordData.kt → ...lities/AttributesOverrideLogRecordData.kt b/...lities/AttributesOverrideLogRecordData.kt → ...lities/AttributesOverrideLogRecordData.kt
diff --git a/...l/utilities/AttributesOverrideSpanData.kt → ...l/utilities/AttributesOverrideSpanData.kt b/...l/utilities/AttributesOverrideSpanData.kt → ...l/utilities/AttributesOverrideSpanData.kt
diff --git a/...ternal/utilities/DelegateLogRecordData.kt → ...ternal/utilities/DelegateLogRecordData.kt b/...ternal/utilities/DelegateLogRecordData.kt → ...ternal/utilities/DelegateLogRecordData.kt
diff --git a/...android/internal/utilities/NumberTools.kt → ...android/internal/utilities/NumberTools.kt b/...android/internal/utilities/NumberTools.kt → ...android/internal/utilities/NumberTools.kt
diff --git a/.../internal/utilities/cache/CacheHandler.kt → .../internal/utilities/cache/CacheHandler.kt b/.../internal/utilities/cache/CacheHandler.kt → .../internal/utilities/cache/CacheHandler.kt
diff --git a/.../cache/PreferencesCachedStringProvider.kt → .../cache/PreferencesCachedStringProvider.kt b/.../cache/PreferencesCachedStringProvider.kt → .../cache/PreferencesCachedStringProvider.kt
diff --git a/...s/cache/PreferencesIntegerCacheHandler.kt → ...s/cache/PreferencesIntegerCacheHandler.kt b/...s/cache/PreferencesIntegerCacheHandler.kt → ...s/cache/PreferencesIntegerCacheHandler.kt
diff --git a/...ties/cache/PreferencesLongCacheHandler.kt → ...ties/cache/PreferencesLongCacheHandler.kt b/...ties/cache/PreferencesLongCacheHandler.kt → ...ties/cache/PreferencesLongCacheHandler.kt
diff --git a/...es/cache/PreferencesStringCacheHandler.kt → ...es/cache/PreferencesStringCacheHandler.kt b/...es/cache/PreferencesStringCacheHandler.kt → ...es/cache/PreferencesStringCacheHandler.kt
diff --git a/...utilities/interceptor/MultiInterceptor.kt → ...utilities/interceptor/MultiInterceptor.kt b/...utilities/interceptor/MultiInterceptor.kt → ...utilities/interceptor/MultiInterceptor.kt
diff --git a/...ilities/interceptor/MutableInterceptor.kt → ...ilities/interceptor/MutableInterceptor.kt b/...ilities/interceptor/MutableInterceptor.kt → ...ilities/interceptor/MutableInterceptor.kt
diff --git a/.../utilities/interceptor/NoopInterceptor.kt → .../utilities/interceptor/NoopInterceptor.kt b/.../utilities/interceptor/NoopInterceptor.kt → .../utilities/interceptor/NoopInterceptor.kt
diff --git a/...ternal/utilities/logging/AndroidLogger.kt → ...ternal/utilities/logging/AndroidLogger.kt b/...ternal/utilities/logging/AndroidLogger.kt → ...ternal/utilities/logging/AndroidLogger.kt
diff --git a/...utilities/logging/AndroidLoggerFactory.kt → ...utilities/logging/AndroidLoggerFactory.kt b/...utilities/logging/AndroidLoggerFactory.kt → ...utilities/logging/AndroidLoggerFactory.kt
diff --git a/.../elastic/otel/android/logging/LogLevel.kt → .../elastic/otel/android/logging/LogLevel.kt b/.../elastic/otel/android/logging/LogLevel.kt → .../elastic/otel/android/logging/LogLevel.kt
diff --git a/...tic/otel/android/logging/LoggingPolicy.kt → ...tic/otel/android/logging/LoggingPolicy.kt b/...tic/otel/android/logging/LoggingPolicy.kt → ...tic/otel/android/logging/LoggingPolicy.kt
diff --git a/...el/android/processors/ProcessorFactory.kt → ...el/android/processors/ProcessorFactory.kt b/...el/android/processors/ProcessorFactory.kt → ...el/android/processors/ProcessorFactory.kt
diff --git a/...elastic/otel/android/provider/Provider.kt → ...elastic/otel/android/provider/Provider.kt b/...elastic/otel/android/provider/Provider.kt → ...elastic/otel/android/provider/Provider.kt
diff --git a/...c/otel/android/provider/StringProvider.kt → ...c/otel/android/provider/StringProvider.kt b/...c/otel/android/provider/StringProvider.kt → ...c/otel/android/provider/StringProvider.kt
diff --git a/...o/elastic/otel/android/session/Session.kt → ...o/elastic/otel/android/session/Session.kt b/...o/elastic/otel/android/session/Session.kt → ...o/elastic/otel/android/session/Session.kt
diff --git a/...c/otel/android/session/SessionProvider.kt → ...c/otel/android/session/SessionProvider.kt b/...c/otel/android/session/SessionProvider.kt → ...c/otel/android/session/SessionProvider.kt
diff --git a/...id-sdk/src/main/resources/META-INF/NOTICE → agent-sdk/src/main/resources/META-INF/NOTICE b/...id-sdk/src/main/resources/META-INF/NOTICE → agent-sdk/src/main/resources/META-INF/NOTICE
diff --git a/...rs/apmserver/ApmServerConnectivityTest.kt → ...rs/apmserver/ApmServerConnectivityTest.kt b/...rs/apmserver/ApmServerConnectivityTest.kt → ...rs/apmserver/ApmServerConnectivityTest.kt
diff --git a/...figurable/MutableLogRecordExporterTest.kt → ...figurable/MutableLogRecordExporterTest.kt b/...figurable/MutableLogRecordExporterTest.kt → ...figurable/MutableLogRecordExporterTest.kt
diff --git a/...configurable/MutableMetricExporterTest.kt → ...configurable/MutableMetricExporterTest.kt b/...configurable/MutableMetricExporterTest.kt → ...configurable/MutableMetricExporterTest.kt
diff --git a/...s/configurable/MutableSpanExporterTest.kt → ...s/configurable/MutableSpanExporterTest.kt b/...s/configurable/MutableSpanExporterTest.kt → ...s/configurable/MutableSpanExporterTest.kt
diff --git a/...otel/android/functional/AttributesTest.kt → ...otel/android/functional/AttributesTest.kt b/...otel/android/functional/AttributesTest.kt → ...otel/android/functional/AttributesTest.kt
diff --git a/...android/functional/ElasticApmAgentTest.kt → ...android/functional/ElasticApmAgentTest.kt b/...android/functional/ElasticApmAgentTest.kt → ...android/functional/ElasticApmAgentTest.kt
diff --git a/...functional/ManagedElasticOtelAgentTest.kt → ...functional/ManagedElasticOtelAgentTest.kt b/...functional/ManagedElasticOtelAgentTest.kt → ...functional/ManagedElasticOtelAgentTest.kt
diff --git a/.../android/impl/DefaultLoggingPolicyTest.kt → .../android/impl/DefaultLoggingPolicyTest.kt b/.../android/impl/DefaultLoggingPolicyTest.kt → .../android/impl/DefaultLoggingPolicyTest.kt
diff --git a/...l/android/impl/SimpleLoggingPolicyTest.kt → ...l/android/impl/SimpleLoggingPolicyTest.kt b/...l/android/impl/SimpleLoggingPolicyTest.kt → ...l/android/impl/SimpleLoggingPolicyTest.kt
diff --git a/...etcher/CentralConfigurationFetcherTest.kt → ...etcher/CentralConfigurationFetcherTest.kt b/...etcher/CentralConfigurationFetcherTest.kt → ...etcher/CentralConfigurationFetcherTest.kt
diff --git a/...l/features/persistence/DiskManagerTest.kt → ...l/features/persistence/DiskManagerTest.kt b/...l/features/persistence/DiskManagerTest.kt → ...l/features/persistence/DiskManagerTest.kt
diff --git a/...al/services/network/NetworkServiceTest.kt → ...al/services/network/NetworkServiceTest.kt b/...al/services/network/NetworkServiceTest.kt → ...al/services/network/NetworkServiceTest.kt
diff --git a/...ndroid/internal/time/ntp/NtpPacketTest.kt → ...ndroid/internal/time/ntp/NtpPacketTest.kt b/...ndroid/internal/time/ntp/NtpPacketTest.kt → ...ndroid/internal/time/ntp/NtpPacketTest.kt
diff --git a/...d/internal/time/ntp/SntpClientImplTest.kt → ...d/internal/time/ntp/SntpClientImplTest.kt b/...d/internal/time/ntp/SntpClientImplTest.kt → ...d/internal/time/ntp/SntpClientImplTest.kt
diff --git a/...ndroid/internal/time/ntp/UdpClientTest.kt → ...ndroid/internal/time/ntp/UdpClientTest.kt b/...ndroid/internal/time/ntp/UdpClientTest.kt → ...ndroid/internal/time/ntp/UdpClientTest.kt
diff --git a/...al/utilities/logging/AndroidLoggerTest.kt → ...al/utilities/logging/AndroidLoggerTest.kt b/...al/utilities/logging/AndroidLoggerTest.kt → ...al/utilities/logging/AndroidLoggerTest.kt
diff --git a/...otel/android/testutils/DummySntpClient.kt → ...otel/android/testutils/DummySntpClient.kt b/...otel/android/testutils/DummySntpClient.kt → ...otel/android/testutils/DummySntpClient.kt
diff --git a/...lastic/otel/android/testutils/NtpUtils.kt → ...lastic/otel/android/testutils/NtpUtils.kt b/...lastic/otel/android/testutils/NtpUtils.kt → ...lastic/otel/android/testutils/NtpUtils.kt
diff --git a/...c/otel/android/testutils/TestUdpServer.kt → ...c/otel/android/testutils/TestUdpServer.kt b/...c/otel/android/testutils/TestUdpServer.kt → ...c/otel/android/testutils/TestUdpServer.kt
diff --git a/...ic/otel/android/testutils/WireMockRule.kt → ...ic/otel/android/testutils/WireMockRule.kt b/...ic/otel/android/testutils/WireMockRule.kt → ...ic/otel/android/testutils/WireMockRule.kt
@@ -28,60 +28,42 @@ import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat
 import java.time.Duration
 import java.util.UUID
 import org.awaitility.kotlin.await
-import org.junit.rules.TestRule
-import org.junit.runner.Description
-import org.junit.runners.model.Statement
+import org.junit.rules.ExternalResource
 
-class WireMockRule : TestRule {
-    private var wireMock: WireMockServer? = null
-    private var allResponsesStubId: UUID? = null
+class WireMockRule : ExternalResource() {
+    private val wireMock = WireMockServer()
+    private var allResponsesStubId = UUID.randomUUID()
 
-    override fun apply(base: Statement, description: Description): Statement {
-        try {
-            return object : Statement() {
-                override fun evaluate() {
-                    base.evaluate()
-                    wireMock?.stop()
-                }
-            }
-        } finally {
-            wireMock = null
-            allResponsesStubId = null
-        }
+    override fun before() {
+        wireMock.start()
+    }
+
+    override fun after() {
+        wireMock.stop()
     }
 
     fun url(path: String): String {
-        ensureStarted()
-        return wireMock!!.url(path)
+        return wireMock.url(path)
     }
 
     fun stubAllHttpResponses(
         responseVisitor: ResponseDefinitionBuilder.() -> Unit = {}
     ) {
-        ensureStarted()
-        wireMock!!.removeStub(allResponsesStubId)
+        wireMock.removeStub(allResponsesStubId)
         val mappingBuilder = any(anyUrl()).withId(allResponsesStubId)
         val response = aResponse()
         responseVisitor(response)
         mappingBuilder.willReturn(response)
-        wireMock!!.stubFor(mappingBuilder)
-    }
-
-    private fun ensureStarted() {
-        if (wireMock == null) {
-            allResponsesStubId = UUID.randomUUID()
-            wireMock = WireMockServer()
-            wireMock?.start()
-        }
+        wireMock.stubFor(mappingBuilder)
     }
 
     fun takeRequest(awaitSeconds: Int = 2): LoggedRequest {
         await.atMost(Duration.ofSeconds(awaitSeconds.toLong()))
-            .until { wireMock?.allServeEvents?.isNotEmpty() }
-        val allServeEvents = wireMock?.allServeEvents
+            .until { wireMock.allServeEvents?.isNotEmpty() }
+        val allServeEvents = wireMock.allServeEvents
         assertThat(allServeEvents).hasSize(1)
         val serveEvent = allServeEvents?.first()
-        wireMock?.removeServeEvent(serveEvent?.id)
+        wireMock.removeServeEvent(serveEvent?.id)
         return serveEvent!!.request
     }
 }
diff --git a/android_tests.sh b/android_tests.sh
@@ -1 +1 @@
-./gradlew -p "android-test" connectedCheck
+./gradlew -p "instrumentation-test" connectedCheck
diff --git a/animalsniffer-signature/metadata/notice.properties b/animalsniffer-signature/metadata/notice.properties
diff --git a/animalsniffer-signature/src/main/resources/META-INF/NOTICE b/animalsniffer-signature/src/main/resources/META-INF/NOTICE
diff --git a/...ain/java/co/elastic/otel/android/compilation/tools/publishing/ApmPublisherRootPlugin.java b/...ain/java/co/elastic/otel/android/compilation/tools/publishing/ApmPublisherRootPlugin.java
@@ -32,7 +32,7 @@ public void apply(Project project) {
         addPostDeployTask(project);
         configureMavenCentral(project);
         project.subprojects(subproject -> {
-            if (!subproject.getPath().contains("test-tools")) {
+            if (!subproject.getPath().startsWith(":internal-tools")) {
                 Matcher instrumentationMatcher = INSTRUMENTATION_PROJECT_PATTERN.matcher(subproject.getPath());
                 if (instrumentationMatcher.matches()) {
                     setGroupId(subproject, subproject.getGroup() + ".instrumentation");

diff --git a/.../main/java/co/elastic/otel/android/compilation/tools/publishing/tasks/PostDeployTask.java b/.../main/java/co/elastic/otel/android/compilation/tools/publishing/tasks/PostDeployTask.java
@@ -96,7 +96,7 @@ private void updateSetupDoc(String currentVersion) {
         log("Updating setup doc to show version: " + currentVersion);
         Path setupDocPath = getProjectPath("docs/setup.asciidoc");
         String contents = getContents(setupDocPath);
-        Pattern versionMentionsPattern = Pattern.compile("(?<=co\\.elastic\\.apm\\.android/)\\d+\\.\\d+\\.\\d+|(?<=co\\.elastic\\.apm:android-sdk:)\\d+\\.\\d+\\.\\d+|(?<=id\\s\"co\\.elastic\\.apm\\.android\"\\sversion\\s\")\\d+\\.\\d+\\.\\d+");
+        Pattern versionMentionsPattern = Pattern.compile("(?<=co\\.elastic\\.apm\\.android/)\\d+\\.\\d+\\.\\d+|(?<=co\\.elastic\\.apm:agent-sdk:)\\d+\\.\\d+\\.\\d+|(?<=id\\s\"co\\.elastic\\.apm\\.android\"\\sversion\\s\")\\d+\\.\\d+\\.\\d+");
         Matcher versionMentionMatcher = versionMentionsPattern.matcher(contents);
 
         String setupDocWithNewVersion = versionMentionMatcher.replaceAll(currentVersion);

diff --git a/build-tools/src/main/kotlin/elastic.android-library.gradle.kts b/build-tools/src/main/kotlin/elastic.android-library.gradle.kts
@@ -1,3 +1,6 @@
+import com.android.build.api.variant.HasHostTestsBuilder
+import com.android.build.api.variant.HostTestBuilder
+
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
@@ -27,6 +30,12 @@ android {
     }
 }
 
+androidComponents.beforeVariants {
+    if (it.buildType?.equals("debug") == false) {
+        (it as HasHostTestsBuilder).hostTests.get(HostTestBuilder.UNIT_TEST_TYPE)?.enable = false
+    }
+}
+
 tasks.withType(Test::class).configureEach {
     useJUnitPlatform()
 }
@@ -36,6 +45,6 @@ dependencies {
     testImplementation(libs.findBundle("mocking").get())
     testImplementation(libs.findBundle("junit").get())
     testImplementation(libs.findLibrary("assertj").get())
-    testImplementation(project(":test-tools:test-common"))
+    testImplementation(project(":internal-tools:test-common"))
     testRuntimeOnly(libs.findLibrary("junit5-vintage").get())
 }
diff --git a/build-tools/src/main/kotlin/elastic.animalsniffer-android.gradle.kts b/build-tools/src/main/kotlin/elastic.animalsniffer-android.gradle.kts
@@ -7,7 +7,12 @@ plugins {
 }
 
 dependencies {
-    signature(project(path = ":animalsniffer-signature", configuration = "generatedSignature"))
+    signature(
+        project(
+            path = ":internal-tools:animalsniffer-signature",
+            configuration = "generatedSignature"
+        )
+    )
 }
 
 val capitalizedVariantNames = mutableListOf<String>()

diff --git a/build-tools/src/main/kotlin/elastic.instrumentation-plugin.gradle.kts b/build-tools/src/main/kotlin/elastic.instrumentation-plugin.gradle.kts
@@ -59,6 +59,6 @@ project.extensions.create(
 )
 
 dependencies {
-    implementation(project(":android-plugin"))
-    implementation(project(":android-api"))
+    implementation(project(":agent-plugin"))
+    implementation(project(":agent-api"))
 }
diff --git a/android-test/build.gradle.kts → instrumentation-test/build.gradle.kts b/android-test/build.gradle.kts → instrumentation-test/build.gradle.kts
diff --git a/android-test/buildSrc/build.gradle.kts → ...umentation-test/buildSrc/build.gradle.kts b/android-test/buildSrc/build.gradle.kts → ...umentation-test/buildSrc/build.gradle.kts
diff --git a/android-test/buildSrc/settings.gradle.kts → ...ntation-test/buildSrc/settings.gradle.kts b/android-test/buildSrc/settings.gradle.kts → ...ntation-test/buildSrc/settings.gradle.kts
diff --git a/...astic.instrumentation-test-app.gradle.kts → ...astic.instrumentation-test-app.gradle.kts b/...astic.instrumentation-test-app.gradle.kts → ...astic.instrumentation-test-app.gradle.kts
diff --git a/android-test/gradle.properties → instrumentation-test/gradle.properties b/android-test/gradle.properties → instrumentation-test/gradle.properties
diff --git a/...id-test/gradle/wrapper/gradle-wrapper.jar → ...on-test/gradle/wrapper/gradle-wrapper.jar b/...id-test/gradle/wrapper/gradle-wrapper.jar → ...on-test/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/android-test/gradlew → instrumentation-test/gradlew b/android-test/gradlew → instrumentation-test/gradlew
diff --git a/android-test/gradlew.bat → instrumentation-test/gradlew.bat b/android-test/gradlew.bat → instrumentation-test/gradlew.bat
diff --git a/...st/instrumentation/crash/build.gradle.kts → ...st/instrumentation/crash/build.gradle.kts b/...st/instrumentation/crash/build.gradle.kts → ...st/instrumentation/crash/build.gradle.kts
diff --git a/.../otel/android/test/InstrumentationTest.kt → .../otel/android/test/InstrumentationTest.kt b/.../otel/android/test/InstrumentationTest.kt → .../otel/android/test/InstrumentationTest.kt
diff --git a/...tation/crash/src/main/AndroidManifest.xml → ...tation/crash/src/main/AndroidManifest.xml b/...tation/crash/src/main/AndroidManifest.xml → ...tation/crash/src/main/AndroidManifest.xml
diff --git a/...elastic/otel/android/test/MainActivity.kt → ...elastic/otel/android/test/MainActivity.kt b/...elastic/otel/android/test/MainActivity.kt → ...elastic/otel/android/test/MainActivity.kt
diff --git a/...strumentation/launchtime/build.gradle.kts → ...strumentation/launchtime/build.gradle.kts b/...strumentation/launchtime/build.gradle.kts → ...strumentation/launchtime/build.gradle.kts
diff --git a/.../otel/android/test/InstrumentationTest.kt → .../otel/android/test/InstrumentationTest.kt b/.../otel/android/test/InstrumentationTest.kt → .../otel/android/test/InstrumentationTest.kt
diff --git a/...n/launchtime/src/main/AndroidManifest.xml → ...n/launchtime/src/main/AndroidManifest.xml b/...n/launchtime/src/main/AndroidManifest.xml → ...n/launchtime/src/main/AndroidManifest.xml
diff --git a/...elastic/otel/android/test/MainActivity.kt → ...elastic/otel/android/test/MainActivity.kt b/...elastic/otel/android/test/MainActivity.kt → ...elastic/otel/android/test/MainActivity.kt
diff --git a/...t/instrumentation/okhttp/build.gradle.kts → ...t/instrumentation/okhttp/build.gradle.kts b/...t/instrumentation/okhttp/build.gradle.kts → ...t/instrumentation/okhttp/build.gradle.kts
diff --git a/.../otel/android/test/InstrumentationTest.kt → .../otel/android/test/InstrumentationTest.kt b/.../otel/android/test/InstrumentationTest.kt → .../otel/android/test/InstrumentationTest.kt
diff --git a/...ation/okhttp/src/main/AndroidManifest.xml → ...ation/okhttp/src/main/AndroidManifest.xml b/...ation/okhttp/src/main/AndroidManifest.xml → ...ation/okhttp/src/main/AndroidManifest.xml
diff --git a/...elastic/otel/android/test/MainActivity.kt → ...elastic/otel/android/test/MainActivity.kt b/...elastic/otel/android/test/MainActivity.kt → ...elastic/otel/android/test/MainActivity.kt
diff --git a/android-test/settings.gradle.kts → instrumentation-test/settings.gradle.kts b/android-test/settings.gradle.kts → instrumentation-test/settings.gradle.kts
diff --git a/instrumentation/api/build.gradle.kts b/instrumentation/api/build.gradle.kts
@@ -7,5 +7,5 @@ android {
 }
 
 dependencies {
-    api(project(":android-api"))
+    api(project(":agent-api"))
 }
diff --git a/instrumentation/crash/library/build.gradle.kts b/instrumentation/crash/library/build.gradle.kts
@@ -11,5 +11,5 @@ dependencies {
     implementation(instrumentation.opentelemetry.api.incubator)
     testImplementation(libs.robolectric)
     testImplementation(libs.opentelemetry.testing)
-    testImplementation(project(":test-tools:robolectric-agent-rule"))
+    testImplementation(project(":internal-tools:robolectric-agent-rule"))
 }
diff --git a/test-tools/agent-rule/build.gradle.kts → internal-tools/agent-rule/build.gradle.kts b/test-tools/agent-rule/build.gradle.kts → internal-tools/agent-rule/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":android-sdk"))
-    implementation(project(":test-tools:test-common"))
+    implementation(project(":agent-sdk"))
+    implementation(project(":internal-tools:test-common"))
     implementation(libs.opentelemetry.testing)
 }
diff --git a/...s/agent-rule/src/main/AndroidManifest.xml → ...s/agent-rule/src/main/AndroidManifest.xml b/...s/agent-rule/src/main/AndroidManifest.xml → ...s/agent-rule/src/main/AndroidManifest.xml
diff --git a/...astic/otel/android/test/rule/AgentRule.kt → ...astic/otel/android/test/rule/AgentRule.kt b/...astic/otel/android/test/rule/AgentRule.kt → ...astic/otel/android/test/rule/AgentRule.kt
diff --git a/...s/androidtest-agent-rule/build.gradle.kts → ...s/androidtest-agent-rule/build.gradle.kts b/...s/androidtest-agent-rule/build.gradle.kts → ...s/androidtest-agent-rule/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    api(project(":test-tools:agent-rule"))
+    api(project(":internal-tools:agent-rule"))
     api(instrumentation.bundles.androidTest)
     api(libs.opentelemetry.testing)
     api(libs.assertj)

diff --git a/...t-agent-rule/src/main/AndroidManifest.xml → ...t-agent-rule/src/main/AndroidManifest.xml b/...t-agent-rule/src/main/AndroidManifest.xml → ...t-agent-rule/src/main/AndroidManifest.xml
diff --git a/...android/test/rule/AndroidTestAgentRule.kt → ...android/test/rule/AndroidTestAgentRule.kt b/...android/test/rule/AndroidTestAgentRule.kt → ...android/test/rule/AndroidTestAgentRule.kt
diff --git a/animalsniffer-signature/build.gradle.kts → .../animalsniffer-signature/build.gradle.kts b/animalsniffer-signature/build.gradle.kts → .../animalsniffer-signature/build.gradle.kts
diff --git a/...s/robolectric-agent-rule/build.gradle.kts → ...s/robolectric-agent-rule/build.gradle.kts b/...s/robolectric-agent-rule/build.gradle.kts → ...s/robolectric-agent-rule/build.gradle.kts
@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-    api(project(":test-tools:agent-rule"))
+    api(project(":internal-tools:agent-rule"))
     implementation(libs.robolectric)
 }
diff --git a/...c-agent-rule/src/main/AndroidManifest.xml → ...c-agent-rule/src/main/AndroidManifest.xml b/...c-agent-rule/src/main/AndroidManifest.xml → ...c-agent-rule/src/main/AndroidManifest.xml
diff --git a/...android/test/rule/RobolectricAgentRule.kt → ...android/test/rule/RobolectricAgentRule.kt b/...android/test/rule/RobolectricAgentRule.kt → ...android/test/rule/RobolectricAgentRule.kt
diff --git a/test-tools/test-common/build.gradle.kts → internal-tools/test-common/build.gradle.kts b/test-tools/test-common/build.gradle.kts → internal-tools/test-common/build.gradle.kts
diff --git a/.../test-common/src/main/AndroidManifest.xml → .../test-common/src/main/AndroidManifest.xml b/.../test-common/src/main/AndroidManifest.xml → .../test-common/src/main/AndroidManifest.xml
diff --git a/.../android/test/common/ElasticAttributes.kt → .../android/test/common/ElasticAttributes.kt b/.../android/test/common/ElasticAttributes.kt → .../android/test/common/ElasticAttributes.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -19,15 +19,14 @@ dependencyResolutionManagement {
         google()
     }
 }
-rootProject.name = "APM Android Agent"
+rootProject.name = "elastic-otel-android"
 includeBuild("build-tools")
-include(":android-api")
-include(":android-sdk")
-include(":android-plugin")
-include(":android-common")
-include(":animalsniffer-signature")
+include(":agent-api")
+include(":agent-sdk")
+include(":agent-plugin")
+include(":agent-common")
 includeFromDir("instrumentation")
-includeFromDir("test-tools", 2)
+includeFromDir("internal-tools", 2)
 
 fun includeFromDir(dirName: String, maxDepth: Int = 3) {
     val instrumentationDir = File(rootDir, dirName)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		./gradlew -p "android-test" connectedCheck
		./gradlew -p "instrumentation-test" connectedCheck