prepare 1.4.0 release (#773)

CHANGELOG.md

@@ -7,9 +7,15 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Unreleased
 
+### Version 1.4.0 - 2024-03-06
+
+This regular release follows the upstream `opentelemetry-android` release.
+
+* Upgrade upstream `opentelemetry-android` to 0.4.0.
 * Add new incubating API: `SplunkRumBuilder.setHttpSenderCustomizer()` to allow customization
   of the HTTP client used for sending data to Splunk. This can be useful when devices are
-  behind a proxy or API gateway.
+  behind a proxy or API gateway (#742).
+* Fix AndroidResource blending between Splunk version and upstream. (#757)
 
 ## Version 1.3.1 - 2023-12-14
 

splunk-otel-android/build.gradle.kts

@@ -48,7 +48,7 @@ dependencies {
     api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:$otelAlphaVersion"))
     api(platform("io.opentelemetry:opentelemetry-bom:$otelSdkVersion"))
 
-    api("io.opentelemetry.android:instrumentation:0.3.0-alpha")
+    api("io.opentelemetry.android:instrumentation:0.4.0-alpha")
 
     implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.22"))
     implementation("androidx.appcompat:appcompat:1.6.1")

splunk-otel-android/src/test/java/com/splunk/rum/RumInitializerTest.java

@@ -79,6 +79,7 @@ void initializationSpan() {
         appInfo.labelRes = 14;
 
         when(application.getApplicationContext()).thenReturn(context);
+        when(application.getMainLooper()).thenReturn(mainLooper);
         when(context.getApplicationInfo()).thenReturn(appInfo);
         when(context.getString(appInfo.labelRes)).thenReturn(APP_NAME);
 
@@ -139,6 +140,7 @@ void spanLimitsAreConfigured() {
                         .setRumAccessToken("accessToken");
 
         when(application.getApplicationContext()).thenReturn(context);
+        when(application.getMainLooper()).thenReturn(mainLooper);
 
         InMemorySpanExporter testExporter = InMemorySpanExporter.create();
         AppStartupTimer startupTimer = new AppStartupTimer();
@@ -244,6 +246,7 @@ void canCustomizeHttpSender() {
                         .setHttpSenderCustomizer(customizer);
 
         when(application.getApplicationContext()).thenReturn(context);
+        when(application.getMainLooper()).thenReturn(mainLooper);
 
         RumInitializer testInitializer =
                 new RumInitializer(splunkRumBuilder, application, new AppStartupTimer());
@@ -265,6 +268,7 @@ void shouldTranslateExceptionEventsToSpanAttributes() {
                         .setRumAccessToken("secret!")
                         .setApplicationName("test");
 
+        when(application.getMainLooper()).thenReturn(mainLooper);
         when(application.getApplicationContext()).thenReturn(context);
 
         AppStartupTimer appStartupTimer = new AppStartupTimer();