Stats: json format #22

luckydonald · 2020-12-11T15:31:03Z

The work regarding #17.

With 374928c we could merge a working version where the json is still missing a few fields, to iterate from there.

It is available via the normal stats endpoint by calling /json as the path.
Everything else will have the old text style.

luckydonald · 2020-12-11T15:56:10Z

/label ~Enhancement

Edit: Ooops, I tried.

telegram-bot-api/ClientParameters.h

giuseppeM99 · 2020-12-11T23:58:04Z

ayyyy we broky

luckydonald · 2020-12-11T23:59:12Z

aww crap.
Like merge conflict or really dead?

MarcoBuster · 2020-12-12T00:00:51Z

The latest commit on our master branch (100a7cc) it's causing merge conflicts. While we review and test your code, please resolve them.

…nternal id.

…via $TELEGRAM_STAT_HIDE_SENSIBLE_DATA=1, too.

telegram-bot-api/HttpStatConnection.cpp

# Conflicts: # README.md # telegram-bot-api/ClientManager.cpp

MarcoBuster · 2021-01-04T10:40:50Z

@luckydonald status? We can review it?

luckydonald · 2021-01-04T19:30:53Z

Ah, yes I think so.

… type.

luckydonald · 2021-01-17T21:31:53Z

Well if those HttpStatConnection thingies are indeed created for every call, that global variable in the object could be used for the decision if we serve as application/json or text/plain.

luckydonald · 2021-01-17T21:32:26Z

I created dc397e0 with that new way.

giuseppeM99 · 2021-01-21T12:56:36Z

telegram-bot-api/StatsJson.h

 };

 class JsonStatsBotStats : public td::Jsonable {
 public:
-  explicit JsonStatsBotStats(const std::vector<ServerBotStat> stats) : stats_(stats) {
+  explicit JsonStatsBotStats(td::vector<ServerBotStat> stats) : stats_(std::move(stats)) {
+    CHECK(BotStatActor::SIZE == 4 && "Check that we have 4 fields.");


&& "Check that we have 4 fields." doesn't make sense

telegram-bot-api/StatsJson.h

luckydonald

Whoops. Did I start a review on my own now?

andrew-ld · 2021-01-23T10:58:33Z

telegram-bot-api/ClientManager.cpp

+    jb_root.leave();
+    sb.clear();
+  } else {
+    jb_root("⚠️ WARNING", "The json representation is still a work in progress and will be changed later!");


lol remove emoji

If your parser can't handle the unicode, you're out of luck with receiving text messages in telegram anyway...

@andrew-ld so?

giuseppeM99 · 2021-01-24T15:33:40Z

If this is the only issue you found i think is ok to merge, after all this is more a visual warning for those who open the json from the browser than an actual parameter to be read by a script

MarcoBuster · 2021-01-24T17:10:10Z

@giuseppeM99 @luckydonald merged.

luckydonald changed the title ~~Json stats + --stats-hide-sensible-data~~ Json stats and --stats-hide-sensible-data flag Dec 11, 2020

MarcoBuster added the enhancement New feature or request label Dec 11, 2020

MarcoBuster linked an issue Dec 11, 2020 that may be closed by this pull request

Enhance stats #17

Closed

4 tasks

luckydonald commented Dec 11, 2020

View reviewed changes

telegram-bot-api/ClientParameters.h Outdated Show resolved Hide resolved

giuseppeM99 requested a review from andrew-ld December 11, 2020 23:16

luckydonald added 19 commits December 12, 2020 01:14

Started implementing the json stats.

a73828c

Prepared a toggle for hiding the token from the stats.

757517b

Added a whole lot of fun stuff to get json stats working.

6629046

WIP for jsoning the bots.

573758a

The bots are now only a list of objects representing a score and an i…

752ead1

…nternal id.

Added memory and connection stats to the json.

9bf1598

Fixed the json not cleanly ending with a }.

1e8cf51

/json now returs json, everything else returns the normal text.

ba55a23

Return the correct buffer depending on what format is needed.

fe51662

Reset the json buffer if unused.

3195de1

Implemented the bot display.

044ffbe

stats_hide_sensible_data is a better name.

cea3e0a

Fixed that boolean ending up there.

29b62cf

The webhook might have sensible data as well, let's hide it.

9504033

Finally the CLI flag for stats_hide_sensible_data.

eef3685

Null the memory segment if there's an error.

2de8b3c

Fixed the rename of that function.

9a1bcbd

Documented the new parameter, and made it settable in the conatiners …

fd887b2

…via $TELEGRAM_STAT_HIDE_SENSIBLE_DATA=1, too.

This todo is now solved.

b6961d2

luckydonald force-pushed the json_stats branch from 3b880a8 to b6961d2 Compare December 12, 2020 00:18

A bit of cleanup.

1a1be91

andrew-ld reviewed Dec 13, 2020

View reviewed changes

telegram-bot-api/HttpStatConnection.cpp Outdated Show resolved Hide resolved

telegram-bot-api/HttpStatConnection.cpp Outdated Show resolved Hide resolved

luckydonald added 4 commits December 16, 2020 01:22

Improved the bots[].stats array to be all dictionary now.

5378de4

Merge remote-tracking branch 'original/master' into json_stats

6d065ae

# Conflicts: # README.md # telegram-bot-api/ClientManager.cpp

Fixed doubled half-filled cpu parts.

d15fcbe

Proper cpu stats now.

b0de46b

giuseppeM99 requested review from andrew-ld and MarcoBuster January 17, 2021 21:06

luckydonald added 2 commits January 17, 2021 22:24

Made as_json a attribute of the HttpStatConnection as requested.

11cfc50

Now that we have that global as_json_ we can use that for the content…

dc397e0

… type.

giuseppeM99 reviewed Jan 21, 2021

View reviewed changes

giuseppeM99 requested changes Jan 21, 2021

View reviewed changes

telegram-bot-api/StatsJson.h Outdated Show resolved Hide resolved

telegram-bot-api/StatsJson.h Outdated Show resolved Hide resolved

telegram-bot-api/StatsJson.h Outdated Show resolved Hide resolved

luckydonald added 2 commits January 21, 2021 14:43

Removed unneeded class.

15f57b6

Used std::move(score_id_pair) throughout it's lifecycle.

035c748

giuseppeM99 reviewed Jan 21, 2021

View reviewed changes

telegram-bot-api/StatsJson.h Outdated Show resolved Hide resolved

Use std::move for two additional fields.

2db8e0c

TDLight bot api automation moved this from Review in progress to Reviewer approved Jan 21, 2021

giuseppeM99 approved these changes Jan 21, 2021

View reviewed changes

luckydonald commented Jan 21, 2021

View reviewed changes

giuseppeM99 mentioned this pull request Jan 22, 2021

Various fixes/improvements for the user mode #49

Merged

MarcoBuster approved these changes Jan 22, 2021

View reviewed changes

andrew-ld reviewed Jan 23, 2021

View reviewed changes

MarcoBuster moved this from Reviewer approved to Review in progress in TDLight bot api Jan 24, 2021

MarcoBuster merged commit de05b42 into tdlight-team:master Jan 24, 2021

TDLight bot api automation moved this from Review in progress to Done Jan 24, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Stats: json format #22

Stats: json format #22

luckydonald commented Dec 11, 2020 •

edited

luckydonald commented Dec 11, 2020 •

edited

giuseppeM99 commented Dec 11, 2020

luckydonald commented Dec 11, 2020

MarcoBuster commented Dec 12, 2020

MarcoBuster commented Jan 4, 2021

luckydonald commented Jan 4, 2021

luckydonald commented Jan 17, 2021

luckydonald commented Jan 17, 2021

giuseppeM99 Jan 21, 2021

luckydonald left a comment •

edited

andrew-ld Jan 23, 2021

luckydonald Jan 23, 2021

luckydonald Jan 23, 2021

MarcoBuster Jan 24, 2021

giuseppeM99 commented Jan 24, 2021 via email •

edited by MarcoBuster

MarcoBuster commented Jan 24, 2021

Stats: json format #22

Stats: json format #22

Conversation

luckydonald commented Dec 11, 2020 • edited

luckydonald commented Dec 11, 2020 • edited

giuseppeM99 commented Dec 11, 2020

luckydonald commented Dec 11, 2020

MarcoBuster commented Dec 12, 2020

MarcoBuster commented Jan 4, 2021

luckydonald commented Jan 4, 2021

luckydonald commented Jan 17, 2021

luckydonald commented Jan 17, 2021

giuseppeM99 Jan 21, 2021

Choose a reason for hiding this comment

luckydonald left a comment • edited

Choose a reason for hiding this comment

andrew-ld Jan 23, 2021

Choose a reason for hiding this comment

luckydonald Jan 23, 2021

Choose a reason for hiding this comment

luckydonald Jan 23, 2021

Choose a reason for hiding this comment

MarcoBuster Jan 24, 2021

Choose a reason for hiding this comment

giuseppeM99 commented Jan 24, 2021 via email • edited by MarcoBuster

MarcoBuster commented Jan 24, 2021

luckydonald commented Dec 11, 2020 •

edited

luckydonald commented Dec 11, 2020 •

edited

luckydonald left a comment •

edited

giuseppeM99 commented Jan 24, 2021 via email •

edited by MarcoBuster