Skip to content

Commit f3c6a29

Browse files
committed
LNX-329 - Add reporting url checking
1 parent 38c6556 commit f3c6a29

File tree

2 files changed

+30
-7
lines changed

2 files changed

+30
-7
lines changed

stackify/rum.py

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,40 @@ def insert_rum_script():
2222
return None
2323

2424
transaction_id = get_transaction_id()
25-
2625
if not transaction_id:
2726
return None
2827

28+
reporting_url = get_reporting_url()
29+
if not reporting_url:
30+
return None
31+
32+
application_name = config.application
33+
if not application_name:
34+
return None
35+
36+
environment = config.environment
37+
if not environment:
38+
return None
39+
2940
settings = {
3041
"ID": transaction_id
3142
}
3243

33-
application_name = config.application
3444
if application_name:
3545
application_name_b64 = base64.b64encode(application_name.encode("utf-8")).decode("utf-8")
3646
if (application_name_b64):
3747
settings["Name"] = application_name_b64
3848

39-
environment = config.environment
4049
if environment:
4150
environment_b64 = base64.b64encode(environment.encode("utf-8")).decode("utf-8")
4251
if (environment_b64):
4352
settings["Env"] = environment_b64
4453

54+
if reporting_url:
55+
reporting_url_b64 = base64.b64encode(reporting_url.encode("utf-8")).decode("utf-8")
56+
if (reporting_url_b64):
57+
settings["Trans"] = reporting_url_b64
58+
4559
if not settings:
4660
return None
4761

@@ -54,3 +68,6 @@ def insert_rum_script():
5468

5569
def get_transaction_id():
5670
return ''
71+
72+
def get_reporting_url():
73+
return ''

tests/test_rum.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,11 @@ def test_default_insert_rum_script_from_apm_without_transaction(self):
7171
assert not rum_data
7272
self.restore_apm_installed()
7373

74+
@mock.patch('stackify.rum.get_reporting_url')
7475
@mock.patch('stackify.rum.get_transaction_id')
75-
def test_default_insert_rum_script(self, func):
76+
def test_default_insert_rum_script(self, func, func_reporting_url):
7677
func.return_value = '123'
78+
func_reporting_url.return_value = 'test reporting url'
7779
self.update_apm_installed(False)
7880
self.update_common_config(
7981
rum_key='asd',
@@ -84,7 +86,8 @@ def test_default_insert_rum_script(self, func):
8486
rum_settings = {
8587
"ID": '123',
8688
"Name": 'YXBw',
87-
"Env": 'ZW52'
89+
"Env": 'ZW52',
90+
"Trans": 'dGVzdCByZXBvcnRpbmcgdXJs'
8891
}
8992

9093
result = stackify.rum.insert_rum_script()
@@ -131,9 +134,11 @@ def test_default_insert_rum_script_no_details(self):
131134
self.reset_common_config()
132135
self.restore_apm_installed()
133136

137+
@mock.patch('stackify.rum.get_reporting_url')
134138
@mock.patch('stackify.rum.get_transaction_id')
135-
def test_default_insert_rum_script_from_api(self, func):
139+
def test_default_insert_rum_script_from_api(self, func, func_reporting_url):
136140
func.return_value = '123'
141+
func_reporting_url.return_value = 'test reporting url'
137142
self.update_apm_installed(False)
138143
self.create_config(
139144
rum_key='asd1',
@@ -143,7 +148,8 @@ def test_default_insert_rum_script_from_api(self, func):
143148
rum_settings = {
144149
"ID": '123',
145150
"Name": 'YXBwMQ==',
146-
"Env": 'ZW52MQ=='
151+
"Env": 'ZW52MQ==',
152+
"Trans": 'dGVzdCByZXBvcnRpbmcgdXJs'
147153
}
148154
result = stackify.rum.insert_rum_script()
149155
self.reset_common_config()

0 commit comments

Comments
 (0)