From 2f88370f53b3ed22ff6db22e98872959140b14f5 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 13 Dec 2023 15:17:23 -0800 Subject: [PATCH 1/4] update after 1.3.0 release --- CHANGELOG.md | 11 +++++++++++ gradle.properties | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0a96994..4fcf38bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,17 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). * tbd +## Version 1.3.0 - 2023-12-13 + +This is a standard release following the regular upstream `opentelemetry-android` release. + +* Update to use upstream `opentelemetry-android` 0.3.0 (#714) +* Reduce unnecessary attempts at directory deletion for disk buffered telemetry (#683) +* Change session sampling strategy to be consistent with other splunk RUM implementations (#698) +* Global attributes and screen attributes are now handled by upstream (#710) +* Network monitoring and network attributes appender now handle by upstream (#713) +* Fix broken url targets in sample app (#715) + ## Version 1.2.0 - 2023-10-25 This is the first version of `splunk-otel-android` that is based on the upstream version of diff --git a/gradle.properties b/gradle.properties index 6f160fad..80692fb3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,5 +17,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 android.useAndroidX=true # generate the BuildConfig class that contains the app version -version=1.3.0 +version=1.4.0 group=com.splunk From c2b17a71b53ca1ff05ff0fc1bd6906f15f9f7cfb Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Thu, 14 Dec 2023 11:09:05 -0800 Subject: [PATCH 2/4] prepare for 1.3.1 patch --- CHANGELOG.md | 8 ++++++++ gradle.properties | 2 +- splunk-otel-android/build.gradle.kts | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fcf38bf..50e79bf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,17 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). * tbd +## Version 1.3.1 - 2023-12-14 + +The previous release was mistakenly built against an OpenTelemetry `SNAPSHOT` build. +This remedies that and compiles against the 1.32.0 non-SNAPSHOT bom. + +* Compile against OpenTelemetry Java Instrumentation 1.32.0 (no SNAPSHOT). + ## Version 1.3.0 - 2023-12-13 This is a standard release following the regular upstream `opentelemetry-android` release. +This version is succeeded by a patch release: Users should use 1.3.1 instead of 1.3.0. * Update to use upstream `opentelemetry-android` 0.3.0 (#714) * Reduce unnecessary attempts at directory deletion for disk buffered telemetry (#683) diff --git a/gradle.properties b/gradle.properties index 80692fb3..daa7ce42 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,5 +17,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 android.useAndroidX=true # generate the BuildConfig class that contains the app version -version=1.4.0 +version=1.3.1 group=com.splunk diff --git a/splunk-otel-android/build.gradle.kts b/splunk-otel-android/build.gradle.kts index 85d80d4f..32b9126e 100644 --- a/splunk-otel-android/build.gradle.kts +++ b/splunk-otel-android/build.gradle.kts @@ -39,7 +39,7 @@ android { } } -val otelVersion = "1.32.0-SNAPSHOT" +val otelVersion = "1.32.0" val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1") val otelSemconvVersion = "1.21.0-alpha" From 0d7fd87b04466544ac58e7957573d2ef54658877 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Thu, 14 Dec 2023 11:19:59 -0800 Subject: [PATCH 3/4] update badge --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 365239d0..853d9352 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@

Stable - - OpenTelemetry Instrumentation for Java Version + + OpenTelemetry Instrumentation for Java Version Splunk GDI specification From b3f50ec5727cf810dfbb7b953ab13660a73d1644 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Thu, 14 Dec 2023 11:20:09 -0800 Subject: [PATCH 4/4] add note about badge --- RELEASING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASING.md b/RELEASING.md index 6545a719..13041067 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -25,7 +25,8 @@ This is the process to use to do a release: 6) Create a PR to update the version in the `gradle.properties` to the next development version. This PR can and probably should also include updating any documentation (CHANGELOG.md, - README.md, etc) that mentions the previous version. + README.md, etc) that mentions the previous version. Make sure the badget in the top README.md + reflects the accurate upstream otel version. 7) Once this PR is merged, create a release in Github that points at the newly created version, and make sure to provide release notes that at least mirror the contents of the CHANGELOG.md