revert

Author: trask

instrumentation/spring/spring-security-config-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturer.java

@@ -82,7 +82,7 @@ public void captureEnduserAttributes(
       StringBuilder scopeBuilder = null;
       if (enduserRoleEnabled || enduserScopeEnabled) {
         for (GrantedAuthority authority : authentication.getAuthorities()) {
-          @Nullable String authorityString = authority.getAuthority();
+          String authorityString = authority.getAuthority();
           if (authorityString == null) {
             continue;
           }

instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturerTest.java

@@ -21,7 +21,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
 
@@ -202,32 +201,6 @@ void allEnabledAndAlternatePrefix() {
                 .hasAttribute(ENDUSER_SCOPE, "scope1,scope2"));
   }
 
-  @Test
-  void allEnabledAndNullAuthority() {
-    EnduserAttributesCapturer capturer = new EnduserAttributesCapturer();
-    capturer.setEnduserIdEnabled(true);
-    capturer.setEnduserRoleEnabled(true);
-    capturer.setEnduserScopeEnabled(true);
-
-    GrantedAuthority nullAuthority = () -> null;
-    Authentication authentication =
-        new PreAuthenticatedAuthenticationToken(
-            "principal",
-            null,
-            asList(
-                new SimpleGrantedAuthority("ROLE_role1"),
-                nullAuthority,
-                new SimpleGrantedAuthority("SCOPE_scope1")));
-
-    test(
-        capturer,
-        authentication,
-        span ->
-            span.hasAttribute(ENDUSER_ID, "principal")
-                .hasAttribute(ENDUSER_ROLE, "role1")
-                .hasAttribute(ENDUSER_SCOPE, "scope1"));
-  }
-
   private static void test(
       EnduserAttributesCapturer capturer,
       Authentication authentication,