-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2507 from freimair/monitor
Monitor tweaks, fixes and a new Metric
- Loading branch information
Showing
18 changed files
with
219 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
monitor/src/main/java/bisq/monitor/metric/MarketStats.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| /* | ||
| * This file is part of Bisq. | ||
| * | ||
| * bisq is free software: you can redistribute it and/or modify it | ||
| * under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * bisq is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public | ||
| * License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with bisq. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package bisq.monitor.metric; | ||
|
|
||
| import bisq.monitor.Metric; | ||
| import bisq.monitor.Reporter; | ||
|
|
||
| import bisq.asset.Asset; | ||
| import bisq.asset.AssetRegistry; | ||
|
|
||
| import bisq.network.p2p.storage.payload.ProtectedStoragePayload; | ||
|
|
||
| import org.berndpruenster.netlayer.tor.TorCtlException; | ||
|
|
||
| import com.runjva.sourceforge.jsocks.protocol.SocksSocket; | ||
|
|
||
| import java.net.HttpURLConnection; | ||
| import java.net.Socket; | ||
| import java.net.URL; | ||
| import java.net.URLConnection; | ||
|
|
||
| import java.io.BufferedReader; | ||
| import java.io.BufferedWriter; | ||
| import java.io.IOException; | ||
| import java.io.InputStreamReader; | ||
| import java.io.OutputStreamWriter; | ||
| import java.io.PrintWriter; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
| /** | ||
| * Uses the markets API to retrieve market volume data. | ||
| * | ||
| * @author Florian Reimair | ||
| * | ||
| */ | ||
| @Slf4j | ||
| public class MarketStats extends Metric { | ||
|
|
||
| // poor mans JSON parser | ||
| private final Pattern marketPattern = Pattern.compile("\"market\" ?: ?\"([a-z_]+)\""); | ||
| private final Pattern amountPattern = Pattern.compile("\"amount\" ?: ?\"([\\d\\.]+)\""); | ||
| private final Pattern volumePattern = Pattern.compile("\"volume\" ?: ?\"([\\d\\.]+)\""); | ||
| private final Pattern timestampPattern = Pattern.compile("\"trade_date\" ?: ?([\\d]+)"); | ||
|
|
||
| private final String marketApi = "https://markets.bisq.network"; | ||
| private Long lastRun = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(15)); | ||
|
|
||
| public MarketStats(Reporter reporter) { | ||
| super(reporter); | ||
| } | ||
|
|
||
| @Override | ||
| protected void execute() { | ||
| try { | ||
| // for each configured host | ||
| Map<String, String> result = new HashMap<>(); | ||
|
|
||
| // assemble query | ||
| Long now = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()); | ||
| String query = "/api/trades?format=json&market=all×tamp_from=" + lastRun + "×tamp_to=" + now; | ||
| lastRun = now; // thought about adding 1 second but what if a trade is done exactly in this one second? | ||
|
|
||
| // connect | ||
| URLConnection connection = new URL(marketApi + query).openConnection(); | ||
|
|
||
| // prepare to receive data | ||
| BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream())); | ||
|
|
||
| String all = in.readLine(); | ||
| in.close(); | ||
|
|
||
| Arrays.stream(all.substring(0, all.length() - 2).split("}")).forEach(trade -> { | ||
| Matcher market = marketPattern.matcher(trade); | ||
| Matcher amount = amountPattern.matcher(trade); | ||
| Matcher timestamp = timestampPattern.matcher(trade); | ||
| market.find(); | ||
| if (market.group(1).endsWith("btc")) { | ||
| amount = volumePattern.matcher(trade); | ||
| } | ||
| amount.find(); | ||
| timestamp.find(); | ||
| System.err.println(getName() + ".volume." + market.group(1) + " " + amount.group(1) + " " + timestamp.group(1).substring(0, timestamp.group(1).length() - 3)); | ||
| reporter.report("volume." + market.group(1), amount.group(1), timestamp.group(1), getName()); | ||
| }); | ||
| } catch (IllegalStateException ignore) { | ||
| // no match found | ||
| } catch (IOException e) { | ||
| // TODO Auto-generated catch block | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.