Skip to content

Commit 30342ae

Browse files
authored
Merge pull request coinbase#132 from christopherb-stripe/christopherb/metrics-namespace-public
Add namespace to emitted metrics
2 parents f4c57b5 + 31d22ce commit 30342ae

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

lib/temporal/activity/task_processor.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def process
2626
start_time = Time.now
2727

2828
Temporal.logger.debug("Processing Activity task", metadata.to_h)
29-
Temporal.metrics.timing('activity_task.queue_time', queue_time_ms, activity: activity_name)
29+
Temporal.metrics.timing('activity_task.queue_time', queue_time_ms, activity: activity_name, namespace: namespace)
3030

3131
context = Activity::Context.new(connection, metadata)
3232

@@ -46,7 +46,7 @@ def process
4646
respond_failed(error)
4747
ensure
4848
time_diff_ms = ((Time.now - start_time) * 1000).round
49-
Temporal.metrics.timing('activity_task.latency', time_diff_ms, activity: activity_name)
49+
Temporal.metrics.timing('activity_task.latency', time_diff_ms, activity: activity_name, namespace: namespace)
5050
Temporal.logger.debug("Activity task processed", metadata.to_h.merge(execution_time: time_diff_ms))
5151
end
5252

lib/temporal/workflow/task_processor.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def process
2424
start_time = Time.now
2525

2626
Temporal.logger.debug("Processing Workflow task", metadata.to_h)
27-
Temporal.metrics.timing('workflow_task.queue_time', queue_time_ms, workflow: workflow_name)
27+
Temporal.metrics.timing('workflow_task.queue_time', queue_time_ms, workflow: workflow_name, namespace: namespace)
2828

2929
if !workflow_class
3030
raise Temporal::WorkflowNotRegistered, 'Workflow is not registered with this worker'
@@ -45,7 +45,7 @@ def process
4545
fail_task(error)
4646
ensure
4747
time_diff_ms = ((Time.now - start_time) * 1000).round
48-
Temporal.metrics.timing('workflow_task.latency', time_diff_ms, workflow: workflow_name)
48+
Temporal.metrics.timing('workflow_task.latency', time_diff_ms, workflow: workflow_name, namespace: namespace)
4949
Temporal.logger.debug("Workflow task processed", metadata.to_h.merge(execution_time: time_diff_ms))
5050
end
5151

spec/unit/lib/temporal/activity/task_processor_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,15 @@
125125

126126
expect(Temporal.metrics)
127127
.to have_received(:timing)
128-
.with('activity_task.queue_time', an_instance_of(Integer), activity: activity_name)
128+
.with('activity_task.queue_time', an_instance_of(Integer), activity: activity_name, namespace: namespace)
129129
end
130130

131131
it 'sends latency metric' do
132132
subject.process
133133

134134
expect(Temporal.metrics)
135135
.to have_received(:timing)
136-
.with('activity_task.latency', an_instance_of(Integer), activity: activity_name)
136+
.with('activity_task.latency', an_instance_of(Integer), activity: activity_name, namespace: namespace)
137137
end
138138

139139
context 'with async activity' do
@@ -203,15 +203,15 @@
203203

204204
expect(Temporal.metrics)
205205
.to have_received(:timing)
206-
.with('activity_task.queue_time', an_instance_of(Integer), activity: activity_name)
206+
.with('activity_task.queue_time', an_instance_of(Integer), activity: activity_name, namespace: namespace)
207207
end
208208

209209
it 'sends latency metric' do
210210
subject.process
211211

212212
expect(Temporal.metrics)
213213
.to have_received(:timing)
214-
.with('activity_task.latency', an_instance_of(Integer), activity: activity_name)
214+
.with('activity_task.latency', an_instance_of(Integer), activity: activity_name, namespace: namespace)
215215
end
216216

217217
context 'with ScriptError exception' do

spec/unit/lib/temporal/workflow/task_processor_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,15 @@
105105

106106
expect(Temporal.metrics)
107107
.to have_received(:timing)
108-
.with('workflow_task.queue_time', an_instance_of(Integer), workflow: workflow_name)
108+
.with('workflow_task.queue_time', an_instance_of(Integer), workflow: workflow_name, namespace: namespace)
109109
end
110110

111111
it 'sends latency metric' do
112112
subject.process
113113

114114
expect(Temporal.metrics)
115115
.to have_received(:timing)
116-
.with('workflow_task.latency', an_instance_of(Integer), workflow: workflow_name)
116+
.with('workflow_task.latency', an_instance_of(Integer), workflow: workflow_name, namespace: namespace)
117117
end
118118
end
119119

@@ -170,15 +170,15 @@
170170

171171
expect(Temporal.metrics)
172172
.to have_received(:timing)
173-
.with('workflow_task.queue_time', an_instance_of(Integer), workflow: workflow_name)
173+
.with('workflow_task.queue_time', an_instance_of(Integer), workflow: workflow_name, namespace: namespace)
174174
end
175175

176176
it 'sends latency metric' do
177177
subject.process
178178

179179
expect(Temporal.metrics)
180180
.to have_received(:timing)
181-
.with('workflow_task.latency', an_instance_of(Integer), workflow: workflow_name)
181+
.with('workflow_task.latency', an_instance_of(Integer), workflow: workflow_name, namespace: namespace)
182182
end
183183
end
184184

0 commit comments

Comments
 (0)