Merge pull request #226 from austb/java-time-migration

Migrate from clj-time/Joda-Time to java.time

Author: nmburgan

ext/bin/config-openvox-test-ref

@@ -50,7 +50,7 @@ esac
 
 # Install and update Ruby dependencies from top-level Gemfile
 bundle config set --local path vendor/bundle
-bundle config set --local without acceptance
+bundle config set --local without 'acceptance release'
 bundle install --retry=10
 bundle update
 # Print out info on Puppet dependency

project.clj

@@ -141,7 +141,6 @@
                          [clj-http "3.13.1"]
                          [clj-kondo "2026.01.19"]
                          [clj-stacktrace "0.2.8"]
-                         [clj-time "0.15.2"]
                          [com.fasterxml.jackson.core/jackson-core ~jackson-version]
                          [com.fasterxml.jackson.core/jackson-databind ~jackson-version]
                          [com.fasterxml.jackson.dataformat/jackson-dataformat-cbor ~jackson-version]
@@ -162,7 +161,6 @@
                          [digest "1.4.10"]
                          [fast-zip "0.4.0"]
                          [instaparse "1.5.0"]
-                         [joda-time "2.14.1"]
                          [metrics-clojure "2.10.0"]
                          [murphy "0.5.3"]
                          [net.logstash.logback/logstash-logback-encoder "7.4"]
@@ -177,13 +175,13 @@
                          [org.slf4j/log4j-over-slf4j ~slf4j-version]
                          [org.openvoxproject/comidi "1.1.2"]
                          [org.openvoxproject/i18n ~i18n-version]
-                         [org.openvoxproject/kitchensink "3.5.5"]
-                         [org.openvoxproject/kitchensink "3.5.5" :classifier "test"]
+                         [org.openvoxproject/kitchensink "3.5.6"]
+                         [org.openvoxproject/kitchensink "3.5.6" :classifier "test"]
                          [org.openvoxproject/ssl-utils "3.6.2"]
                          [org.openvoxproject/stockpile "1.0.1"]
                          [org.openvoxproject/structured-logging "1.0.1"]
-                         [org.openvoxproject/trapperkeeper "4.3.2"]
-                         [org.openvoxproject/trapperkeeper "4.3.2" :classifier "test"]
+                         [org.openvoxproject/trapperkeeper "4.3.4"]
+                         [org.openvoxproject/trapperkeeper "4.3.4" :classifier "test"]
                          [org.openvoxproject/trapperkeeper-authorization "2.1.6"]
                          [org.openvoxproject/trapperkeeper-authorization "2.1.6" :exclusions [io.dropwizard.metrics/metrics-core]]
                          [org.openvoxproject/trapperkeeper-filesystem-watcher "1.5.1"]
@@ -220,7 +218,6 @@
                  [clj-commons/fs]
                  [clj-http]
                  [clj-stacktrace]
-                 [clj-time]
                  [com.fasterxml.jackson.core/jackson-databind]
                  [com.github.seancorfield/honeysql]
                  [com.github.seancorfield/next.jdbc]
@@ -242,7 +239,6 @@
                  [org.openvoxproject/comidi]
                  [org.openvoxproject/i18n]
                  [org.openvoxproject/kitchensink]
-                 [org.openvoxproject/ssl-utils]
                  [org.openvoxproject/stockpile]
                  [org.openvoxproject/structured-logging]
                  [org.openvoxproject/trapperkeeper]

src/puppetlabs/puppetdb/cheshire.clj

@@ -52,7 +52,7 @@
           (encode-fn obj jsonGenerator))
         (.writeRawValue jsonGenerator (.getValue data)))))
   (add-encoder
-    org.joda.time.DateTime
+    java.time.Instant
     (fn [data ^JsonGenerator jsonGenerator]
       (.writeString jsonGenerator (to-string data))))
   (add-encoder
@@ -70,7 +70,7 @@
 
   Encoders currently include:
 
-  * org.joda.time.DateTime - handled with to-string"}
+  * java.time.Instant - handled with to-string"}
   add-common-json-encoders! (memoize add-common-json-encoders!*))
 
 (add-common-json-encoders!)

src/puppetlabs/puppetdb/cli/benchmark.clj

@@ -1245,7 +1245,7 @@
   prints it to the console every 5 seconds. Uses run-interval to compute the
   number of nodes that would produce that load."
   [rate-monitor-ch run-interval commands-per-puppet-run _state]
-  (let [run-interval-seconds (time/in-seconds run-interval)
+  (let [run-interval-seconds (time/to-seconds run-interval)
         expected-node-message-rate (/ commands-per-puppet-run run-interval-seconds)]
     (println-err
      (str "q/s - queries per second\n"
@@ -1276,7 +1276,7 @@
                (trs "{0} cmd/s (~{1} nodes @ {2}m) | {3} q/s {4} s/q | {5} err"
                     cmd-per-sec
                     (int (/ cmd-per-sec expected-node-message-rate))
-                    (time/in-minutes run-interval)
+                    (time/to-minutes run-interval)
                     (format "%.2f" query-per-sec)
                     (format "%.2f" (-> @metrics :query-duration timers/mean (/ 1000000000)))
                     errors))
@@ -1387,7 +1387,7 @@
   [numhosts run-interval num-msgs end-commands-in rand-catalogs rand-facts
    simulation-threads sim-ch host-info-ch read-ch
    & {:keys [facts catalogs reports include-edges? storage-dir]}]
-  (let [run-interval-minutes (time/in-minutes run-interval)
+  (let [run-interval-minutes (time/to-minutes run-interval)
         hosts-per-second (/ numhosts (* run-interval-minutes 60))
         ms-per-message (/ 1000 hosts-per-second)
         ms-per-thread (* ms-per-message simulation-threads)

src/puppetlabs/puppetdb/cli/generate.clj

@@ -267,7 +267,7 @@
 (defmethod weigh Number [_] 4)
 (defmethod weigh Boolean [_] 1)
 (defmethod weigh nil [_] 0)
-(defmethod weigh org.joda.time.DateTime [_] 8)
+(defmethod weigh java.time.Instant [_] 8)
 (defmethod weigh :default
   [what] (throw (Exception. (format "Don't know how to weigh a %s of type %s" what (type what)))))
 

src/puppetlabs/puppetdb/cli/services.clj

@@ -74,10 +74,11 @@
             [puppetlabs.puppetdb.time
              :refer [ago
                      ephemeral-now-ns
-                     to-seconds
-                     to-millis
                      format-period
-                     period?]]
+                     period?
+                     to-millis
+                     to-seconds
+                     truncate-to-day]]
             [puppetlabs.puppetdb.utils :as utils
              :refer [await-scheduler-shutdown
                      call-unless-shutting-down
@@ -101,7 +102,7 @@
    (java.io Closeable)
    (java.sql SQLException)
    [java.util.concurrent.locks ReentrantLock]
-   [org.joda.time Period]))
+))
 
 (def env-monitor-queries?
   ;; Note: theres'a also a :conf/test switch
@@ -211,9 +212,6 @@
 (defn update-db-lock-status [state what f]
   (swap! state update what f))
 
-(defn rounded-date [d]
-  (-> (ago d) .dayOfYear .roundFloorCopy))
-
 (defn sweep-reports!
   "Deletes reports older than than report-ttl.  When resource-events-ttl
   is also provided, deletes events that are older than that
@@ -224,8 +222,8 @@
   [db {:keys [incremental? report-ttl resource-events-ttl db-lock-status]}]
   {:pre [(map? db)
          (period? report-ttl)]}
-  (let [rounded-events-ttl (some-> resource-events-ttl rounded-date)
-        rounded-report-ttl (rounded-date report-ttl)
+  (let [rounded-events-ttl (some-> resource-events-ttl ago truncate-to-day)
+        rounded-report-ttl (truncate-to-day (ago report-ttl))
         update-lock-status (partial update-db-lock-status db-lock-status)
         del-opts (merge {:report-ttl rounded-report-ttl
                          :incremental? incremental?
@@ -268,7 +266,7 @@
   {:pre [(map? db)
          (period? resource-events-ttl)]}
   ;; apply a day floor on this - we can't be more granular than a day here.
-  (let [rounded-ttl (rounded-date resource-events-ttl)
+  (let [rounded-ttl (truncate-to-day (ago resource-events-ttl))
         update-lock-status (partial update-db-lock-status db-lock-status)]
    (try
      (kitchensink/demarcate
@@ -369,10 +367,10 @@
   [db
    lock :- ReentrantLock
    {:keys [node-ttl node-purge-ttl
-           report-ttl resource-events-ttl]} :- {:node-ttl Period
-                                                :node-purge-ttl Period
-                                                :report-ttl Period
-                                                :resource-events-ttl Period
+           report-ttl resource-events-ttl]} :- {:node-ttl java.time.Duration
+                                                :node-purge-ttl java.time.Duration
+                                                :report-ttl java.time.Duration
+                                                :resource-events-ttl java.time.Duration
                                                 s/Keyword s/Any}
    db-lock-status :- clojure.lang.Atom
    ;; Later, the values might be maps, i.e. {:limit 1000}

src/puppetlabs/puppetdb/cli/time_shift_export.clj

@@ -24,8 +24,7 @@
    [puppetlabs.kitchensink.core :as kitchensink]
    [clojure.java.io :as io]
    [puppetlabs.puppetdb.archive :as archive]
-   [puppetlabs.puppetdb.time :refer [parse-wire-datetime after? now interval plus]]
-   [clj-time.coerce :as time-coerce]
+   [puppetlabs.puppetdb.time :as time :refer [wire-datetime->instant after? now interval plus to-long]]
    [puppetlabs.puppetdb.cheshire :as json]
    [clojure.string :as str]))
 
@@ -37,7 +36,7 @@
 (defn time-shift-timestamp
   [timestamp-string shift-period]
   (-> timestamp-string
-      parse-wire-datetime
+      wire-datetime->instant
       (plus shift-period)))
 
 (defn time-shift-resources
@@ -96,7 +95,7 @@
             command-type (if (= command-type "facts") command-type (str/join "" (drop-last command-type)))
             filename (clojure.core/format "%s-%s_%s_%s_%s.json"
                                           (next-command-index)
-                                          (time-coerce/to-long (:producer_timestamp shifted-data))
+                                          (to-long (:producer_timestamp shifted-data))
                                           command-type
                                           (str (get command-type-versions command-type))
                                           (:certname shifted-data))]
@@ -152,12 +151,12 @@
                 (json-data :end_time)]
                (map #(:time %) (json-data :logs))
                (get-resources-timestamps (json-data :resources)))
-       (map parse-wire-datetime)
+       (map wire-datetime->instant)
        (reduce get-newest-timestamp)))
 
 (defn entry-producer-timestamp
   [json-data]
-  (parse-wire-datetime (:producer_timestamp json-data)))
+  (wire-datetime->instant (:producer_timestamp json-data)))
 
 (defn compare-command-versions
   [command-type actual-version]
@@ -190,7 +189,7 @@
 
 (defn newest-timestamp-from-archive
   [archive-path]
-  (let [newest-timestamp (atom (parse-wire-datetime "1000-01-01T11:11:11.111Z"))]
+  (let [newest-timestamp (atom (wire-datetime->instant "1000-01-01T11:11:11.111Z"))]
 
     (with-open [tar-reader (archive/tarball-reader archive-path)]
       (doseq [tar-entry (archive/all-entries tar-reader)]
@@ -203,12 +202,12 @@
 (defn time-shift-export
   [args]
   (let [newest-timestamp (newest-timestamp-from-archive (:input args))
-        shift-period (.toPeriod (interval newest-timestamp (:shift-to-time args)))]
+        shift-period (interval newest-timestamp (:shift-to-time args))]
     (time-shift-input-archive (assoc args :shift-to-time shift-period))))
 
 (defn parse-time-shift-parameter
   [time-string]
-  (let [parsed-time (parse-wire-datetime time-string)]
+  (let [parsed-time (wire-datetime->instant time-string)]
     (when-not parsed-time
       (utils/throw-sink-cli-error (str "\nError: time shift date: " time-string ", must be in UTC format!\n")))
     parsed-time))

src/puppetlabs/puppetdb/command.clj

@@ -64,7 +64,7 @@
             [puppetlabs.puppetdb.jdbc :as jdbc]
             [puppetlabs.puppetdb.schema :refer [defn-validated]]
             [puppetlabs.puppetdb.time :as time
-             :refer [now in-millis interval]]
+             :refer [now to-millis interval]]
             [puppetlabs.puppetdb.utils :as utils
              :refer [await-scheduler-shutdown
                      call-unless-shutting-down
@@ -298,7 +298,7 @@
    ;; manually stringify these to avoid locale-specific formatting
    (let [id (str id)
          received-time (str (time/to-long received-time))
-         duration (str (in-millis (interval start-time (now))))
+         duration (str (to-millis (interval start-time (now))))
          command-name (command-names command-kw)
          producer-utc-s (or (some-> producer-ts time/to-timestamp .getTime)
                             "nil")
@@ -825,16 +825,14 @@
                (log/info (trs "Revival of delayed message interrupted")))))))
      command-delay-ms)))
 
-(def ^:private iso-formatter (time/formatters :date-time))
-
 (defn process-message
   [{:keys [certname command version received delete? id] :as cmdref}
    q command-chan dlo delay-pool broadcast-pool write-dbs response-chan stats
    options-config maybe-send-cmd-event! shutdown-for-ex]
   (when received
-    (let [q-time (-> (time/parse iso-formatter received)
+    (let [q-time (-> (time/to-date-time received)
                      (time/interval (now))
-                     time/in-seconds)]
+                     time/to-seconds)]
       (create-metrics-for-command! command version)
       (update! (global-metric :queue-time) q-time)
       (update! (cmd-metric command version :queue-time) q-time)))

src/puppetlabs/puppetdb/config.clj

@@ -21,8 +21,8 @@
             [puppetlabs.trapperkeeper.services :refer [service-context]])
   (:import
    (clojure.lang ExceptionInfo)
-   (java.util.regex PatternSyntaxException)
-   (org.joda.time Minutes Period)))
+   (java.time Duration)
+   (java.util.regex PatternSyntaxException)))
 
 (defn throw-cli-error [msg]
   (throw (ex-info msg {:type ::cli-error :message msg})))
@@ -119,7 +119,7 @@
    :classname (pls/defaulted-maybe String "org.postgresql.Driver")
    :subprotocol (pls/defaulted-maybe String "postgresql")
    :subname String
-   :conn-max-age Minutes
+   :conn-max-age Duration
    :read-only? Boolean
    :partition-conn-min s/Int
    :partition-conn-max s/Int
@@ -128,7 +128,7 @@
    :log-statements Boolean
    :connection-timeout s/Int
    :maximum-pool-size s/Int
-   (s/optional-key :conn-lifetime) (s/maybe Minutes)
+   (s/optional-key :conn-lifetime) (s/maybe Duration)
    (s/optional-key :connection-migrator-username) String
    (s/optional-key :connection-username) String
    (s/optional-key :user) String
@@ -141,7 +141,7 @@
    :facts-blocklist-type String
 
    :schema-check-interval s/Int
-   :node-purge-ttl Period})
+   :node-purge-ttl Duration})
 
 (def per-write-database-config-out
   "Schema for parsed/processed database config that includes write database params"
@@ -153,10 +153,10 @@
           (s/optional-key :gc-interval-packages) (s/cond-pre String s/Int)
           (s/optional-key :gc-interval-fact-paths) (s/cond-pre String s/Int)
           (s/optional-key :gc-interval-catalogs) (s/cond-pre String s/Int)
-          :report-ttl Period
+          :report-ttl Duration
           :node-purge-gc-batch-limit (s/constrained s/Int (complement neg?))
-          :node-ttl Period
-          (s/optional-key :resource-events-ttl) Period
+          :node-ttl Duration
+          (s/optional-key :resource-events-ttl) Duration
           :migrate Boolean}))
 
 (defn half-the-cores*
@@ -393,7 +393,7 @@
 
 (defn gc-intervals->periods
   [{:keys [gc-interval] :as config}]
-  (let [one-day  (-> 24 t/hours .toPeriod)
+  (let [one-day  (t/hours 24)
         gc-interval-period (interval->period gc-interval)
         get-period (fn [custom] (interval->period (or custom gc-interval)))
         get-paths-period (fn [custom]

src/puppetlabs/puppetdb/export.clj

@@ -10,11 +10,10 @@
             [puppetlabs.puppetdb.catalogs :as catalogs]
             [puppetlabs.puppetdb.factsets :as factsets]
             [puppetlabs.puppetdb.reports :as reports]
-            [puppetlabs.puppetdb.time :refer [now]]
+            [puppetlabs.puppetdb.time :as time :refer [now]]
             [puppetlabs.puppetdb.nodes :as nodes]
             [puppetlabs.puppetdb.command.constants :as command-constants]
             [puppetlabs.puppetdb.utils :as utils]
-            [clj-time.coerce :as time-coerce]
             [puppetlabs.puppetdb.schema :as pls]
             [puppetlabs.i18n.core :refer [trs]]))
 
@@ -33,7 +32,7 @@
   (format "%s-%s%s"
           certname
           (-> producer_timestamp
-              time-coerce/to-date-time
+              time/to-date-time
               hash/generic-identity-hash)
           export-file-ext))