Skip to content

Commit 6ec838c

Browse files
priyansh-sumopriyansh-sumo
committed
EventHubs
1 parent a90e2f9 commit 6ec838c

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

‎EventHubs/target/logs_build/EventHubs_Logs/sumoclient.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
/**
33
* Created by duc on 6/30/17.
44
*/
5-
var https = require('https');
6-
var zlib= require('zlib');
7-
var url = require('url');
5+
var https = require('node:https');
6+
var zlib = require('node:zlib');
7+
var url = require('node:url');
88

99
var bucket = require('./messagebucket');
1010
var sumoutils = require('./sumoutils.js');
@@ -22,7 +22,7 @@ var metadataMap = {"category":"X-Sumo-Category","sourceName":"X-Sumo-Name","sou
2222
* has been attempted to sent to Sumo (either successfully or over max retries).
2323
* @constructor
2424
*/
25-
function SumoClient(options, context, flush_failure_callback,success_callback) {
25+
function SumoClient(options, context, flush_failure_callback, success_callback) {
2626
let myOptions = options || {};
2727
if (myOptions.urlString) {
2828
let urlObj = url.parse(options.urlString);
@@ -125,7 +125,7 @@ SumoClient.prototype.flushBucketToSumo = function(metaKey) {
125125
var self = this;
126126
let curOptions = Object.assign({},this.options);
127127

128-
this.context.log("Flush buffer for metaKey:"+metaKey);
128+
this.context.debug("Flush buffer for metaKey:"+metaKey);
129129

130130
function httpSend(messageArray,data) {
131131
return new Promise( (resolve,reject) => {
@@ -173,11 +173,12 @@ SumoClient.prototype.flushBucketToSumo = function(metaKey) {
173173
if (curOptions.compress_data) {
174174
curOptions.headers['Content-Encoding'] = 'gzip';
175175

176-
zlib.gzip(msgArray.join('\n'),function(e,compressed_data){
176+
return zlib.gzip(msgArray.join('\n'),function(e,compressed_data){
177177
if (!e) {
178-
sumoutils.p_retryMax(httpSend,self.MaxAttempts,self.RetryInterval,[msgArray,compressed_data])
178+
self.context.debug("gzip successful");
179+
return sumoutils.p_retryMax(httpSend,self.MaxAttempts,self.RetryInterval,[msgArray,compressed_data])
179180
.then(()=> {
180-
//self.context.log("Succesfully sent to Sumo after "+self.MaxAttempts);
181+
self.context.debug("Successfully sent to Sumo after "+self.MaxAttempts);
181182
self.success_callback(self.context);}
182183
)
183184
.catch((err) => {
@@ -195,7 +196,7 @@ SumoClient.prototype.flushBucketToSumo = function(metaKey) {
195196
});
196197
} else {
197198
//self.context.log('Send raw data to Sumo');
198-
sumoutils.p_retryMax(httpSend,self.MaxAttempts,self.RetryInterval,[msgArray,msgArray.join('\n')])
199+
return sumoutils.p_retryMax(httpSend,self.MaxAttempts,self.RetryInterval,[msgArray,msgArray.join('\n')])
199200
.then(()=> { self.success_callback(self.context);})
200201
.catch((err) => {
201202
self.messagesFailed += msgArray.length;
@@ -251,7 +252,7 @@ function FlushFailureHandler (messageArray,ctx) {
251252
};
252253

253254
/**
254-
* Default built-in callback function to handle successful sents. It simply logs a success message
255+
* Default built-in callback function to handle successful sent. It simply logs a success message
255256
* @param ctx is a context variable that supports a log method
256257
* @constructor
257258
*/
@@ -263,5 +264,4 @@ module.exports = {
263264
SumoClient:SumoClient,
264265
FlushFailureHandler:FlushFailureHandler,
265266
DefaultSuccessHandler:DefaultSuccessHandler
266-
}
267-
267+
}

‎EventHubs/target/logs_build/EventHubs_Logs/sumometricclient.js‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
/**
33
* Created by duc on 6/30/17. This is a client for metric
44
*/
5-
var https = require('https');
6-
var zlib= require('zlib');
7-
var url = require('url');
5+
var https = require('node:https');
6+
var zlib = require('node:zlib');
7+
var url = require('node:url');
88

99
var sumoclient = require('./sumoclient');
1010
var bucket = require('./messagebucket');
@@ -119,7 +119,7 @@ SumoMetricClient.prototype.flushBucketToSumo = function(metaKey) {
119119
var self = this;
120120
let curOptions = Object.assign({},this.options);
121121

122-
this.context.log("Flush METRIC buffer for metaKey:"+metaKey);
122+
this.context.debug("Flush METRIC buffer for metaKey:"+metaKey);
123123

124124
function httpSend(messageArray,data) {
125125

@@ -170,11 +170,12 @@ SumoMetricClient.prototype.flushBucketToSumo = function(metaKey) {
170170
if (curOptions.compress_data) {
171171
curOptions.headers['Content-Encoding'] = 'gzip';
172172

173-
zlib.gzip(msgArray.join('\n'),function(e,compressed_data){
173+
return zlib.gzip(msgArray.join('\n'),function(e,compressed_data){
174174
if (!e) {
175+
self.context.debug("gzip successful");
175176
sumoutils.p_retryMax(httpSend,self.MaxAttempts,self.RetryInterval,[msgArray,compressed_data])
176177
.then(()=> {
177-
//self.context.log("Succesfully sent to Sumo after "+self.MaxAttempts);
178+
self.context.debug("Successfully sent to Sumo after "+self.MaxAttempts);
178179
self.success_callback(self.context);}
179180
)
180181
.catch((err) => {
@@ -192,13 +193,13 @@ SumoMetricClient.prototype.flushBucketToSumo = function(metaKey) {
192193
});
193194
} else {
194195
//self.context.log('Send raw data to Sumo');
195-
sumoutils.p_retryMax(httpSend,self.MaxAttempts,self.RetryInterval,[msgArray,msgArray.join('\n')])
196+
return sumoutils.p_retryMax(httpSend,self.MaxAttempts,self.RetryInterval,[msgArray,msgArray.join('\n')])
196197
.then(()=> { self.success_callback(self.context);})
197-
.catch((err) => {
198-
self.messagesFailed += msgArray.length;
199-
self.messagesAttempted += msgArray.length;
200-
self.context.log("Failed to send after retries: " + self.MaxAttempts + " " + JSON.stringify(err) + ' messagesAttempted: ' + self.messagesAttempted + ' messagesReceived: ' + self.messagesReceived);
201-
self.failure_callback(msgArray,self.context);
198+
.catch((err) => {
199+
self.messagesFailed += msgArray.length;
200+
self.messagesAttempted += msgArray.length;
201+
self.context.log("Failed to send after retries: " + self.MaxAttempts + " " + JSON.stringify(err) + ' messagesAttempted: ' + self.messagesAttempted + ' messagesReceived: ' + self.messagesReceived);
202+
self.failure_callback(msgArray,self.context);
202203
});
203204
}
204205
}
@@ -216,7 +217,7 @@ function FlushFailureHandler (messageArray,ctx) {
216217
};
217218

218219
/**
219-
* Default built-in callback function to handle successful sents. It simply logs a success message
220+
* Default built-in callback function to handle successful sent. It simply logs a success message
220221
* @param ctx is a context variable that supports a log method
221222
* @constructor
222223
*/
@@ -228,5 +229,4 @@ module.exports = {
228229
SumoMetricClient:SumoMetricClient,
229230
FlushFailureHandler:FlushFailureHandler,
230231
DefaultSuccessHandler:DefaultSuccessHandler
231-
}
232-
232+
}

‎EventHubs/target/metrics_build/EventHubs_Metrics/index.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
var sumoMetricHttp = require('./sumometricclient');
77
var dataTransformer = require('./datatransformer');
8+
var sumoClient;
89

910
function isMetricData(msg) {
1011
//if ((msg['metricName']) && (msg['time']) && ((msg['count']) || (msg['total']) || (msg['average'] in msg) ||(msg['maximum']) || (msg['minimum']) )) return true; else return false;

‎EventHubs/target/metrics_build/EventHubs_Metrics/sumoclient.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,10 @@ SumoClient.prototype.flushBucketToSumo = function(metaKey) {
125125
var self = this;
126126
let curOptions = Object.assign({},this.options);
127127

128-
// this.context.log("Flush buffer for metaKey:"+metaKey);
128+
this.context.debug("Flush buffer for metaKey:"+metaKey);
129129

130130
function httpSend(messageArray,data) {
131131
return new Promise( (resolve,reject) => {
132-
//self.context.log("Inside HTTP Send");
133132
var req = https.request(curOptions, function (res) {
134133
var body = '';
135134
res.setEncoding('utf8');
@@ -176,10 +175,10 @@ SumoClient.prototype.flushBucketToSumo = function(metaKey) {
176175

177176
return zlib.gzip(msgArray.join('\n'),function(e,compressed_data){
178177
if (!e) {
179-
// self.context.log("gzip successful");
178+
self.context.debug("gzip successful");
180179
return sumoutils.p_retryMax(httpSend,self.MaxAttempts,self.RetryInterval,[msgArray,compressed_data])
181180
.then(()=> {
182-
// self.context.log("Succesfully sent to Sumo after "+self.MaxAttempts);
181+
self.context.debug("Successfully sent to Sumo after "+self.MaxAttempts);
183182
self.success_callback(self.context);}
184183
)
185184
.catch((err) => {
@@ -253,7 +252,7 @@ function FlushFailureHandler (messageArray,ctx) {
253252
};
254253

255254
/**
256-
* Default built-in callback function to handle successful sents. It simply logs a success message
255+
* Default built-in callback function to handle successful sent. It simply logs a success message
257256
* @param ctx is a context variable that supports a log method
258257
* @constructor
259258
*/

‎EventHubs/target/metrics_build/EventHubs_Metrics/sumometricclient.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ SumoMetricClient.prototype.flushBucketToSumo = function(metaKey) {
119119
var self = this;
120120
let curOptions = Object.assign({},this.options);
121121

122-
this.context.log("Flush METRIC buffer for metaKey:"+metaKey);
122+
this.context.debug("Flush METRIC buffer for metaKey:"+metaKey);
123123

124124
function httpSend(messageArray,data) {
125125

@@ -172,9 +172,10 @@ SumoMetricClient.prototype.flushBucketToSumo = function(metaKey) {
172172

173173
return zlib.gzip(msgArray.join('\n'),function(e,compressed_data){
174174
if (!e) {
175+
self.context.debug("gzip successful");
175176
sumoutils.p_retryMax(httpSend,self.MaxAttempts,self.RetryInterval,[msgArray,compressed_data])
176177
.then(()=> {
177-
//self.context.log("Succesfully sent to Sumo after "+self.MaxAttempts);
178+
self.context.debug("Successfully sent to Sumo after "+self.MaxAttempts);
178179
self.success_callback(self.context);}
179180
)
180181
.catch((err) => {
@@ -216,7 +217,7 @@ function FlushFailureHandler (messageArray,ctx) {
216217
};
217218

218219
/**
219-
* Default built-in callback function to handle successful sents. It simply logs a success message
220+
* Default built-in callback function to handle successful sent. It simply logs a success message
220221
* @param ctx is a context variable that supports a log method
221222
* @constructor
222223
*/
@@ -228,5 +229,4 @@ module.exports = {
228229
SumoMetricClient:SumoMetricClient,
229230
FlushFailureHandler:FlushFailureHandler,
230231
DefaultSuccessHandler:DefaultSuccessHandler
231-
}
232-
232+
}

0 commit comments

Comments
 (0)