release: 26.05.06

pom.xml

@@ -7,12 +7,12 @@
     <parent>
         <groupId>org.fireflyframework</groupId>
         <artifactId>fireflyframework-parent</artifactId>
-        <version>26.04.01</version>
+        <version>26.05.06</version>
         <relativePath/>
     </parent>
 
     <artifactId>fireflyframework-idp</artifactId>
-    <version>26.04.01</version>
+    <version>26.05.06</version>
     <packaging>jar</packaging>
 
     <name>Firefly Framework - Identity Provider</name>
@@ -27,6 +27,13 @@
             <version>${project.version}</version>
         </dependency>
 
+        <!-- Observability: unified metrics, tracing, health, structured logging (OTel-backed) -->
+        <dependency>
+            <groupId>org.fireflyframework</groupId>
+            <artifactId>fireflyframework-observability</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <!-- Spring Web for ResponseEntity -->
         <dependency>
             <groupId>org.springframework</groupId>

src/main/java/org/fireflyframework/idp/observability/IdpMetrics.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2024-2026 Firefly Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.fireflyframework.idp.observability;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import org.fireflyframework.observability.metrics.FireflyMetricsSupport;
+import reactor.core.publisher.Mono;
+
+/**
+ * Observability instrumentation shared by all Firefly IDP adapter implementations.
+ * <p>
+ * Records:
+ * <ul>
+ *     <li>{@code firefly.idp.authentications} — total auth attempts, tagged by {@code provider}, {@code status=success|failure}</li>
+ *     <li>{@code firefly.idp.authentication.duration} — auth latency timer, tagged by {@code provider}</li>
+ *     <li>{@code firefly.idp.token.issued} — total tokens issued, tagged by {@code provider}, {@code token.type}</li>
+ *     <li>{@code firefly.idp.token.refreshed} — token refresh count, tagged by {@code provider}</li>
+ *     <li>{@code firefly.idp.errors} — failed IDP operations, tagged by {@code operation}, {@code error.type}</li>
+ * </ul>
+ */
+public class IdpMetrics extends FireflyMetricsSupport {
+
+    private static final String TAG_PROVIDER = "provider";
+    private static final String TAG_OPERATION = "operation";
+    private static final String TAG_TOKEN_TYPE = "token.type";
+
+    public IdpMetrics(MeterRegistry meterRegistry) {
+        super(meterRegistry, "idp");
+    }
+
+    /**
+     * Wraps an authentication call (login, validate-token, etc.) with a timer and success/failure counters.
+     */
+    public <T> Mono<T> timedAuthentication(String provider, Mono<T> operation) {
+        return timed("authentication.duration", operation, TAG_PROVIDER, provider)
+                .doOnSuccess(v -> recordSuccess("authentications", TAG_PROVIDER, provider))
+                .doOnError(e -> {
+                    recordFailure("authentications", e, TAG_PROVIDER, provider);
+                    recordFailure("errors", e, TAG_OPERATION, "authenticate", TAG_PROVIDER, provider);
+                });
+    }
+
+    public void recordTokenIssued(String provider, String tokenType) {
+        counter("token.issued", TAG_PROVIDER, provider, TAG_TOKEN_TYPE, tokenType).increment();
+    }
+
+    public void recordTokenRefreshed(String provider) {
+        counter("token.refreshed", TAG_PROVIDER, provider).increment();
+    }
+
+    public void recordError(String provider, String operation, Throwable error) {
+        recordFailure("errors", error, TAG_PROVIDER, provider, TAG_OPERATION, operation);
+    }
+}

src/main/java/org/fireflyframework/idp/observability/IdpObservabilityAutoConfiguration.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024-2026 Firefly Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.fireflyframework.idp.observability;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * Auto-configures the {@link IdpMetrics} bean used by all IDP adapter implementations
+ * (AWS Cognito, Azure AD, Keycloak, internal DB).
+ */
+@AutoConfiguration
+@ConditionalOnClass(MeterRegistry.class)
+@ConditionalOnProperty(prefix = "firefly.observability.metrics", name = "enabled",
+        havingValue = "true", matchIfMissing = true)
+public class IdpObservabilityAutoConfiguration {
+
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnBean(MeterRegistry.class)
+    IdpMetrics idpMetrics(MeterRegistry meterRegistry) {
+        return new IdpMetrics(meterRegistry);
+    }
+}

src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1,2 @@
 org.fireflyframework.idp.config.IdpWebAutoConfiguration
+org.fireflyframework.idp.observability.IdpObservabilityAutoConfiguration