From 7d5037f276117b46e25d06abc98f9888989905bd Mon Sep 17 00:00:00 2001 From: jason plumb <75337021+breedx-splk@users.noreply.github.com> Date: Wed, 6 Mar 2024 12:54:36 -0800 Subject: [PATCH] prepare 1.4.0 release (#773) --- CHANGELOG.md | 8 +++++++- splunk-otel-android/build.gradle.kts | 2 +- .../src/test/java/com/splunk/rum/RumInitializerTest.java | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d3659d9..7192d8e4 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/splunk-otel-android/build.gradle.kts b/splunk-otel-android/build.gradle.kts index d9579724..44d42e41 100644 --- a/splunk-otel-android/build.gradle.kts +++ b/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") diff --git a/splunk-otel-android/src/test/java/com/splunk/rum/RumInitializerTest.java b/splunk-otel-android/src/test/java/com/splunk/rum/RumInitializerTest.java index ca615388..c82c07f4 100644 --- a/splunk-otel-android/src/test/java/com/splunk/rum/RumInitializerTest.java +++ b/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();