Add support for setting MetricsScope

ghaskins · ghaskins · commit e4b5240cc11c · 2023-12-07T18:47:06.000-05:00
Signed-off-by: Greg Haskins &lt;greg@manetu.com&gt;
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ Pull requests are welcome.  Please include a [DCO](https://en.wikipedia.org/wiki
 
 ## License
 
-Copyright (C) 2022 Manetu, Inc. All Rights Reserved.
+Copyright (C) Manetu, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this material except in compliance with the License.
diff --git a/dev-resources/user.clj b/dev-resources/user.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns user
   (:require [clojure.tools.namespace.repl :refer [refresh]]
diff --git a/project.clj b/project.clj
@@ -3,7 +3,7 @@
   :url "https://github.com/manetu/temporal-clojure-sdk"
   :license {:name "Apache License 2.0"
             :url "https://www.apache.org/licenses/LICENSE-2.0"
-            :year 2022
+            :year 2023
             :key "apache-2.0"}
   :plugins [[lein-cljfmt "0.9.0"]
             [lein-kibit "0.1.8"]
@@ -12,12 +12,12 @@
             [jonase/eastwood "1.3.0"]
             [lein-codox "0.10.8"]]
   :dependencies [[org.clojure/clojure "1.11.1"]
-                 [org.clojure/core.async "1.6.673"]
-                 [io.temporal/temporal-sdk "1.19.1"]
-                 [io.temporal/temporal-testing "1.19.1"]
-                 [com.taoensso/encore "3.59.0"]
-                 [com.taoensso/timbre "6.1.0"]
-                 [com.taoensso/nippy "3.2.0"]
+                 [org.clojure/core.async "1.6.681"]
+                 [io.temporal/temporal-sdk "1.22.3"]
+                 [io.temporal/temporal-testing "1.22.3"]
+                 [com.taoensso/encore "3.74.0"]
+                 [com.taoensso/timbre "6.3.1"]
+                 [com.taoensso/nippy "3.3.0"]
                  [funcool/promesa "9.2.542"]
                  [medley "1.4.0"]]
   :repl-options {:init-ns user}
diff --git a/src/temporal/client/core.clj b/src/temporal/client/core.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.client.core
   "Methods for client interaction with Temporal"
@@ -25,7 +25,8 @@
    :enable-keepalive         #(.setEnableKeepAlive ^WorkflowServiceStubsOptions$Builder %1 %2)
    :keepalive-time           #(.setKeepAliveTime ^WorkflowServiceStubsOptions$Builder %1 %2)
    :keepalive-timeout        #(.setKeepAliveTimeout ^WorkflowServiceStubsOptions$Builder %1 %2)
-   :keepalive-without-stream #(.setKeepAlivePermitWithoutStream ^WorkflowServiceStubsOptions$Builder %1 %2)})
+   :keepalive-without-stream #(.setKeepAlivePermitWithoutStream ^WorkflowServiceStubsOptions$Builder %1 %2)
+   :metrics-scope            #(.setMetricsScope ^WorkflowServiceStubsOptions$Builder %1 %2)})
 
 (defn ^:no-doc stub-options->
   ^WorkflowServiceStubsOptions [params]
@@ -72,6 +73,7 @@ Arguments:
 | :keepalive-time           | Set the keep alive time                                                     | [Duration](https://docs.oracle.com/javase/8/docs/api//java/time/Duration.html) | |
 | :keepalive-timeout        | Set the keep alive timeout                                                  | [Duration](https://docs.oracle.com/javase/8/docs/api//java/time/Duration.html) | |
 | :keepalive-without-stream | Set if client sends keepalive pings even with no active RPCs                | boolean       | false |
+| :metrics-scope            | The scope to be used for metrics reporting                                  | [Scope](https://github.com/uber-java/tally/blob/master/core/src/main/java/com/uber/m3/tally/Scope.java) | |
 
 "
   ([] (create-client {}))
diff --git a/src/temporal/client/worker.clj b/src/temporal/client/worker.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.client.worker
   "Methods for managing a Temporal worker instance"
diff --git a/src/temporal/codec.clj b/src/temporal/codec.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.codec
   "Methods for managing codecs between a client and the Temporal backend"
diff --git a/src/temporal/common.clj b/src/temporal/common.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.common
   (:require [temporal.internal.utils :as u])
diff --git a/src/temporal/internal/activity.clj b/src/temporal/internal/activity.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns ^:no-doc temporal.internal.activity
   (:require [clojure.core.protocols :as p]
diff --git a/src/temporal/internal/promise.clj b/src/temporal/internal/promise.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns ^:no-doc temporal.internal.promise
   (:require [taoensso.timbre :as log]
diff --git a/src/temporal/internal/signals.clj b/src/temporal/internal/signals.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns ^:no-doc temporal.internal.signals
   (:require [taoensso.timbre :as log]
diff --git a/src/temporal/internal/utils.clj b/src/temporal/internal/utils.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns ^:no-doc temporal.internal.utils
   (:require [clojure.string :as string]
diff --git a/src/temporal/internal/workflow.clj b/src/temporal/internal/workflow.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns ^:no-doc temporal.internal.workflow
   (:require [clojure.core.protocols :as p]
diff --git a/src/temporal/promise.clj b/src/temporal/promise.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.promise
   "Methods for managing promises from pending activities from within workflows"
diff --git a/src/temporal/side_effect.clj b/src/temporal/side_effect.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.side-effect
   "Methods for managing side-effects from within workflows"
diff --git a/src/temporal/signals.clj b/src/temporal/signals.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.signals
   "Methods for managing signals from within workflows"
diff --git a/src/temporal/testing/env.clj b/src/temporal/testing/env.clj
@@ -1,19 +1,39 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.testing.env
   "Methods and utilities to assist with unit-testing Temporal workflows"
   (:require [temporal.client.worker :as worker]
             [temporal.internal.utils :as u])
-  (:import [io.temporal.testing TestWorkflowEnvironment]))
+  (:import [io.temporal.testing TestWorkflowEnvironment TestEnvironmentOptions TestEnvironmentOptions$Builder]))
+
+(def ^:no-doc test-env-options
+  {:metrics-scope            #(.setMetricsScope ^TestEnvironmentOptions$Builder %1 %2)})
+
+(defn ^:no-doc test-env-options->
+  ^TestEnvironmentOptions [params]
+  (u/build (TestEnvironmentOptions/newBuilder) test-env-options params))
 
 (defn create
   "
 Creates a mock Temporal backend, suitable for unit testing.
 
 A worker may be created with [[start]] and a client may be connected with [[get-client]]
+
+Arguments:
+
+- `options`: Client configuration option map (See below)
+
+#### options map
+
+| Value                     | Description                                                                 | Type         | Default |
+| ------------------------- | --------------------------------------------------------------------------- | ------------ | ------- |
+| :metrics-scope            | The scope to be used for metrics reporting                                  | [Scope](https://github.com/uber-java/tally/blob/master/core/src/main/java/com/uber/m3/tally/Scope.java) | |
+
 "
-  []
-  (TestWorkflowEnvironment/newInstance))
+  ([]
+   (TestWorkflowEnvironment/newInstance))
+  ([options]
+   (TestWorkflowEnvironment/newInstance (test-env-options-> options))))
 
 (defn start
   "
diff --git a/src/temporal/workflow.clj b/src/temporal/workflow.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.workflow
   "Methods for defining and implementing Temporal workflows"
diff --git a/test/temporal/test/async.clj b/test/temporal/test/async.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.async
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/client_signal.clj b/test/temporal/test/client_signal.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.client-signal
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/codec.clj b/test/temporal/test/codec.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.codec
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/concurrency.clj b/test/temporal/test/concurrency.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.concurrency
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/conflict.clj b/test/temporal/test/conflict.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.conflict
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/local_activity.clj b/test/temporal/test/local_activity.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.local-activity
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/manual_dispatch.clj b/test/temporal/test/manual_dispatch.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.manual-dispatch
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/poll.clj b/test/temporal/test/poll.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.poll
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/query.clj b/test/temporal/test/query.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.query
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/race.clj b/test/temporal/test/race.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 (ns temporal.test.race
   (:require [clojure.test :refer :all]
             [clojure.core.async :refer [go <!] :as async]
diff --git a/test/temporal/test/scale.clj b/test/temporal/test/scale.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.scale
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/sequence.clj b/test/temporal/test/sequence.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.sequence
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/side_effect.clj b/test/temporal/test/side_effect.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.side-effect
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/signal_timeout.clj b/test/temporal/test/signal_timeout.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.signal-timeout
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/signal_with_start.clj b/test/temporal/test/signal_with_start.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.signal-with-start
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/simple.clj b/test/temporal/test/simple.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.simple
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/sleep.clj b/test/temporal/test/sleep.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.sleep
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/types.clj b/test/temporal/test/types.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.types
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/utils.clj b/test/temporal/test/utils.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.utils
   "Utilities common to all tests"
diff --git a/test/temporal/test/uuid_test.clj b/test/temporal/test/uuid_test.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.uuid-test
   (:require [clojure.test :refer :all]
diff --git a/test/temporal/test/workflow_signal.clj b/test/temporal/test/workflow_signal.clj
@@ -1,4 +1,4 @@
-;; Copyright © 2022 Manetu, Inc.  All rights reserved
+;; Copyright © Manetu, Inc.  All rights reserved
 
 (ns temporal.test.workflow-signal
   (:require [clojure.test :refer :all]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-;; Copyright © 2022 Manetu, Inc. All rights reserved`
	`1`	`+;; Copyright © Manetu, Inc. All rights reserved`
`2`	`2`
`3`	`3`	`(ns user`
`4`	`4`	`(:require [clojure.tools.namespace.repl :refer [refresh]]`