Merge pull request #146 from OneLiteFeatherNET/feat/otlp-oidc-patches

feat: jwks refresh and otlp adjustments

Author: Randoooom

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "feedback-fusion"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 license = "MIT"
 

Cargo.toml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.3.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.3.0"
+appVersion: "0.4.0"

charts/feedback-fusion/Chart.yaml

@@ -345,7 +345,6 @@ macro_rules! update_otherwise_create {
     };
 }
 
-#[instrument(skip_all)]
 pub async fn sync_target(target: TargetConfig, transaction: &dyn Executor) -> Result<()> {
     let id = target.id.clone();
     update_otherwise_create!(transaction, Target, target, name, description);
@@ -359,7 +358,6 @@ pub async fn sync_target(target: TargetConfig, transaction: &dyn Executor) -> Re
     Ok(())
 }
 
-#[instrument(skip_all)]
 pub async fn sync_prompt(
     prompt: PromptConfig,
     transaction: &dyn Executor,
@@ -377,7 +375,6 @@ pub async fn sync_prompt(
     Ok(())
 }
 
-#[instrument(skip_all)]
 pub async fn sync_field(
     field: FieldConfig,
     transaction: &dyn Executor,

src/config.rs

@@ -21,6 +21,8 @@
  */
 #![allow(clippy::too_many_arguments)]
 
+use std::time::Duration;
+
 use crate::{
     prelude::*,
     services::v1::{FeedbackFusionV1Context, PublicFeedbackFusionV1Context},
@@ -96,6 +98,7 @@ async fn main() {
         // build the authority
         info!("Tryng to contact the OIDC Provider");
         let authority = oidc::authority().await.unwrap();
+        authority.spawn_refresh(Duration::from_secs(60 * 60 * 6));
         let authorizer = Oauth2Authorizer::new()
             .with_claims::<OIDCClaims>()
             .with_verbose_error_handler();

src/main.rs

@@ -64,6 +64,8 @@ pub fn init_tracing() {
             tracer_provider.tracer("feedback-fusion"),
         ));
         tracing::subscriber::set_global_default(subscriber).ok();
+
+        info!("Initiating tracing with collector {}", endpoint);
     }
 }
 
@@ -72,13 +74,32 @@ pub struct MakeFeedbackFusionSpan;
 
 impl<B> MakeSpan<B> for MakeFeedbackFusionSpan {
     fn make_span(&mut self, request: &Request<B>) -> Span {
-        // make the span
-        let span = tracing::info_span!(
+        let span = if request.uri().path().contains("grpc.health.v1.Health/Check") {
+            tracing::debug_span!("HealthCheck")
+        } else {
+            let headers = request
+                .headers()
+                .iter()
+                .filter(|(key, value)| {
+                    !key.to_string()
+                        .to_lowercase()
+                        .eq(&"authorization".to_owned())
+                        && !value
+                            .to_str()
+                            .unwrap_or_default()
+                            .to_lowercase()
+                            .contains("bearer")
+                })
+                .collect_vec();
+
+            tracing::info_span!(
             "gRPC Request",
             host = %request.uri().host().unwrap_or_default(),
             path = %request.uri().path(),
+            headers = ?headers,
             version = ?request.version()
-        );
+            )
+        };
 
         // try to extract the context
         let context = global::get_text_map_propagator(|propagator| {

src/otlp.rs

@@ -0,0 +1,42 @@
+database:
+  postgres:
+    username: postgres
+    password: password
+    database: postgres
+    endpoint: localhost:5432
+oidc:
+  provider: http://localhost:5151
+  issuer: http://localhost:5151
+  scopes:
+    - name: "api:feedback-fusion"
+      grants:
+        - endpoint: "*"
+          permissions:
+            - "*"
+  groups:
+    - name: "admin"
+      grants:
+        - endpoint: "*"
+          permissions:
+            - "*"
+preset:
+  targets:
+  - id: target 
+    name: TestTarget 
+    description: A nice Target 
+    prompts:
+      - id: prompt 
+        title: Testprompt 
+        description: A nice Prompt 
+        active: true
+        fields:
+          - id: field1 
+            title: TextField
+            field_type: text 
+            options:
+              type: text
+              lines: 1 
+              placeholder: test
+
+otlp:
+  endpoint: http://tempo:4317