From e0163555734aca6d2ec75e18c1223fac3a030128 Mon Sep 17 00:00:00 2001 From: Daniel Petranek Date: Mon, 8 Dec 2025 14:28:04 -0600 Subject: [PATCH 1/7] update db dep and comment out logback config --- deps.edn | 2 +- resources/logback.xml | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/deps.edn b/deps.edn index 3f870335..1c6a0fb9 100644 --- a/deps.edn +++ b/deps.edn @@ -1,7 +1,7 @@ {:deps {org.clojure/clojure {:mvn/version "1.11.3"} org.clojure/core.async {:mvn/version "1.6.681"} com.fluree/db {:git/url "https://github.com/fluree/db.git" - :git/sha "f5f76fb2373b712aeee96574e1bbc2cd0277fce1"} + :git/sha "2a168e8050c96245558145cee284313abf4343fb"} com.fluree/json-ld {:git/url "https://github.com/fluree/json-ld.git" :git/sha "74083536c84d77f8cdd4b686b5661714010baad3"} diff --git a/resources/logback.xml b/resources/logback.xml index ca364c7f..cc7c89c6 100644 --- a/resources/logback.xml +++ b/resources/logback.xml @@ -1,19 +1,19 @@ - - - - %d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n - - - + + + + + + + - - - + + + - - - + + + From 806c444d8f091ff6eb46fa6f9d73ca88fdce7172 Mon Sep 17 00:00:00 2001 From: Daniel Petranek Date: Wed, 10 Dec 2025 14:20:41 -0600 Subject: [PATCH 2/7] update db dep --- deps.edn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index 1c6a0fb9..4f1966ce 100644 --- a/deps.edn +++ b/deps.edn @@ -1,7 +1,7 @@ {:deps {org.clojure/clojure {:mvn/version "1.11.3"} org.clojure/core.async {:mvn/version "1.6.681"} com.fluree/db {:git/url "https://github.com/fluree/db.git" - :git/sha "2a168e8050c96245558145cee284313abf4343fb"} + :git/sha "4d73d14475a925e52b35f2cc8ba3febdf1445b07"} com.fluree/json-ld {:git/url "https://github.com/fluree/json-ld.git" :git/sha "74083536c84d77f8cdd4b686b5661714010baad3"} From 53e3659514ac8c946774f92796e36c1e58f16133 Mon Sep 17 00:00:00 2001 From: Daniel Petranek Date: Wed, 10 Dec 2025 16:04:00 -0600 Subject: [PATCH 3/7] update deps to have tools.logging use telemere --- deps.edn | 2 +- dev/logback.xml | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/deps.edn b/deps.edn index 4f1966ce..949d8354 100644 --- a/deps.edn +++ b/deps.edn @@ -1,7 +1,7 @@ {:deps {org.clojure/clojure {:mvn/version "1.11.3"} org.clojure/core.async {:mvn/version "1.6.681"} com.fluree/db {:git/url "https://github.com/fluree/db.git" - :git/sha "4d73d14475a925e52b35f2cc8ba3febdf1445b07"} + :git/sha "d52f3960e7da7012ac1af153cc11a1cc1502998d"} com.fluree/json-ld {:git/url "https://github.com/fluree/json-ld.git" :git/sha "74083536c84d77f8cdd4b686b5661714010baad3"} diff --git a/dev/logback.xml b/dev/logback.xml index f10e8e2d..1a43a530 100644 --- a/dev/logback.xml +++ b/dev/logback.xml @@ -1,21 +1,21 @@ - - - %highlight(%-5level) %cyan(%logger{24}) - %msg%n - - + + + + + - - - + + + - - - - - - + + + + + + From ee4e52c7226e1a4bb8b38fa3944dc450278ab2ba Mon Sep 17 00:00:00 2001 From: Daniel Petranek Date: Thu, 11 Dec 2025 14:46:57 -0600 Subject: [PATCH 4/7] configure logging at startup --- deps.edn | 9 ++++++--- src/fluree/server/system.clj | 19 ++++++++++++++++++- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/deps.edn b/deps.edn index 949d8354..b3860442 100644 --- a/deps.edn +++ b/deps.edn @@ -1,7 +1,7 @@ {:deps {org.clojure/clojure {:mvn/version "1.11.3"} org.clojure/core.async {:mvn/version "1.6.681"} com.fluree/db {:git/url "https://github.com/fluree/db.git" - :git/sha "d52f3960e7da7012ac1af153cc11a1cc1502998d"} + :git/sha "966892f4911aa24bf28cea314d74519dfd5b8230"} com.fluree/json-ld {:git/url "https://github.com/fluree/json-ld.git" :git/sha "74083536c84d77f8cdd4b686b5661714010baad3"} @@ -23,8 +23,11 @@ camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.3"} ;; logging - ch.qos.logback/logback-classic {:mvn/version "1.5.6"} - org.slf4j/slf4j-api {:mvn/version "2.0.13"} + ch.qos.logback/logback-classic {:mvn/version "1.5.6"} + org.slf4j/slf4j-api {:mvn/version "2.0.13"} + com.taoensso/trove {:mvn/version "1.1.0"} + com.taoensso/telemere {:mvn/version "1.2.0"} + io.opentelemetry/opentelemetry-api {:mvn/version "1.56.0"} ;; http ;; ring-jetty9-adapter 0.30.x+ uses Jetty 12 & requires JDK 17+ diff --git a/src/fluree/server/system.clj b/src/fluree/server/system.clj index 0e846ecb..d17dda84 100644 --- a/src/fluree/server/system.clj +++ b/src/fluree/server/system.clj @@ -20,7 +20,12 @@ [fluree.server.reindex :as reindex] [fluree.server.watcher :as watcher] [integrant.core :as ig] - [ring.adapter.jetty9 :as jetty])) + [ring.adapter.jetty9 :as jetty] + [taoensso.telemere :as tel] + [taoensso.telemere.open-telemetry :as tel-otel] + [taoensso.telemere.tools-logging :as tel-tl] + [taoensso.trove :as trove] + [taoensso.trove.telemere :as trove-tel])) (set! *warn-on-reflection* true) @@ -153,6 +158,17 @@ (def default-resource-name "file-config.jsonld") +(defn initialize-logging + [] + ;; set logging impl + (trove/set-log-fn! (trove-tel/get-log-fn)) + (tel-tl/tools-logging->telemere!) + ;; add structured logs + (tel/add-handler! :json (tel/handler:console {:output-fn (tel/pr-signal-fn {:pr-fn json/stringify})})) + ;; add otel tracing, if present + (when tel/otel-tracing? + (tel/add-handler! :otel (tel-otel/handler:open-telemetry)))) + (defn log-config-summary [parsed-config] (let [connection-config (some #(when (of-type? % conn-vocab/connection-type) %) @@ -201,6 +217,7 @@ (defn start-config [config & {:keys [profile reindex]}] + (initialize-logging) (let [json-config (if (string? config) (json/parse config false) config) From e4cb3925776ef385616e3fa68c902844571c9da3 Mon Sep 17 00:00:00 2001 From: Daniel Petranek Date: Wed, 17 Dec 2025 15:05:38 -0600 Subject: [PATCH 5/7] WIP correlated spans within a trace using clj-otel --- deps.edn | 7 ++++- dev/logback.xml | 28 ++++++++--------- src/fluree/server/broadcast/subscriptions.clj | 3 +- src/fluree/server/consensus/events.clj | 21 ++++++++----- src/fluree/server/consensus/standalone.clj | 31 +++++++++++-------- src/fluree/server/handler.clj | 6 ++-- src/fluree/server/handlers/create.clj | 6 ++-- src/fluree/server/handlers/drop.clj | 6 ++-- src/fluree/server/handlers/ledger.clj | 9 ++++-- src/fluree/server/handlers/transact.clj | 12 ++++--- src/fluree/server/system.clj | 11 +++---- 11 files changed, 85 insertions(+), 55 deletions(-) diff --git a/deps.edn b/deps.edn index b3860442..f9665a1a 100644 --- a/deps.edn +++ b/deps.edn @@ -28,6 +28,7 @@ com.taoensso/trove {:mvn/version "1.1.0"} com.taoensso/telemere {:mvn/version "1.2.0"} io.opentelemetry/opentelemetry-api {:mvn/version "1.56.0"} + com.github.steffan-westcott/clj-otel-api {:mvn/version "0.2.10"} ;; http ;; ring-jetty9-adapter 0.30.x+ uses Jetty 12 & requires JDK 17+ @@ -54,7 +55,11 @@ clj-http/clj-http {:mvn/version "3.13.0"} criterium/criterium {:mvn/version "0.4.6"} integrant/repl {:mvn/version "0.3.3"}} - :jvm-opts ["-Djdk.attach.allowAttachSelf"]} + :jvm-opts ["-Djdk.attach.allowAttachSelf" + "-javaagent:/home/dan/scratch/learn-otel/opentelemetry-javaagent.jar" + "-Dotel.exporter.otlp.endpoint=http://localhost:4318" + "-Dotel.exporter.otlp.protocol=http/protobuf" + "-Dotel.service.name=fluree-server"]} :run-dev {:main-opts ["-m" "fluree.server" "--profile" "dev"]} diff --git a/dev/logback.xml b/dev/logback.xml index 1a43a530..f10e8e2d 100644 --- a/dev/logback.xml +++ b/dev/logback.xml @@ -1,21 +1,21 @@ - - - - - + + + %highlight(%-5level) %cyan(%logger{24}) - %msg%n + + - - - + + + - - - - - - + + + + + + diff --git a/src/fluree/server/broadcast/subscriptions.clj b/src/fluree/server/broadcast/subscriptions.clj index 7408d7b2..a7ef4601 100644 --- a/src/fluree/server/broadcast/subscriptions.clj +++ b/src/fluree/server/broadcast/subscriptions.clj @@ -4,7 +4,8 @@ [fluree.db.util.log :as log] [fluree.server.broadcast :refer [Broadcaster]] [fluree.server.consensus.events :as events] - [ring.adapter.jetty9.websocket :as ws]) + [ring.adapter.jetty9.websocket :as ws] + [steffan-westcott.clj-otel.context :as otel-context]) (:import (java.io Closeable IOException) (java.nio.channels ClosedChannelException))) diff --git a/src/fluree/server/consensus/events.clj b/src/fluree/server/consensus/events.clj index 8532b820..19dfa547 100644 --- a/src/fluree/server/consensus/events.clj +++ b/src/fluree/server/consensus/events.clj @@ -6,7 +6,8 @@ [fluree.db.ledger :as ledger] [fluree.db.track :as-alias track] [fluree.db.util.async :refer [ evt + (with-txn txn) + (with-otel-ctx)))) (defn drop-ledger "Create a new event message to drop an existing ledger." [ledger-id] - {:type :ledger-drop - :ledger-id ledger-id - :instant (System/currentTimeMillis)}) + (with-otel-ctx {:type :ledger-drop + :ledger-id ledger-id + :instant (System/currentTimeMillis)})) (defn commit-transaction "Create a new event message to commit a new transaction. The `txn` argument may @@ -85,8 +92,8 @@ :opts opts :instant (System/currentTimeMillis)}] (if (= :turtle (:format opts)) - (with-turtle-txn evt txn) - (with-txn evt txn)))) + (with-otel-ctx (with-turtle-txn evt txn)) + (with-otel-ctx (with-txn evt txn))))) (defn get-txn "Gets the transaction value, either a transaction document or the storage diff --git a/src/fluree/server/consensus/standalone.clj b/src/fluree/server/consensus/standalone.clj index 1abbb2e8..356675ba 100644 --- a/src/fluree/server/consensus/standalone.clj +++ b/src/fluree/server/consensus/standalone.clj @@ -7,32 +7,37 @@ [fluree.server.consensus.events :as events] [fluree.server.consensus.response :as response] [fluree.server.consensus.shared.create :as shared-create] - [fluree.server.handlers.shared :refer [deref!]])) + [fluree.server.handlers.shared :refer [deref!]] + [steffan-westcott.clj-otel.api.trace.span :as span])) (set! *warn-on-reflection* true) (defn create-ledger! - [conn watcher broadcaster {:keys [ledger-id tx-id txn opts] :as _params}] + [conn watcher broadcaster {:keys [ledger-id tx-id txn opts otel/context] :as _params}] (go-try - (let [commit-result (if txn - (deref! (fluree/create-with-txn conn txn opts)) - (let [db (deref! (fluree/create conn ledger-id opts))] - (shared-create/genesis-result db)))] + (let [commit-result + (span/with-span! {:parent context :name ::process-event} + (if txn + (deref! (fluree/create-with-txn conn txn opts)) + (let [db (deref! (fluree/create conn ledger-id opts))] + (shared-create/genesis-result db))))] (response/announce-new-ledger watcher broadcaster ledger-id tx-id commit-result)))) (defn drop-ledger! - [conn watcher broadcaster {:keys [ledger-id] :as _params}] + [conn watcher broadcaster {:keys [ledger-id otel/context] :as _params}] (go-try - (let [drop-result (deref! (fluree/drop conn ledger-id))] + (let [drop-result (span/with-span! {:name ::process-event :parent context} + (deref! (fluree/drop conn ledger-id)))] (response/announce-dropped-ledger watcher broadcaster ledger-id drop-result)))) (defn transact! - [conn watcher broadcaster {:keys [ledger-id tx-id txn opts]}] + [conn watcher broadcaster {:keys [ledger-id tx-id txn opts otel/context]}] (go-try - (let [commit-result (case (:op opts) - :update (deref! (fluree/update! conn ledger-id txn opts)) - :upsert (deref! (fluree/upsert! conn ledger-id txn opts)) - :insert (deref! (fluree/insert! conn ledger-id txn opts)))] + (let [commit-result (span/with-span! {:name ::process-event :parent context} + (case (:op opts) + :update (deref! (fluree/update! conn ledger-id txn opts)) + :upsert (deref! (fluree/upsert! conn ledger-id txn opts)) + :insert (deref! (fluree/insert! conn ledger-id txn opts))))] (response/announce-commit watcher broadcaster ledger-id tx-id commit-result)))) (defn process-event diff --git a/src/fluree/server/handler.clj b/src/fluree/server/handler.clj index b8902b04..06e30ab0 100644 --- a/src/fluree/server/handler.clj +++ b/src/fluree/server/handler.clj @@ -25,7 +25,8 @@ [reitit.swagger :as swagger] [reitit.swagger-ui :as swagger-ui] [ring.adapter.jetty9 :as http] - [ring.middleware.cors :as rmc]) + [ring.middleware.cors :as rmc] + [steffan-westcott.clj-otel.api.trace.http :as trace-http]) (:import (java.io InputStream))) (set! *warn-on-reflection* true) @@ -656,4 +657,5 @@ app-routes (cond-> ["" {:middleware app-middleware} default-fluree-routes] (seq custom-routes) (conj custom-routes)) router (app-router app-routes)] - (ring/ring-handler router fallback-handler)))) + (trace-http/wrap-server-span + (ring/ring-handler router fallback-handler))))) diff --git a/src/fluree/server/handlers/create.clj b/src/fluree/server/handlers/create.clj index ea91f398..2743e969 100644 --- a/src/fluree/server/handlers/create.clj +++ b/src/fluree/server/handlers/create.clj @@ -3,7 +3,8 @@ [fluree.server.consensus :as consensus] [fluree.server.handlers.shared :as shared :refer [deref! defhandler]] [fluree.server.handlers.transact :as srv-tx] - [fluree.server.watcher :as watcher])) + [fluree.server.watcher :as watcher] + [steffan-westcott.clj-otel.api.trace.span :as span])) (set! *warn-on-reflection* true) @@ -50,7 +51,8 @@ (throw (ex-info "Ledger ID must be provided" {:status 400 :error :db/invalid-ledger-id}))) opts* (prepare-create-options opts) - commit-event (deref! (create-ledger! consensus watcher ledger-id txn opts*)) + commit-event (span/with-span! {:name ::create-handler} + (deref! (create-ledger! consensus watcher ledger-id txn opts*))) response-body (srv-tx/commit-event->response-body commit-event)] (shared/with-tracking-headers {:status 201, :body response-body} commit-event))) diff --git a/src/fluree/server/handlers/drop.clj b/src/fluree/server/handlers/drop.clj index e0642ee4..b3747181 100644 --- a/src/fluree/server/handlers/drop.clj +++ b/src/fluree/server/handlers/drop.clj @@ -2,7 +2,8 @@ (:require [fluree.db.util.log :as log] [fluree.server.consensus :as consensus] [fluree.server.handlers.shared :as shared :refer [deref! defhandler]] - [fluree.server.watcher :as watcher])) + [fluree.server.watcher :as watcher] + [steffan-westcott.clj-otel.api.trace.span :as span])) (set! *warn-on-reflection* true) @@ -24,5 +25,6 @@ {:keys [body]} :parameters}] (log/debug "drop body:" body) (let [ledger-id (:ledger body) - resp-p (drop-ledger consensus watcher ledger-id)] + resp-p (span/with-span! {:name ::drop-handler} + (drop-ledger consensus watcher ledger-id))] {:status 200, :body (deref! resp-p)})) diff --git a/src/fluree/server/handlers/ledger.clj b/src/fluree/server/handlers/ledger.clj index 5566a0a5..f862d196 100644 --- a/src/fluree/server/handlers/ledger.clj +++ b/src/fluree/server/handlers/ledger.clj @@ -2,7 +2,8 @@ (:require [fluree.db.api :as fluree] [fluree.db.util.log :as log] [fluree.server.handler :as-alias handler] - [fluree.server.handlers.shared :refer [defhandler deref!] :as shared])) + [fluree.server.handlers.shared :refer [defhandler deref!] :as shared] + [steffan-westcott.clj-otel.api.trace.span :as span])) (defhandler query [{:keys [fluree/conn fluree/opts] {:keys [body path]} :parameters :as _req}] @@ -10,7 +11,8 @@ ;; supply ledger-alias from path params if not overridden by a header opts* (update opts :ledger #(or % (:ledger-alias path))) {:keys [status result] :as query-response} - (deref! (fluree/query-connection conn query opts*))] + (span/with-span! {:name ::query-handler} + (deref! (fluree/query-connection conn query opts*)))] (log/debug "query handler received query:" query opts*) (shared/with-tracking-headers {:status status, :body result} query-response))) @@ -18,7 +20,8 @@ (defhandler history [{:keys [fluree/conn fluree/opts] {{ledger :from :as query} :body} :parameters :as _req}] (let [query* (dissoc query :from) - result (deref! (fluree/history conn ledger query* opts))] + result (span/with-span! {:name ::history-handler} + (deref! (fluree/history conn ledger query* opts)))] (log/debug "history handler received query:" query opts "result:" result) ;; fluree/history may return either raw result or wrapped in {:status :result} (if (and (map? result) (:status result) (:result result)) diff --git a/src/fluree/server/handlers/transact.clj b/src/fluree/server/handlers/transact.clj index cd0ca169..374f0a4c 100644 --- a/src/fluree/server/handlers/transact.clj +++ b/src/fluree/server/handlers/transact.clj @@ -7,7 +7,8 @@ [fluree.json-ld :as json-ld] [fluree.server.consensus :as consensus] [fluree.server.handlers.shared :as shared :refer [defhandler deref!]] - [fluree.server.watcher :as watcher])) + [fluree.server.watcher :as watcher] + [steffan-westcott.clj-otel.api.trace.span :as span])) (set! *warn-on-reflection* true) @@ -63,7 +64,8 @@ raw-txn (assoc :raw-txn raw-txn) did (assoc :did did)) {:keys [status] :as commit-event} - (deref! (transact! consensus watcher ledger-id txn-with-ledger opts*)) + (span/with-span! {:name ::update-handler} + (deref! (transact! consensus watcher ledger-id txn-with-ledger opts*))) body (commit-event->response-body commit-event)] (shared/with-tracking-headers {:status status, :body body} @@ -77,7 +79,8 @@ raw-txn (assoc :raw-txn raw-txn) did (assoc :identity did)) {:keys [status] :as commit-event} - (deref! (transact! consensus watcher ledger-id insert-txn opts*)) + (span/with-span! {:name ::insert-handler} + (deref! (transact! consensus watcher ledger-id insert-txn opts*))) body (commit-event->response-body commit-event)] (shared/with-tracking-headers {:status status, :body body} @@ -91,7 +94,8 @@ raw-txn (assoc :raw-txn raw-txn) did (assoc :identity did)) {:keys [status] :as commit-event} - (deref! (transact! consensus watcher ledger-id upsert-txn opts*)) + (span/with-span! {:name ::upsert-handler} + (deref! (transact! consensus watcher ledger-id upsert-txn opts*))) body (commit-event->response-body commit-event)] (shared/with-tracking-headers {:status status, :body body} diff --git a/src/fluree/server/system.clj b/src/fluree/server/system.clj index d17dda84..b3c2f899 100644 --- a/src/fluree/server/system.clj +++ b/src/fluree/server/system.clj @@ -158,15 +158,15 @@ (def default-resource-name "file-config.jsonld") -(defn initialize-logging +(defn initialize-logging! [] ;; set logging impl - (trove/set-log-fn! (trove-tel/get-log-fn)) - (tel-tl/tools-logging->telemere!) + #_(trove/set-log-fn! (trace-log2)) + #_(tel-tl/tools-logging->telemere!) ;; add structured logs - (tel/add-handler! :json (tel/handler:console {:output-fn (tel/pr-signal-fn {:pr-fn json/stringify})})) + #_(tel/add-handler! :default/console (tel/handler:console {:output-fn (tel/pr-signal-fn {:pr-fn json/stringify})})) ;; add otel tracing, if present - (when tel/otel-tracing? + #_(when tel/otel-tracing? (tel/add-handler! :otel (tel-otel/handler:open-telemetry)))) (defn log-config-summary @@ -217,7 +217,6 @@ (defn start-config [config & {:keys [profile reindex]}] - (initialize-logging) (let [json-config (if (string? config) (json/parse config false) config) From 484125252d19b5bed4fe638df579c3576c37ca63 Mon Sep 17 00:00:00 2001 From: Daniel Petranek Date: Wed, 17 Dec 2025 15:30:11 -0600 Subject: [PATCH 6/7] update db deps Also see if we can use logback for structured logs. --- deps.edn | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/deps.edn b/deps.edn index f9665a1a..0967e102 100644 --- a/deps.edn +++ b/deps.edn @@ -1,7 +1,7 @@ {:deps {org.clojure/clojure {:mvn/version "1.11.3"} org.clojure/core.async {:mvn/version "1.6.681"} com.fluree/db {:git/url "https://github.com/fluree/db.git" - :git/sha "966892f4911aa24bf28cea314d74519dfd5b8230"} + :git/sha "8925f9e677a9965aa7e1a9eb0fed0769f24ea804"} com.fluree/json-ld {:git/url "https://github.com/fluree/json-ld.git" :git/sha "74083536c84d77f8cdd4b686b5661714010baad3"} @@ -24,10 +24,8 @@ ;; logging ch.qos.logback/logback-classic {:mvn/version "1.5.6"} + net.logstash.logback/logstash-logback-encoder {:mvn/version "9.0"} org.slf4j/slf4j-api {:mvn/version "2.0.13"} - com.taoensso/trove {:mvn/version "1.1.0"} - com.taoensso/telemere {:mvn/version "1.2.0"} - io.opentelemetry/opentelemetry-api {:mvn/version "1.56.0"} com.github.steffan-westcott/clj-otel-api {:mvn/version "0.2.10"} ;; http @@ -54,7 +52,10 @@ :extra-deps {org.clojure/tools.namespace {:mvn/version "1.5.0"} clj-http/clj-http {:mvn/version "3.13.0"} criterium/criterium {:mvn/version "0.4.6"} - integrant/repl {:mvn/version "0.3.3"}} + integrant/repl {:mvn/version "0.3.3"} + com.taoensso/trove {:mvn/version "1.1.0"} + com.taoensso/telemere {:mvn/version "1.2.0"} + io.opentelemetry/opentelemetry-api {:mvn/version "1.56.0"}} :jvm-opts ["-Djdk.attach.allowAttachSelf" "-javaagent:/home/dan/scratch/learn-otel/opentelemetry-javaagent.jar" "-Dotel.exporter.otlp.endpoint=http://localhost:4318" From e9fbad002bb1bdfdf473d438e4d70025022e70e0 Mon Sep 17 00:00:00 2001 From: Daniel Petranek Date: Wed, 17 Dec 2025 15:55:30 -0600 Subject: [PATCH 7/7] remove telemere --- src/fluree/server/system.clj | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/fluree/server/system.clj b/src/fluree/server/system.clj index b3c2f899..0e846ecb 100644 --- a/src/fluree/server/system.clj +++ b/src/fluree/server/system.clj @@ -20,12 +20,7 @@ [fluree.server.reindex :as reindex] [fluree.server.watcher :as watcher] [integrant.core :as ig] - [ring.adapter.jetty9 :as jetty] - [taoensso.telemere :as tel] - [taoensso.telemere.open-telemetry :as tel-otel] - [taoensso.telemere.tools-logging :as tel-tl] - [taoensso.trove :as trove] - [taoensso.trove.telemere :as trove-tel])) + [ring.adapter.jetty9 :as jetty])) (set! *warn-on-reflection* true) @@ -158,17 +153,6 @@ (def default-resource-name "file-config.jsonld") -(defn initialize-logging! - [] - ;; set logging impl - #_(trove/set-log-fn! (trace-log2)) - #_(tel-tl/tools-logging->telemere!) - ;; add structured logs - #_(tel/add-handler! :default/console (tel/handler:console {:output-fn (tel/pr-signal-fn {:pr-fn json/stringify})})) - ;; add otel tracing, if present - #_(when tel/otel-tracing? - (tel/add-handler! :otel (tel-otel/handler:open-telemetry)))) - (defn log-config-summary [parsed-config] (let [connection-config (some #(when (of-type? % conn-vocab/connection-type) %)