Merge branch 'main' into feat/profiling-frame-metrics

Author: stefanosiano

.github/workflows/integration-tests-benchmarks.yml

@@ -91,4 +91,4 @@ jobs:
           config: sentry-android-integration-tests/metrics-test.yml
           sauce-user: ${{ secrets.SAUCE_USERNAME }}
           sauce-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-        if: env.SAUCE_USERNAME != null      
+        if: env.SAUCE_USERNAME != null

CHANGELOG.md

@@ -10,6 +10,9 @@
 ### Features
 
 - Add FrameMetrics to Android profiling data ([#2342](https://github.com/getsentry/sentry-java/pull/2342))
+- Don't set device name on Android if `sendDefaultPii` is disabled ([#2354](https://github.com/getsentry/sentry-java/pull/2354))
+- Fix corrupted UUID on Motorola devices ([#2363](https://github.com/getsentry/sentry-java/pull/2363))
+- Update Spring Boot Jakarta to Spring Boot 3.0.0-RC2 ([#2347](https://github.com/getsentry/sentry-java/pull/2347))
 
 ## 6.7.0
 

CONTRIBUTING.md

@@ -5,7 +5,7 @@ We suggest opening an issue to discuss bigger changes before investing on a big
 
 # Requirements
 
-The project currently requires you run JDK 11.
+The project currently requires you run JDK 17.
 
 ## Android
 

buildSrc/src/main/java/Config.kt

@@ -5,7 +5,7 @@ object Config {
     val kotlinStdLib = "stdlib-jdk8"
 
     val springBootVersion = "2.7.4"
-    val springBoot3Version = "3.0.0-M5"
+    val springBoot3Version = "3.0.0-RC2"
     val kotlinCompatibleLanguageVersion = "1.4"
 
     val composeVersion = "1.1.1"

sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java

@@ -94,6 +94,7 @@ public DefaultAndroidEventProcessor(
 
     ExecutorService executorService = Executors.newSingleThreadExecutor();
     // dont ref. to method reference, theres a bug on it
+    //noinspection Convert2MethodRef
     contextData = executorService.submit(() -> loadContextData());
 
     executorService.shutdown();
@@ -282,7 +283,9 @@ private void setArchitectures(final @NotNull Device device) {
     // TODO: missing usable memory
 
     Device device = new Device();
-    device.setName(getDeviceName());
+    if (options.isSendDefaultPii()) {
+      device.setName(getDeviceName());
+    }
     device.setManufacturer(Build.MANUFACTURER);
     device.setBrand(Build.BRAND);
     device.setFamily(getFamily());

sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts

@@ -59,10 +59,6 @@ tasks.withType<KotlinCompile> {
     }
 }
 
-tasks.withType<JavaCompile> {
-    options.compilerArgs.add("-Xlint:-deprecation")
-}
-
 task("jakartaTransformation", JavaExec::class) {
     main = "org.eclipse.transformer.cli.JakartaTransformerCLI"
     classpath = configurations.getByName("jakartaTransform") // sourceSets["main"].compileClasspath

sentry-samples/sentry-samples-spring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/PersonService.java

@@ -1,5 +1,7 @@
 package io.sentry.samples.spring.boot.jakarta;
 
+import io.sentry.ISpan;
+import io.sentry.Sentry;
 import io.sentry.spring.jakarta.tracing.SentrySpan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,12 +18,19 @@ public class PersonService {
   private static final Logger LOGGER = LoggerFactory.getLogger(PersonService.class);
 
   private final JdbcTemplate jdbcTemplate;
+  private int createCount = 0;
 
   public PersonService(JdbcTemplate jdbcTemplate) {
     this.jdbcTemplate = jdbcTemplate;
   }
 
   Person create(Person person) {
+    createCount++;
+    final ISpan span = Sentry.getSpan();
+    if (span != null) {
+      span.setMeasurement("create_count", createCount);
+    }
+
     jdbcTemplate.update(
         "insert into person (firstName, lastName) values (?, ?)",
         person.getFirstName(),

sentry-samples/sentry-samples-spring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/SecurityConfiguration.java

@@ -4,27 +4,27 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;
 
 @Configuration
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {
 
   // this API is meant to be consumed by non-browser clients thus the CSRF protection is not needed.
-  @Override
   @SuppressWarnings("lgtm[java/spring-disabled-csrf-protection]")
-  protected void configure(final @NotNull HttpSecurity http) throws Exception {
-    http.csrf().disable().authorizeRequests().anyRequest().authenticated().and().httpBasic();
+  @Bean
+  public SecurityFilterChain filterChain(final @NotNull HttpSecurity http) throws Exception {
+    http.csrf().disable().authorizeHttpRequests().anyRequest().authenticated().and().httpBasic();
+
+    return http.build();
   }
 
   @Bean
-  @Override
-  public @NotNull UserDetailsService userDetailsService() {
+  public @NotNull InMemoryUserDetailsManager userDetailsService() {
     final PasswordEncoder encoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
 
     final UserDetails user =

sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts

@@ -70,7 +70,3 @@ task("jakartaTransformation", JavaExec::class) {
     classpath = configurations.getByName("jakartaTransform") // sourceSets["main"].compileClasspath
     args = listOf("../sentry-samples-spring/src/main/java/io/sentry/samples/spring", "src/main/java/io/sentry/samples/spring/jakarta", "-o", "-tf", "sentry-jakarta-text-master.properties")
 }
-
-tasks.withType<JavaCompile> {
-    options.compilerArgs.add("-Xlint:-deprecation")
-}

sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/SecurityConfiguration.java

@@ -4,29 +4,27 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;
 
 @Configuration
-@EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {
 
   // this API is meant to be consumed by non-browser clients thus the CSRF protection is not needed.
-  @Override
   @SuppressWarnings("lgtm[java/spring-disabled-csrf-protection]")
-  protected void configure(final @NotNull HttpSecurity http) throws Exception {
-    http.csrf().disable().authorizeRequests().anyRequest().authenticated().and().httpBasic();
+  @Bean
+  public SecurityFilterChain filterChain(final @NotNull HttpSecurity http) throws Exception {
+    http.csrf().disable().authorizeHttpRequests().anyRequest().authenticated().and().httpBasic();
+
+    return http.build();
   }
 
   @Bean
-  @Override
-  public @NotNull UserDetailsService userDetailsService() {
+  public @NotNull InMemoryUserDetailsManager userDetailsService() {
     final PasswordEncoder encoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
 
     final UserDetails user =