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.

Sign up for GitHub

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

Prepare 1.4.0 release #773

Merged
merged 1 commit into from
Mar 6, 2024
Merged

Prepare 1.4.0 release #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion splunk-otel-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 4 additions & 0 deletions splunk-otel-android/src/test/java/com/splunk/rum/RumInitializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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());
Expand All @@ -265,6 +268,7 @@ void shouldTranslateExceptionEventsToSpanAttributes() {
.setRumAccessToken("secret!")
.setApplicationName("test");

when(application.getMainLooper()).thenReturn(mainLooper);
when(application.getApplicationContext()).thenReturn(context);

AppStartupTimer appStartupTimer = new AppStartupTimer();
Expand Down
Loading