Set SDK version on Transactions. (#1314)

Fixes #1307
getsentry · Mar 10, 2021 · 6611960 · 6611960
1 parent 5226e0c
commit 6611960
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * Feat: Add an overload for `startTransaction` that sets the created transaction to the Scope #1313
 * Ref: Separate user facing and protocol classes in the Performance feature (#1304)
+* Feat: Set SDK version on Transactions (#1307)
 
 # 4.3.0
 

diff --git a/sentry/src/main/java/io/sentry/SentryClient.java b/sentry/src/main/java/io/sentry/SentryClient.java
@@ -407,6 +407,9 @@ public void captureSession(final @NotNull Session session, final @Nullable Objec
     if (transaction.getEnvironment() == null) {
       transaction.setEnvironment(options.getEnvironment());
     }
+    if (transaction.getSdk() == null) {
+      transaction.setSdk(options.getSdkVersion());
+    }
     if (transaction.getTags() == null) {
       transaction.setTags(new HashMap<>(options.getTags()));
     } else {

diff --git a/sentry/src/test/java/io/sentry/SentryClientTest.kt b/sentry/src/test/java/io/sentry/SentryClientTest.kt
@@ -845,6 +845,26 @@ class SentryClientTest {
         assertEquals("transactionEnvironment", transaction.environment)
     }
 
+    @Test
+    fun `when transaction does not have SDK version set, and the SDK version is set on options, options values are applied to transactions`() {
+        fixture.sentryOptions.sdkVersion = SdkVersion("sdk.name", "version")
+        val sut = fixture.getSut()
+        val transaction = SentryTransaction(SentryTracer(TransactionContext("name", "op"), mock()))
+        sut.captureTransaction(transaction)
+        assertEquals(fixture.sentryOptions.sdkVersion, transaction.sdk)
+    }
+
+    @Test
+    fun `when transaction has SDK version set, and the SDK version is set on options, options values are not applied to transactions`() {
+        fixture.sentryOptions.sdkVersion = SdkVersion("sdk.name", "version")
+        val sut = fixture.getSut()
+        val transaction = SentryTransaction(SentryTracer(TransactionContext("name", "op"), mock()))
+        val sdkVersion = SdkVersion("transaction.sdk.name", "version")
+        transaction.sdk = sdkVersion
+        sut.captureTransaction(transaction)
+        assertEquals(sdkVersion, transaction.sdk)
+    }
+
     @Test
     fun `when transaction does not have tags, and tags are set on options, options values are applied to transactions`() {
         fixture.sentryOptions.setTag("tag1", "value1")