Skip to content

Commit fcc3426

Browse files
samanvpsamanvp
committed
Third round of comments (Metrics)
1 parent 2aaddc9 commit fcc3426

File tree

3 files changed

+42
-35
lines changed

3 files changed

+42
-35
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ RUN curl -L -o /usr/bin/kubectl https://storage.googleapis.com/kubernetes-releas
3030
ADD LICENSE /
3131
ADD gcp_deepvariant_runner.py /opt/deepvariant_runner/src/
3232
ADD gke_cluster.py /opt/deepvariant_runner/src/
33+
ADD metrics.py /opt/deepvariant_runner/src/
3334
ADD process_util.py /opt/deepvariant_runner/src/
3435
ADD run_and_verify.sh /opt/deepvariant_runner/bin/
3536
ADD cancel /opt/deepvariant_runner/bin/

‎metrics.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
_DEEP_VARIANT_RUN = 'DeepVariantRun'
4949
_HTTP_REQUEST_TIMEOUT_SEC = 10
5050
_PYTHON = 'PYTHON'
51-
_VIRTUAL_CHC_DEEPVARIANT = 'virtual.chc.deepvariant'
51+
_VIRTUAL_HCLS_DEEPVARIANT = 'virtual.hcls.deepvariant'
5252

5353

5454
def capture_exceptions(func):
@@ -85,7 +85,7 @@ def __init__(self,
8585
def to_json(self, **kwargs):
8686
"""Encodes data in json."""
8787
event_dict = {
88-
'project_number': self._project_number,
88+
'project_number': str(self._project_number),
8989
'event_name': self._event_name,
9090
'event_type': self._event_type,
9191
'console_type': self._console_type,
@@ -118,7 +118,7 @@ def add_metrics(self, project_number: int,
118118
event_type=_DEEP_VARIANT_RUN,
119119
project_number=project_number,
120120
console_type=_CLOUD_HCLS,
121-
page_hostname=_VIRTUAL_CHC_DEEPVARIANT,
121+
page_hostname=_VIRTUAL_HCLS_DEEPVARIANT,
122122
event_metadata={k: v for k, v in metrics_kw.items()})
123123
self._events.append(concord_event)
124124

‎metrics_test.py‎

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -87,43 +87,49 @@ def test_submit_metrics(self, unused_mock_time, mock_requests_post):
8787
json.dumps(
8888
{
8989
'console_type': 'CLOUD_HCLS',
90-
'event_metadata': [{
91-
'key': 'attribute_1',
92-
'value': '1'
93-
},
94-
{
95-
'key': 'attribute_2',
96-
'value': 'string-1'
97-
},
98-
{
99-
'key': 'attribute_3',
100-
'value': 'True'
101-
}],
90+
'event_metadata': [
91+
{
92+
'key': 'attribute_1',
93+
'value': '1'
94+
},
95+
{
96+
'key': 'attribute_2',
97+
'value': 'string-1'
98+
},
99+
{
100+
'key': 'attribute_3',
101+
'value': 'True'
102+
}
103+
],
102104
'event_name': 'test-metrics-1',
103105
'event_type': 'DeepVariantRun',
104-
'page_hostname': 'virtual.chc.deepvariant',
105-
'project_number': 123
106+
'page_hostname': 'virtual.hcls.deepvariant',
107+
'project_number': '123'
106108
},
107109
sort_keys=True)
108110
},
109111
{
110112
'source_extension_json':
111113
json.dumps({
112114
'console_type': 'CLOUD_HCLS',
113-
'event_metadata': [{
114-
'key': 'attribute_1',
115-
'value': '2'
116-
}, {
117-
'key': 'attribute_2',
118-
'value': 'string-2'
119-
}, {
120-
'key': 'attribute_3',
121-
'value': 'True'
122-
}],
115+
'event_metadata': [
116+
{
117+
'key': 'attribute_1',
118+
'value': '2'
119+
},
120+
{
121+
'key': 'attribute_2',
122+
'value': 'string-2'
123+
},
124+
{
125+
'key': 'attribute_3',
126+
'value': 'True'
127+
}
128+
],
123129
'event_name': 'test-metrics-2',
124130
'event_type': 'DeepVariantRun',
125-
'page_hostname': 'virtual.chc.deepvariant',
126-
'project_number': 123
131+
'page_hostname': 'virtual.hcls.deepvariant',
132+
'project_number': '123'
127133
},
128134
sort_keys=True)
129135
}
@@ -162,8 +168,8 @@ def expected_post_data(request_time_ms):
162168
}],
163169
'event_name': 'test-metrics-1',
164170
'event_type': 'DeepVariantRun',
165-
'page_hostname': 'virtual.chc.deepvariant',
166-
'project_number': 123
171+
'page_hostname': 'virtual.hcls.deepvariant',
172+
'project_number': '123'
167173
},
168174
sort_keys=True)
169175
},
@@ -177,8 +183,8 @@ def expected_post_data(request_time_ms):
177183
}],
178184
'event_name': 'test-metrics-2',
179185
'event_type': 'DeepVariantRun',
180-
'page_hostname': 'virtual.chc.deepvariant',
181-
'project_number': 123
186+
'page_hostname': 'virtual.hcls.deepvariant',
187+
'project_number': '123'
182188
},
183189
sort_keys=True)
184190
},
@@ -192,8 +198,8 @@ def expected_post_data(request_time_ms):
192198
}],
193199
'event_name': 'test-metrics-3',
194200
'event_type': 'DeepVariantRun',
195-
'page_hostname': 'virtual.chc.deepvariant',
196-
'project_number': 123
201+
'page_hostname': 'virtual.hcls.deepvariant',
202+
'project_number': '123'
197203
},
198204
sort_keys=True)
199205
}

0 commit comments

Comments
 (0)