@@ -133,7 +133,7 @@ public static JSONObject convertToJson(HistoryEvent historyEvent) throws JSONExc
133133 private static JSONObject convertDAGRecoveredEvent (DAGRecoveredEvent event )
134134 throws JSONException {
135135 JSONObject jsonObject = new JSONObject ();
136- jsonObject .put (ATSConstants .ENTITY ,
136+ jsonObject .put (ATSConstants .ENTITY_ID ,
137137 event .getDagID ().toString ());
138138 jsonObject .put (ATSConstants .ENTITY_TYPE ,
139139 EntityTypes .TEZ_DAG_ID .name ());
@@ -168,7 +168,7 @@ private static JSONObject convertDAGRecoveredEvent(DAGRecoveredEvent event)
168168
169169 private static JSONObject convertAppLaunchedEvent (AppLaunchedEvent event ) throws JSONException {
170170 JSONObject jsonObject = new JSONObject ();
171- jsonObject .put (ATSConstants .ENTITY ,
171+ jsonObject .put (ATSConstants .ENTITY_ID ,
172172 "tez_" + event .getApplicationId ().toString ());
173173 jsonObject .put (ATSConstants .ENTITY_TYPE ,
174174 EntityTypes .TEZ_APPLICATION .name ());
@@ -186,20 +186,20 @@ private static JSONObject convertAppLaunchedEvent(AppLaunchedEvent event) throws
186186
187187 private static JSONObject convertAMLaunchedEvent (AMLaunchedEvent event ) throws JSONException {
188188 JSONObject jsonObject = new JSONObject ();
189- jsonObject .put (ATSConstants .ENTITY ,
189+ jsonObject .put (ATSConstants .ENTITY_ID ,
190190 "tez_" + event .getApplicationAttemptId ().toString ());
191191 jsonObject .put (ATSConstants .ENTITY_TYPE ,
192192 EntityTypes .TEZ_APPLICATION_ATTEMPT .name ());
193193
194194 // Related Entities
195195 JSONArray relatedEntities = new JSONArray ();
196196 JSONObject appEntity = new JSONObject ();
197- appEntity .put (ATSConstants .ENTITY ,
197+ appEntity .put (ATSConstants .ENTITY_ID ,
198198 event .getApplicationAttemptId ().getApplicationId ().toString ());
199199 appEntity .put (ATSConstants .ENTITY_TYPE ,
200200 ATSConstants .APPLICATION_ID );
201201 JSONObject appAttemptEntity = new JSONObject ();
202- appAttemptEntity .put (ATSConstants .ENTITY ,
202+ appAttemptEntity .put (ATSConstants .ENTITY_ID ,
203203 event .getApplicationAttemptId ().toString ());
204204 appAttemptEntity .put (ATSConstants .ENTITY_TYPE ,
205205 ATSConstants .APPLICATION_ATTEMPT_ID );
@@ -227,20 +227,20 @@ private static JSONObject convertAMLaunchedEvent(AMLaunchedEvent event) throws J
227227
228228 private static JSONObject convertAMStartedEvent (AMStartedEvent event ) throws JSONException {
229229 JSONObject jsonObject = new JSONObject ();
230- jsonObject .put (ATSConstants .ENTITY ,
230+ jsonObject .put (ATSConstants .ENTITY_ID ,
231231 "tez_" + event .getApplicationAttemptId ().toString ());
232232 jsonObject .put (ATSConstants .ENTITY_TYPE ,
233233 EntityTypes .TEZ_APPLICATION_ATTEMPT .name ());
234234
235235 // Related Entities
236236 JSONArray relatedEntities = new JSONArray ();
237237 JSONObject appEntity = new JSONObject ();
238- appEntity .put (ATSConstants .ENTITY ,
238+ appEntity .put (ATSConstants .ENTITY_ID ,
239239 event .getApplicationAttemptId ().getApplicationId ().toString ());
240240 appEntity .put (ATSConstants .ENTITY_TYPE ,
241241 ATSConstants .APPLICATION_ID );
242242 JSONObject appAttemptEntity = new JSONObject ();
243- appAttemptEntity .put (ATSConstants .ENTITY ,
243+ appAttemptEntity .put (ATSConstants .ENTITY_ID ,
244244 event .getApplicationAttemptId ().toString ());
245245 appAttemptEntity .put (ATSConstants .ENTITY_TYPE ,
246246 ATSConstants .APPLICATION_ATTEMPT_ID );
@@ -262,20 +262,20 @@ private static JSONObject convertAMStartedEvent(AMStartedEvent event) throws JSO
262262
263263 private static JSONObject convertContainerLaunchedEvent (ContainerLaunchedEvent event ) throws JSONException {
264264 JSONObject jsonObject = new JSONObject ();
265- jsonObject .put (ATSConstants .ENTITY ,
265+ jsonObject .put (ATSConstants .ENTITY_ID ,
266266 "tez_" + event .getContainerId ().toString ());
267267 jsonObject .put (ATSConstants .ENTITY_TYPE ,
268268 EntityTypes .TEZ_CONTAINER_ID .name ());
269269
270270 JSONArray relatedEntities = new JSONArray ();
271271 JSONObject appAttemptEntity = new JSONObject ();
272- appAttemptEntity .put (ATSConstants .ENTITY ,
272+ appAttemptEntity .put (ATSConstants .ENTITY_ID ,
273273 event .getApplicationAttemptId ().toString ());
274274 appAttemptEntity .put (ATSConstants .ENTITY_TYPE ,
275275 EntityTypes .TEZ_APPLICATION_ATTEMPT .name ());
276276
277277 JSONObject containerEntity = new JSONObject ();
278- containerEntity .put (ATSConstants .ENTITY , event .getContainerId ().toString ());
278+ containerEntity .put (ATSConstants .ENTITY_ID , event .getContainerId ().toString ());
279279 containerEntity .put (ATSConstants .ENTITY_TYPE , ATSConstants .CONTAINER_ID );
280280
281281 relatedEntities .put (appAttemptEntity );
@@ -301,20 +301,20 @@ private static JSONObject convertContainerLaunchedEvent(ContainerLaunchedEvent e
301301 private static JSONObject convertContainerStoppedEvent (ContainerStoppedEvent event ) throws JSONException {
302302 // structure is identical to ContainerLaunchedEvent
303303 JSONObject jsonObject = new JSONObject ();
304- jsonObject .put (ATSConstants .ENTITY ,
304+ jsonObject .put (ATSConstants .ENTITY_ID ,
305305 "tez_" + event .getContainerId ().toString ());
306306 jsonObject .put (ATSConstants .ENTITY_TYPE ,
307307 EntityTypes .TEZ_CONTAINER_ID .name ());
308308
309309 JSONArray relatedEntities = new JSONArray ();
310310 JSONObject appAttemptEntity = new JSONObject ();
311- appAttemptEntity .put (ATSConstants .ENTITY ,
311+ appAttemptEntity .put (ATSConstants .ENTITY_ID ,
312312 event .getApplicationAttemptId ().toString ());
313313 appAttemptEntity .put (ATSConstants .ENTITY_TYPE ,
314314 EntityTypes .TEZ_APPLICATION_ATTEMPT .name ());
315315
316316 JSONObject containerEntity = new JSONObject ();
317- containerEntity .put (ATSConstants .ENTITY , event .getContainerId ().toString ());
317+ containerEntity .put (ATSConstants .ENTITY_ID , event .getContainerId ().toString ());
318318 containerEntity .put (ATSConstants .ENTITY_TYPE , ATSConstants .CONTAINER_ID );
319319
320320 relatedEntities .put (appAttemptEntity );
@@ -343,7 +343,7 @@ private static JSONObject convertContainerStoppedEvent(ContainerStoppedEvent eve
343343
344344 private static JSONObject convertDAGFinishedEvent (DAGFinishedEvent event ) throws JSONException {
345345 JSONObject jsonObject = new JSONObject ();
346- jsonObject .put (ATSConstants .ENTITY ,
346+ jsonObject .put (ATSConstants .ENTITY_ID ,
347347 event .getDAGID ().toString ());
348348 jsonObject .put (ATSConstants .ENTITY_TYPE ,
349349 EntityTypes .TEZ_DAG_ID .name ());
@@ -386,7 +386,7 @@ private static JSONObject convertDAGFinishedEvent(DAGFinishedEvent event) throws
386386
387387 private static JSONObject convertDAGInitializedEvent (DAGInitializedEvent event ) throws JSONException {
388388 JSONObject jsonObject = new JSONObject ();
389- jsonObject .put (ATSConstants .ENTITY ,
389+ jsonObject .put (ATSConstants .ENTITY_ID ,
390390 event .getDAGID ().toString ());
391391 jsonObject .put (ATSConstants .ENTITY_TYPE ,
392392 EntityTypes .TEZ_DAG_ID .name ());
@@ -418,7 +418,7 @@ private static JSONObject convertDAGInitializedEvent(DAGInitializedEvent event)
418418
419419 private static JSONObject convertDAGStartedEvent (DAGStartedEvent event ) throws JSONException {
420420 JSONObject jsonObject = new JSONObject ();
421- jsonObject .put (ATSConstants .ENTITY ,
421+ jsonObject .put (ATSConstants .ENTITY_ID ,
422422 event .getDAGID ().toString ());
423423 jsonObject .put (ATSConstants .ENTITY_TYPE ,
424424 EntityTypes .TEZ_DAG_ID .name ());
@@ -441,35 +441,35 @@ private static JSONObject convertDAGStartedEvent(DAGStartedEvent event) throws J
441441
442442 private static JSONObject convertDAGSubmittedEvent (DAGSubmittedEvent event ) throws JSONException {
443443 JSONObject jsonObject = new JSONObject ();
444- jsonObject .put (ATSConstants .ENTITY ,
444+ jsonObject .put (ATSConstants .ENTITY_ID ,
445445 event .getDAGID ().toString ());
446446 jsonObject .put (ATSConstants .ENTITY_TYPE ,
447447 EntityTypes .TEZ_DAG_ID .name ());
448448
449449 // Related Entities
450450 JSONArray relatedEntities = new JSONArray ();
451451 JSONObject tezAppEntity = new JSONObject ();
452- tezAppEntity .put (ATSConstants .ENTITY ,
452+ tezAppEntity .put (ATSConstants .ENTITY_ID ,
453453 "tez_" + event .getApplicationAttemptId ().getApplicationId ().toString ());
454454 tezAppEntity .put (ATSConstants .ENTITY_TYPE ,
455455 EntityTypes .TEZ_APPLICATION .name ());
456456 JSONObject tezAppAttemptEntity = new JSONObject ();
457- tezAppAttemptEntity .put (ATSConstants .ENTITY ,
457+ tezAppAttemptEntity .put (ATSConstants .ENTITY_ID ,
458458 "tez_" + event .getApplicationAttemptId ().toString ());
459459 tezAppAttemptEntity .put (ATSConstants .ENTITY_TYPE ,
460460 EntityTypes .TEZ_APPLICATION_ATTEMPT .name ());
461461 JSONObject appEntity = new JSONObject ();
462- appEntity .put (ATSConstants .ENTITY ,
462+ appEntity .put (ATSConstants .ENTITY_ID ,
463463 event .getApplicationAttemptId ().getApplicationId ().toString ());
464464 appEntity .put (ATSConstants .ENTITY_TYPE ,
465465 ATSConstants .APPLICATION_ID );
466466 JSONObject appAttemptEntity = new JSONObject ();
467- appAttemptEntity .put (ATSConstants .ENTITY ,
467+ appAttemptEntity .put (ATSConstants .ENTITY_ID ,
468468 event .getApplicationAttemptId ().toString ());
469469 appAttemptEntity .put (ATSConstants .ENTITY_TYPE ,
470470 ATSConstants .APPLICATION_ATTEMPT_ID );
471471 JSONObject userEntity = new JSONObject ();
472- userEntity .put (ATSConstants .ENTITY ,
472+ userEntity .put (ATSConstants .ENTITY_ID ,
473473 event .getUser ());
474474 userEntity .put (ATSConstants .ENTITY_TYPE ,
475475 ATSConstants .USER );
@@ -531,7 +531,7 @@ private static JSONObject convertDAGSubmittedEvent(DAGSubmittedEvent event) thro
531531
532532 private static JSONObject convertTaskAttemptFinishedEvent (TaskAttemptFinishedEvent event ) throws JSONException {
533533 JSONObject jsonObject = new JSONObject ();
534- jsonObject .put (ATSConstants .ENTITY , event .getTaskAttemptID ().toString ());
534+ jsonObject .put (ATSConstants .ENTITY_ID , event .getTaskAttemptID ().toString ());
535535 jsonObject .put (ATSConstants .ENTITY_TYPE ,
536536 EntityTypes .TEZ_TASK_ATTEMPT_ID .name ());
537537
@@ -590,22 +590,22 @@ private static JSONObject convertTaskAttemptFinishedEvent(TaskAttemptFinishedEve
590590
591591 private static JSONObject convertTaskAttemptStartedEvent (TaskAttemptStartedEvent event ) throws JSONException {
592592 JSONObject jsonObject = new JSONObject ();
593- jsonObject .put (ATSConstants .ENTITY , event .getTaskAttemptID ().toString ());
593+ jsonObject .put (ATSConstants .ENTITY_ID , event .getTaskAttemptID ().toString ());
594594 jsonObject .put (ATSConstants .ENTITY_TYPE ,
595595 EntityTypes .TEZ_TASK_ATTEMPT_ID .name ());
596596
597597 // Related entities
598598 JSONArray relatedEntities = new JSONArray ();
599599 JSONObject nodeEntity = new JSONObject ();
600- nodeEntity .put (ATSConstants .ENTITY , event .getNodeId ().toString ());
600+ nodeEntity .put (ATSConstants .ENTITY_ID , event .getNodeId ().toString ());
601601 nodeEntity .put (ATSConstants .ENTITY_TYPE , ATSConstants .NODE_ID );
602602
603603 JSONObject containerEntity = new JSONObject ();
604- containerEntity .put (ATSConstants .ENTITY , event .getContainerId ().toString ());
604+ containerEntity .put (ATSConstants .ENTITY_ID , event .getContainerId ().toString ());
605605 containerEntity .put (ATSConstants .ENTITY_TYPE , ATSConstants .CONTAINER_ID );
606606
607607 JSONObject taskEntity = new JSONObject ();
608- taskEntity .put (ATSConstants .ENTITY , event .getTaskID ().toString ());
608+ taskEntity .put (ATSConstants .ENTITY_ID , event .getTaskID ().toString ());
609609 taskEntity .put (ATSConstants .ENTITY_TYPE , EntityTypes .TEZ_TASK_ID .name ());
610610
611611 relatedEntities .put (nodeEntity );
@@ -633,7 +633,7 @@ private static JSONObject convertTaskAttemptStartedEvent(TaskAttemptStartedEvent
633633
634634 private static JSONObject convertTaskFinishedEvent (TaskFinishedEvent event ) throws JSONException {
635635 JSONObject jsonObject = new JSONObject ();
636- jsonObject .put (ATSConstants .ENTITY , event .getTaskID ().toString ());
636+ jsonObject .put (ATSConstants .ENTITY_ID , event .getTaskID ().toString ());
637637 jsonObject .put (ATSConstants .ENTITY_TYPE , EntityTypes .TEZ_TASK_ID .name ());
638638
639639 // Events
@@ -664,13 +664,13 @@ private static JSONObject convertTaskFinishedEvent(TaskFinishedEvent event) thro
664664
665665 private static JSONObject convertTaskStartedEvent (TaskStartedEvent event ) throws JSONException {
666666 JSONObject jsonObject = new JSONObject ();
667- jsonObject .put (ATSConstants .ENTITY , event .getTaskID ().toString ());
667+ jsonObject .put (ATSConstants .ENTITY_ID , event .getTaskID ().toString ());
668668 jsonObject .put (ATSConstants .ENTITY_TYPE , EntityTypes .TEZ_TASK_ID .name ());
669669
670670 // Related entities
671671 JSONArray relatedEntities = new JSONArray ();
672672 JSONObject vertexEntity = new JSONObject ();
673- vertexEntity .put (ATSConstants .ENTITY , event .getVertexID ().toString ());
673+ vertexEntity .put (ATSConstants .ENTITY_ID , event .getVertexID ().toString ());
674674 vertexEntity .put (ATSConstants .ENTITY_TYPE , EntityTypes .TEZ_VERTEX_ID .name ());
675675 relatedEntities .put (vertexEntity );
676676 jsonObject .put (ATSConstants .RELATED_ENTITIES , relatedEntities );
@@ -696,7 +696,7 @@ private static JSONObject convertTaskStartedEvent(TaskStartedEvent event) throws
696696
697697 private static JSONObject convertVertexFinishedEvent (VertexFinishedEvent event ) throws JSONException {
698698 JSONObject jsonObject = new JSONObject ();
699- jsonObject .put (ATSConstants .ENTITY , event .getVertexID ().toString ());
699+ jsonObject .put (ATSConstants .ENTITY_ID , event .getVertexID ().toString ());
700700 jsonObject .put (ATSConstants .ENTITY_TYPE , EntityTypes .TEZ_VERTEX_ID .name ());
701701
702702 // Events
@@ -737,7 +737,7 @@ private static JSONObject convertVertexFinishedEvent(VertexFinishedEvent event)
737737
738738 private static JSONObject convertVertexReconfigureDoneEvent (VertexConfigurationDoneEvent event ) throws JSONException {
739739 JSONObject jsonObject = new JSONObject ();
740- jsonObject .put (ATSConstants .ENTITY , event .getVertexID ().toString ());
740+ jsonObject .put (ATSConstants .ENTITY_ID , event .getVertexID ().toString ());
741741 jsonObject .put (ATSConstants .ENTITY_TYPE , EntityTypes .TEZ_VERTEX_ID .name ());
742742
743743 // Events
@@ -772,13 +772,13 @@ private static JSONObject convertVertexReconfigureDoneEvent(VertexConfigurationD
772772
773773 private static JSONObject convertVertexInitializedEvent (VertexInitializedEvent event ) throws JSONException {
774774 JSONObject jsonObject = new JSONObject ();
775- jsonObject .put (ATSConstants .ENTITY , event .getVertexID ().toString ());
775+ jsonObject .put (ATSConstants .ENTITY_ID , event .getVertexID ().toString ());
776776 jsonObject .put (ATSConstants .ENTITY_TYPE , EntityTypes .TEZ_VERTEX_ID .name ());
777777
778778 // Related entities
779779 JSONArray relatedEntities = new JSONArray ();
780780 JSONObject vertexEntity = new JSONObject ();
781- vertexEntity .put (ATSConstants .ENTITY , event .getDAGID ().toString ());
781+ vertexEntity .put (ATSConstants .ENTITY_ID , event .getDAGID ().toString ());
782782 vertexEntity .put (ATSConstants .ENTITY_TYPE , EntityTypes .TEZ_DAG_ID .name ());
783783 relatedEntities .put (vertexEntity );
784784 jsonObject .put (ATSConstants .RELATED_ENTITIES , relatedEntities );
@@ -812,13 +812,13 @@ private static JSONObject convertVertexInitializedEvent(VertexInitializedEvent e
812812 private static JSONObject convertVertexStartedEvent (VertexStartedEvent event )
813813 throws JSONException {
814814 JSONObject jsonObject = new JSONObject ();
815- jsonObject .put (ATSConstants .ENTITY , event .getVertexID ().toString ());
815+ jsonObject .put (ATSConstants .ENTITY_ID , event .getVertexID ().toString ());
816816 jsonObject .put (ATSConstants .ENTITY_TYPE , EntityTypes .TEZ_VERTEX_ID .name ());
817817
818818 // Related entities
819819 JSONArray relatedEntities = new JSONArray ();
820820 JSONObject vertexEntity = new JSONObject ();
821- vertexEntity .put (ATSConstants .ENTITY , event .getDAGID ().toString ());
821+ vertexEntity .put (ATSConstants .ENTITY_ID , event .getDAGID ().toString ());
822822 vertexEntity .put (ATSConstants .ENTITY_TYPE , EntityTypes .TEZ_DAG_ID .name ());
823823 relatedEntities .put (vertexEntity );
824824 jsonObject .put (ATSConstants .RELATED_ENTITIES , relatedEntities );
0 commit comments