Add version to sentryClientName used in auth header

CHANGELOG.md

@@ -9,6 +9,7 @@
 ### Fixes
 
 - Deprecate reportFullDisplayed in favor of reportFullyDisplayed ([#2585](https://github.com/getsentry/sentry-java/pull/2585))
+- Add version to sentryClientName used in auth header ([#2596](https://github.com/getsentry/sentry-java/pull/2596))
 
 ## 6.15.0
 

sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java

@@ -121,7 +121,8 @@ public void start() {
               if (debug != null) {
                 options.setDebug(debug);
               }
-              options.setSentryClientName(BuildConfig.SENTRY_LOG4J2_SDK_NAME);
+              options.setSentryClientName(
+                  BuildConfig.SENTRY_LOG4J2_SDK_NAME + "/" + BuildConfig.VERSION_NAME);
               options.setSdkVersion(createSdkVersion(options));
               if (contextTags != null) {
                 for (final String contextTag : contextTags) {

sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java

@@ -50,7 +50,8 @@ public void start() {
     if (!Sentry.isEnabled()) {
       if (options.getDsn() == null || !options.getDsn().endsWith("_IS_UNDEFINED")) {
         options.setEnableExternalConfiguration(true);
-        options.setSentryClientName(BuildConfig.SENTRY_LOGBACK_SDK_NAME);
+        options.setSentryClientName(
+            BuildConfig.SENTRY_LOGBACK_SDK_NAME + "/" + BuildConfig.VERSION_NAME);
         options.setSdkVersion(createSdkVersion(options));
         Optional.ofNullable(transportFactory).ifPresent(options::setTransportFactory);
         try {

sentry-spring-boot-starter-jakarta/src/main/java/io/sentry/spring/boot/jakarta/SentryAutoConfiguration.java

@@ -115,7 +115,8 @@ static class HubConfiguration {
             }
           });
 
-      options.setSentryClientName(BuildConfig.SENTRY_SPRING_BOOT_JAKARTA_SDK_NAME);
+      options.setSentryClientName(
+          BuildConfig.SENTRY_SPRING_BOOT_JAKARTA_SDK_NAME + "/" + BuildConfig.VERSION_NAME);
       options.setSdkVersion(createSdkVersion(options));
       addPackageAndIntegrationInfo();
       if (options.getTracesSampleRate() == null && options.getEnableTracing() == null) {

sentry-spring-boot-starter-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryAutoConfigurationTest.kt

@@ -244,7 +244,7 @@ class SentryAutoConfigurationTest {
     fun `sets sentryClientName property on SentryOptions`() {
         contextRunner.withPropertyValues("sentry.dsn=http://key@localhost/proj")
             .run {
-                assertThat(it.getBean(SentryOptions::class.java).sentryClientName).isEqualTo("sentry.java.spring-boot${optionalJakartaPrefix()}")
+                assertThat(it.getBean(SentryOptions::class.java).sentryClientName).isEqualTo("sentry.java.spring-boot.jakarta/${BuildConfig.VERSION_NAME}")
             }
     }
 
@@ -924,11 +924,4 @@ class SentryAutoConfigurationTest {
         val userFilter = this.getBean("sentryUserFilter", FilterRegistrationBean::class.java).filter as SentryUserFilter
         return userFilter.sentryUserProviders
     }
-
-    private fun optionalJakartaPrefix(): String {
-        if (this.javaClass.packageName.endsWith("jakarta")) {
-            return ".jakarta"
-        }
-        return ""
-    }
 }

sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java

@@ -115,7 +115,8 @@ static class HubConfiguration {
             }
           });
 
-      options.setSentryClientName(BuildConfig.SENTRY_SPRING_BOOT_SDK_NAME);
+      options.setSentryClientName(
+          BuildConfig.SENTRY_SPRING_BOOT_SDK_NAME + "/" + BuildConfig.VERSION_NAME);
       options.setSdkVersion(createSdkVersion(options));
       addPackageAndIntegrationInfo();
       if (options.getTracesSampleRate() == null && options.getEnableTracing() == null) {

sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt

@@ -244,7 +244,7 @@ class SentryAutoConfigurationTest {
     fun `sets sentryClientName property on SentryOptions`() {
         contextRunner.withPropertyValues("sentry.dsn=http://key@localhost/proj")
             .run {
-                assertThat(it.getBean(SentryOptions::class.java).sentryClientName).isEqualTo("sentry.java.spring-boot${optionalJakartaPrefix()}")
+                assertThat(it.getBean(SentryOptions::class.java).sentryClientName).isEqualTo("sentry.java.spring-boot/${BuildConfig.VERSION_NAME}")
             }
     }
 
@@ -924,11 +924,4 @@ class SentryAutoConfigurationTest {
         val userFilter = this.getBean("sentryUserFilter", FilterRegistrationBean::class.java).filter as SentryUserFilter
         return userFilter.sentryUserProviders
     }
-
-    private fun optionalJakartaPrefix(): String {
-        if (this.javaClass.packageName.endsWith("jakarta")) {
-            return ".jakarta"
-        }
-        return ""
-    }
 }