From 4de22aeb1a5fea280840d28fb39c4817efd7b566 Mon Sep 17 00:00:00 2001 From: getsentry-bot Date: Mon, 28 Nov 2022 17:05:41 +0000 Subject: [PATCH 1/6] release: 6.9.0 --- CHANGELOG.md | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbff415fe7..b2d4832e39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Unreleased +## 6.9.0 ### Fixes diff --git a/gradle.properties b/gradle.properties index 8ef36ddf9b..a971d7756c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ org.gradle.parallel=true android.useAndroidX=true # Release information -versionName=6.8.0 +versionName=6.9.0 # Override the SDK name on native crashes on Android sentryAndroidSdkName=sentry.native.android From 2a40b036608297702e6759664dbe85dfa588065d Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 29 Nov 2022 07:09:20 +0100 Subject: [PATCH 2/6] Include otel module distributions in build archive --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 26cc54ad73..4590afeb1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,6 +57,7 @@ jobs: if-no-files-found: error path: | ./*/build/distributions/*.zip + ./sentry-opentelemetry/*/build/distributions/*.zip ./sentry-android-ndk/build/intermediates/merged_native_libs/release/out/lib/* - name: Upload coverage to Codecov From 05d356be045bb2b76200a1959742d25df205a533 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 29 Nov 2022 11:58:48 +0100 Subject: [PATCH 3/6] Disable craft for OTEL modules for now --- .craft.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.craft.yml b/.craft.yml index ee94d4d7dd..6edb68d18a 100644 --- a/.craft.yml +++ b/.craft.yml @@ -40,9 +40,9 @@ targets: maven:io.sentry:sentry-android-fragment: maven:io.sentry:sentry-bom: maven:io.sentry:sentry-openfeign: - maven:io.sentry:sentry-opentelemetry-agent: - maven:io.sentry:sentry-opentelemetry-agentcustomization: - maven:io.sentry:sentry-opentelemetry-core: +# maven:io.sentry:sentry-opentelemetry-agent: +# maven:io.sentry:sentry-opentelemetry-agentcustomization: +# maven:io.sentry:sentry-opentelemetry-core: maven:io.sentry:sentry-apollo: maven:io.sentry:sentry-jdbc: maven:io.sentry:sentry-graphql: From 29f82a5a38363ca962bee2bf4e9cb3c02cddb363 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 29 Nov 2022 16:27:07 +0100 Subject: [PATCH 4/6] Re-add OTEL modules to craft --- .craft.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.craft.yml b/.craft.yml index 6edb68d18a..ee94d4d7dd 100644 --- a/.craft.yml +++ b/.craft.yml @@ -40,9 +40,9 @@ targets: maven:io.sentry:sentry-android-fragment: maven:io.sentry:sentry-bom: maven:io.sentry:sentry-openfeign: -# maven:io.sentry:sentry-opentelemetry-agent: -# maven:io.sentry:sentry-opentelemetry-agentcustomization: -# maven:io.sentry:sentry-opentelemetry-core: + maven:io.sentry:sentry-opentelemetry-agent: + maven:io.sentry:sentry-opentelemetry-agentcustomization: + maven:io.sentry:sentry-opentelemetry-core: maven:io.sentry:sentry-apollo: maven:io.sentry:sentry-jdbc: maven:io.sentry:sentry-graphql: From 874a2fa2b6b64384bbc4afc26ffc27ac94dbd16d Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 30 Nov 2022 07:28:25 +0100 Subject: [PATCH 5/6] Revert "Re-add OTEL modules to craft" This reverts commit 29f82a5a38363ca962bee2bf4e9cb3c02cddb363. --- .craft.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.craft.yml b/.craft.yml index ee94d4d7dd..6edb68d18a 100644 --- a/.craft.yml +++ b/.craft.yml @@ -40,9 +40,9 @@ targets: maven:io.sentry:sentry-android-fragment: maven:io.sentry:sentry-bom: maven:io.sentry:sentry-openfeign: - maven:io.sentry:sentry-opentelemetry-agent: - maven:io.sentry:sentry-opentelemetry-agentcustomization: - maven:io.sentry:sentry-opentelemetry-core: +# maven:io.sentry:sentry-opentelemetry-agent: +# maven:io.sentry:sentry-opentelemetry-agentcustomization: +# maven:io.sentry:sentry-opentelemetry-core: maven:io.sentry:sentry-apollo: maven:io.sentry:sentry-jdbc: maven:io.sentry:sentry-graphql: From 30ac01faa596350af4f117d4558e3376623f0b68 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 30 Nov 2022 11:50:38 +0100 Subject: [PATCH 6/6] Revert "Revert "Re-add OTEL modules to craft"" This reverts commit 874a2fa2b6b64384bbc4afc26ffc27ac94dbd16d. --- .craft.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.craft.yml b/.craft.yml index 6edb68d18a..ee94d4d7dd 100644 --- a/.craft.yml +++ b/.craft.yml @@ -40,9 +40,9 @@ targets: maven:io.sentry:sentry-android-fragment: maven:io.sentry:sentry-bom: maven:io.sentry:sentry-openfeign: -# maven:io.sentry:sentry-opentelemetry-agent: -# maven:io.sentry:sentry-opentelemetry-agentcustomization: -# maven:io.sentry:sentry-opentelemetry-core: + maven:io.sentry:sentry-opentelemetry-agent: + maven:io.sentry:sentry-opentelemetry-agentcustomization: + maven:io.sentry:sentry-opentelemetry-core: maven:io.sentry:sentry-apollo: maven:io.sentry:sentry-jdbc: maven:io.sentry:sentry-graphql: