64
64
65
65
# http specific
66
66
DD_USE_HTTP = True
67
- DD_BATCH_SIZE = "10"
67
+ DD_BATCH_SIZE = 10
68
68
69
69
# Pass custom tags as environment variable, ensure comma separated, no trailing comma in envvar!
70
70
DD_TAGS = os .environ .get ("DD_TAGS" , "" )
@@ -143,13 +143,13 @@ class DatadogHTTPClient(object):
143
143
_POST = "POST"
144
144
_HEADERS = {"Content-type" : "application/json" }
145
145
146
- def __init__ (self , host , apiKey , timeout = 1 , max_retries = 1 , backoff = 0.5 ):
146
+ def __init__ (self , host , apiKey , timeout = 10 , max_retries = 1 , backoff = 0.5 ):
147
147
self ._url = "https://{}/v1/input/{}" .format (host , apiKey )
148
148
self ._session = requests .Session ()
149
149
self ._session .headers .update (self ._HEADERS )
150
- self ._timeout = timeout if timeout > 0 else 1
151
- self ._max_retries = max_retries if max_retries >= 0 else 1
152
- self ._backoff = backoff if backoff > 0 else 0.5
150
+ self ._timeout = timeout
151
+ self ._max_retries = max_retries
152
+ self ._backoff = backoff
153
153
154
154
def send (self , batch , metadata = None ):
155
155
"""
@@ -159,23 +159,16 @@ def send(self, batch, metadata=None):
159
159
body = json .dumps (batch )
160
160
for retry in range (1 + self ._max_retries ):
161
161
if retry > 0 :
162
- print ("Retrying, retry: {}, max: {}" .format (retry , self ._max_retries ))
163
162
time .sleep (self ._backoff )
164
163
try :
165
164
resp = self ._session .post (
166
165
self ._url , data = body , params = metadata , timeout = self ._timeout
167
166
)
168
167
except Exception as e :
169
168
# most likely a network error
170
- print ("Unexpected exception: {}" .format (str (e )))
171
169
continue
172
170
if resp .status_code >= 500 :
173
171
# server error
174
- print (
175
- "Server error, status {}, reason: {}" .format (
176
- resp .status_code , resp .reason
177
- )
178
- )
179
172
continue
180
173
elif resp .status_code >= 400 :
181
174
# client error
@@ -207,10 +200,7 @@ def batch(self, logs):
207
200
each batch contains at most max_size logs.
208
201
"""
209
202
batches = []
210
- if len (logs ) % self ._max_size != 0 :
211
- nb_batchs = int (len (logs ) / self ._max_size ) + 1
212
- else :
213
- nb_batchs = int (len (logs ) / self ._max_size )
203
+ nb_batchs = int (len (logs ) / self ._max_size ) + 1
214
204
for i in range (0 , nb_batchs ):
215
205
l = i * self ._max_size
216
206
r = (i + 1 ) * self ._max_size
0 commit comments