Skip to content

Commit bb718ae

Browse files
zfrzfr
authored
Merge pull request #53 from opsgenie/2.1.3
2.1.3
2 parents f3f1419 + a937043 commit bb718ae

File tree

9 files changed

+53
-51
lines changed

9 files changed

+53
-51
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
44

55
- API version: 2.0.0
6-
- Package version: 2.1.2
6+
- Package version: 2.1.3
77
- Build package: com.atlassian.opsgenie.codegen.geniepy.GeniepyGenerator
88

99
For more information, please visit [https://www.opsgenie.com/contact-us](https://www.opsgenie.com/contact-us)

‎opsgenie_sdk/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
from opsgenie_sdk.models.weekday_time_restriction_interval import WeekdayTimeRestrictionInterval
169169
from opsgenie_sdk.models.weekday_time_restriction_interval_all_of import WeekdayTimeRestrictionIntervalAllOf
170170

171-
__version__ = "2.1.2"
171+
__version__ = "2.1.3"
172172

173173
# import apis into sdk package
174174

‎opsgenie_sdk/api_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
8888
self.default_headers[header_name] = header_value
8989
self.cookie = cookie
9090
# Set default User-Agent.
91-
self.user_agent = 'opsgenie-sdk-python-2.1.2'
91+
self.user_agent = 'opsgenie-sdk-python-2.1.3'
9292

9393
# init metric publishers
9494
self.http_metric_publisher = self.rest_client.http_metric

‎opsgenie_sdk/configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ def to_debug_report(self):
252252
"OS: {env}\n"\
253253
"Python Version: {pyversion}\n"\
254254
"Version of the API: 2.0.0\n"\
255-
"SDK Package Version: 2.1.2".\
255+
"SDK Package Version: 2.1.3".\
256256
format(env=sys.platform, pyversion=sys.version)
257257

258258
def get_host_settings(self):

‎opsgenie_sdk/rest.py

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -236,27 +236,28 @@ def request(self, method, url, query_params=None, headers=None,
236236
# log response body
237237
logger.debug("response body: %s", r.data)
238238

239-
data = self.decodeResponse(r.data)
240239
http_metrics_request = [('method', method), ('url', url), ('query_params', query_params), ('headers', headers),
241240
('body', body), ('post_params', post_params)]
242-
if "message" not in data:
243-
self.http_metric.build_metric(transaction_id=self.configuration.metrics_transaction_id,
244-
duration=data.get("took"),
245-
resource_path=url,
246-
retry_statistics=copy.deepcopy(self.retrying.statistics),
247-
error=False,
248-
status=r.status,
249-
status_code=r.status,
250-
request=http_metrics_request)
251-
else:
252-
self.http_metric.build_metric(transaction_id=self.configuration.metrics_transaction_id,
253-
duration=data.get("took"),
254-
resource_path=url,
255-
retry_statistics=copy.deepcopy(self.retrying.statistics),
256-
error=True,
257-
status=r.status,
258-
status_code=r.status,
259-
request=http_metrics_request)
241+
242+
try:
243+
data = self.decodeResponse(r.data)
244+
duration = data.get("took")
245+
if "message" not in data:
246+
error = False
247+
else:
248+
error = True
249+
except:
250+
duration = None
251+
error = True
252+
253+
self.http_metric.build_metric(transaction_id=self.configuration.metrics_transaction_id,
254+
duration=duration,
255+
resource_path=url,
256+
retry_statistics=copy.deepcopy(self.retrying.statistics),
257+
error=error,
258+
status=r.status,
259+
status_code=r.status,
260+
request=http_metrics_request)
260261

261262
should_retry = self.__checkHttpCode__(r.status)
262263
if should_retry:

‎scripts/sdk/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"packageName": "opsgenie_sdk",
33
"projectName": "opsgenie-sdk",
4-
"packageVersion": "2.1.2",
4+
"packageVersion": "2.1.3",
55
"packageUrl": "https://github.com/opsgenie/opsgenie-python-sdk",
66
"sortParamsByRequiredFlag": "true",
77
"hideGenerationTimestamp": "true",

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from setuptools import setup, find_packages # noqa: H301
1717

1818
NAME = "opsgenie-sdk"
19-
VERSION = "2.1.2"
19+
VERSION = "2.1.3"
2020
# To install the library, run the following
2121
#
2222
# python setup.py install

‎templates/api_client.mustache

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,13 @@ class ApiClient(object):
190190

191191
# perform request and return response
192192
try:
193-
response_data = {{#asyncio}}await {{/asyncio}}{{#tornado}}yield {{/tornado}}self.retrying.call(fn=self.request, method=method, url=url,
194-
query_params=query_params,
195-
headers=header_params,
196-
post_params=post_params,
197-
body=body,
198-
_preload_content=_preload_content,
199-
_request_timeout=_request_timeout)
193+
response_data = {{#asyncio}}await {{/asyncio}}{{#tornado}}yield {{/tornado}}self.retrying(fn=self.request, method=method, url=url,
194+
query_params=query_params,
195+
headers=header_params,
196+
post_params=post_params,
197+
body=body,
198+
_preload_content=_preload_content,
199+
_request_timeout=_request_timeout)
200200
except Exception as exception:
201201
self._sdk_request_details = {
202202
"query_params": query_params,

‎templates/rest.mustache

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -227,27 +227,28 @@ class RESTClientObject(object):
227227
# log response body
228228
logger.debug("response body: %s", r.data)
229229

230-
data = self.decodeResponse(r.data)
231230
http_metrics_request = [('method', method), ('url', url), ('query_params', query_params), ('headers', headers),
232231
('body', body), ('post_params', post_params)]
233-
if "message" not in data:
234-
self.http_metric.build_metric(transaction_id=self.configuration.metrics_transaction_id,
235-
duration=data.get("took"),
236-
resource_path=url,
237-
retry_statistics=copy.deepcopy(self.retrying.statistics),
238-
error=False,
239-
status=r.status,
240-
status_code=r.status,
241-
request=http_metrics_request)
242-
else:
243-
self.http_metric.build_metric(transaction_id=self.configuration.metrics_transaction_id,
244-
duration=data.get("took"),
245-
resource_path=url,
246-
retry_statistics=copy.deepcopy(self.retrying.statistics),
247-
error=True,
248-
status=r.status,
249-
status_code=r.status,
250-
request=http_metrics_request)
232+
233+
try:
234+
data = self.decodeResponse(r.data)
235+
duration = data.get("took")
236+
if "message" not in data:
237+
error = False
238+
else:
239+
error = True
240+
except:
241+
duration = None
242+
error = True
243+
244+
self.http_metric.build_metric(transaction_id=self.configuration.metrics_transaction_id,
245+
duration=duration,
246+
resource_path=url,
247+
retry_statistics=copy.deepcopy(self.retrying.statistics),
248+
error=error,
249+
status=r.status,
250+
status_code=r.status,
251+
request=http_metrics_request)
251252

252253
should_retry = self.__checkHttpCode__(r.status)
253254
if should_retry:

0 commit comments

Comments
 (0)