Remove calls to the OTel events logger api that is removed in OTel 1.47.0 (#1070)

* Bump to OTel SDK 1.46

* Remove calls to the deprecated OTel Events Logger API

* Remove calls to the deprecated OTel Events Logger API

Author: cyrille-leclerc

src/main/java/io/jenkins/plugins/opentelemetry/JenkinsControllerOpenTelemetry.java

@@ -81,6 +81,12 @@ public Meter getDefaultMeter() {
         return defaultMeter;
     }
 
+    /**
+     * Will be removed in <a
+     * href="https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.47.0">opentelemetry-api:1.47.0</a>
+     * @deprecated use {@link OpenTelemetry#getLogsBridge()}
+     */
+    @Deprecated
     @NonNull
     public EventLogger getDefaultEventLogger() {
         return defaultEventLogger;

src/main/java/io/jenkins/plugins/opentelemetry/security/AuditingSecurityListener.java

@@ -12,14 +12,16 @@
 import io.jenkins.plugins.opentelemetry.api.OpenTelemetryLifecycleListener;
 import io.jenkins.plugins.opentelemetry.semconv.ExtendedJenkinsAttributes;
 import io.jenkins.plugins.opentelemetry.semconv.JenkinsMetrics;
+import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
-import io.opentelemetry.api.incubator.events.EventLogger;
 import io.opentelemetry.api.logs.Severity;
 import io.opentelemetry.api.metrics.LongCounter;
 import io.opentelemetry.api.metrics.Meter;
 import io.opentelemetry.semconv.ClientAttributes;
 import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes;
+import io.opentelemetry.semconv.incubating.EventIncubatingAttributes;
+import io.opentelemetry.semconv.incubating.UserIncubatingAttributes;
 import jenkins.YesNoMaybe;
 import jenkins.security.SecurityListener;
 import org.springframework.security.core.Authentication;
@@ -48,15 +50,16 @@ public class AuditingSecurityListener extends SecurityListener implements OpenTe
     private LongCounter loginFailureCounter;
     private LongCounter loginCounter;
 
-    private EventLogger eventLogger;
+    private io.opentelemetry.api.logs.Logger otelLogger;
 
     private JenkinsControllerOpenTelemetry jenkinsControllerOpenTelemetry;
 
     @PostConstruct
     public void postConstruct() {
         LOGGER.log(Level.FINE, () -> "Start monitoring Jenkins controller authentication events...");
 
-        this.eventLogger = jenkinsControllerOpenTelemetry.getDefaultEventLogger();
+        otelLogger = GlobalOpenTelemetry.get().getLogsBridge().get(ExtendedJenkinsAttributes.INSTRUMENTATION_NAME);
+
         Meter meter = jenkinsControllerOpenTelemetry.getDefaultMeter();
 
         loginSuccessCounter =
@@ -96,28 +99,29 @@ protected void loggedIn(@NonNull String username) {
         AttributesBuilder attributesBuilder = Attributes.builder();
         Optional<User> user = Optional.ofNullable(User.current());
         attributesBuilder
+            .put(EventIncubatingAttributes.EVENT_NAME, ExtendedJenkinsAttributes.EVENT_NAME_USER_LOGIN)
             .put(ExtendedJenkinsAttributes.EVENT_CATEGORY, ExtendedJenkinsAttributes.EventCategoryValues.AUTHENTICATION)
             .put(ExtendedJenkinsAttributes.EVENT_OUTCOME, ExtendedJenkinsAttributes.EventOutcomeValues.SUCCESS)
             .put(EnduserIncubatingAttributes.ENDUSER_ID, user.map(User::getId).orElse(username))
+            .put(UserIncubatingAttributes.USER_ID, user.map(User::getId).orElse(username))
         ;
 
         // Stapler.getCurrentRequest() returns null, it's not yet initialized
         SecurityContext securityContext = SecurityContextHolder.getContext();
         if (securityContext != null) {
             Authentication authentication = securityContext.getAuthentication();
             Object details = authentication.getDetails();
-            if (details instanceof WebAuthenticationDetails) {
-                WebAuthenticationDetails webAuthenticationDetails = (WebAuthenticationDetails) details;
+            if (details instanceof WebAuthenticationDetails webAuthenticationDetails) {
                 attributesBuilder
                     .put(ClientAttributes.CLIENT_ADDRESS, webAuthenticationDetails.getRemoteAddress());
                 message += " from " + webAuthenticationDetails.getRemoteAddress();
             }
         }
-        attributesBuilder.put("message", message);
 
-        eventLogger.builder("user_login")
-            .setAttributes(attributesBuilder.build())
+        otelLogger.logRecordBuilder()
+            .setAllAttributes(attributesBuilder.build())
             .setSeverity(Severity.INFO)
+            .setBody(message)
             .emit();
     }
 
@@ -130,18 +134,19 @@ protected void failedToLogIn(@NonNull String username) {
         String message = "Failed login of user '" + username + "'";
         AttributesBuilder attributesBuilder = Attributes.builder();
         attributesBuilder
+            .put(EventIncubatingAttributes.EVENT_NAME, ExtendedJenkinsAttributes.EVENT_NAME_USER_LOGIN)
             .put(ExtendedJenkinsAttributes.EVENT_CATEGORY, ExtendedJenkinsAttributes.EventCategoryValues.AUTHENTICATION)
             .put(ExtendedJenkinsAttributes.EVENT_OUTCOME, ExtendedJenkinsAttributes.EventOutcomeValues.FAILURE)
             .put(EnduserIncubatingAttributes.ENDUSER_ID, username)
+            .put(UserIncubatingAttributes.USER_ID, username)
         ;
 
         // TODO find a solution to retrieve the remoteIpAddress
 
-        attributesBuilder.put("message", message);
-
-        eventLogger.builder("user_login")
-            .setAttributes(attributesBuilder.build())
+        otelLogger.logRecordBuilder()
+            .setAllAttributes(attributesBuilder.build())
             .setSeverity(Severity.WARN)
+            .setBody(message)
             .emit();
     }
 

src/main/java/io/jenkins/plugins/opentelemetry/semconv/ExtendedJenkinsAttributes.java

@@ -145,6 +145,7 @@ public final class ExtendedJenkinsAttributes extends JenkinsAttributes {
      */
     public static final AttributeKey<String> EVENT_CATEGORY = AttributeKey.stringKey("event.category");
     public final static String INSTRUMENTATION_NAME = "io.jenkins.opentelemetry";
+    public static final String EVENT_NAME_USER_LOGIN = "user_login";
 
     /**
      * See https://www.elastic.co/guide/en/ecs/current/ecs-allowed-values-event-category.html