From 6d861fccfc3e7403b21d7ce0e5c924bc9adfb31c Mon Sep 17 00:00:00 2001 From: mckang Date: Fri, 7 Sep 2018 14:04:13 +0900 Subject: [PATCH] add testcase --- .gitignore | 4 + .../converter/query/DefaultQueryResult.java | 5 ++ .../converter/query/QueryResultItemValue.java | 2 +- .../converter/query/DefaultQueryResult.class | Bin 1221 -> 1592 bytes .../query/QueryResultItemValue.class | Bin 1190 -> 1191 bytes promql_client_test/pom.xml | 40 ++++++++++ .../bdwise/prometheus/client/PromqlTest.java | 75 ++++++++++++++++++ 7 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 promql_client_test/pom.xml create mode 100644 promql_client_test/src/test/java/com/bdwise/prometheus/client/PromqlTest.java diff --git a/.gitignore b/.gitignore index 32868bd..453ffec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ .classpath .project +promql_client/.settings/ +promql_client/target +promql_client_test/.settings/ +promql_client_test/target diff --git a/promql_client/src/main/java/com/bdwise/prometheus/client/converter/query/DefaultQueryResult.java b/promql_client/src/main/java/com/bdwise/prometheus/client/converter/query/DefaultQueryResult.java index 3bcb0ca..d6c86e2 100644 --- a/promql_client/src/main/java/com/bdwise/prometheus/client/converter/query/DefaultQueryResult.java +++ b/promql_client/src/main/java/com/bdwise/prometheus/client/converter/query/DefaultQueryResult.java @@ -18,6 +18,11 @@ public class DefaultQueryResult extends Result{ public List getResult() { return result; } + + @Override + public String toString() { + return "DefaultQueryResult [result=" + result + "]"; + } diff --git a/promql_client/src/main/java/com/bdwise/prometheus/client/converter/query/QueryResultItemValue.java b/promql_client/src/main/java/com/bdwise/prometheus/client/converter/query/QueryResultItemValue.java index 093a126..65e7766 100644 --- a/promql_client/src/main/java/com/bdwise/prometheus/client/converter/query/QueryResultItemValue.java +++ b/promql_client/src/main/java/com/bdwise/prometheus/client/converter/query/QueryResultItemValue.java @@ -22,7 +22,7 @@ public class QueryResultItemValue { } @Override public String toString() { - return "ResultDataItemValue [timestamp=" + timestamp + ", value=" + value + "]"; + return "QueryResultItemValue [timestamp=" + timestamp + ", value=" + value + "]"; } } diff --git a/promql_client/target/classes/com/bdwise/prometheus/client/converter/query/DefaultQueryResult.class b/promql_client/target/classes/com/bdwise/prometheus/client/converter/query/DefaultQueryResult.class index 3b97b293d13b5fa0866c47708da5eb8f1db4aac2..0f952c484cab31892a7d1b0b508d3088513946da 100644 GIT binary patch delta 420 zcmX@gxr2x6)W2Q(7#J7~8SFQ5U0|x`D9H~lDay=CXJio3(DcblEKAhSNz6;vhlpCU zGiWn1h@%TTm1gFoq!w{7=rS@$yQHQimgbZMmZla}2Bj7QnF`TGVA__8L5o43hk=v9 zfRRB|1JiWP`Y@0ZBOV501`|dGw#0&h)Vvf%23=&e{z+M>$tBj9j)S_wnuEcNk%2K5 zWReBQBug{{pkBddfB@JZ)*!9cJPaBPnv-uZt!8A|+`??YSi%SrU|?k628LHC12d4t zz#zGsK`T;7XFG$Q))ofAZ48D&rrQ|Iw=r0407^152m?trutEt25g?lfqKQG2K@7+f UM-h<#@|YNGz@#k$JD9cu0NeIru>b%7 delta 48 zcmdnNbCi?o)W2Q(7#J7~8MHTYU0|C0ig_g?^X4fm28@DC3>rWQCI(Fgb}+340CRK; A2mk;8 diff --git a/promql_client/target/classes/com/bdwise/prometheus/client/converter/query/QueryResultItemValue.class b/promql_client/target/classes/com/bdwise/prometheus/client/converter/query/QueryResultItemValue.class index 6833ee0b9fe915aa5ec972d7569b622f5cd53e65..e1472926f06e6f017ac8cb245d9c65454c49510d 100644 GIT binary patch delta 18 acmZ3+xtw#u7Dh&e$rG7GHlJX;#{>XA0tS2l delta 24 gcmZ3^xr}qe7DjIQpw!~hoD!GBlElpi7@so%0B>vwMF0Q* diff --git a/promql_client_test/pom.xml b/promql_client_test/pom.xml new file mode 100644 index 0000000..117cf5d --- /dev/null +++ b/promql_client_test/pom.xml @@ -0,0 +1,40 @@ + + 4.0.0 + + com.bdwise.prometheus.client + promql_client_test + 0.0.1-SNAPSHOT + jar + + promql_client_test + http://maven.apache.org + + + UTF-8 + + + + + com.bdwise.prometheus.client + promql_client + 0.1-SNAPSHOT + + + org.apache.httpcomponents + httpclient + 4.5.3 + + + org.springframework.boot + spring-boot-starter-web + 1.5.6.RELEASE + + + junit + junit + 3.8.1 + test + + + diff --git a/promql_client_test/src/test/java/com/bdwise/prometheus/client/PromqlTest.java b/promql_client_test/src/test/java/com/bdwise/prometheus/client/PromqlTest.java new file mode 100644 index 0000000..8409ae8 --- /dev/null +++ b/promql_client_test/src/test/java/com/bdwise/prometheus/client/PromqlTest.java @@ -0,0 +1,75 @@ +package com.bdwise.prometheus.client; + +import java.net.MalformedURLException; +import java.net.URI; + +import org.apache.http.client.HttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; +import org.springframework.web.client.RestTemplate; + +import com.bdwise.prometheus.client.builder.InstantQueryBuilder; +import com.bdwise.prometheus.client.builder.QueryBuilderType; +import com.bdwise.prometheus.client.builder.RangeQueryBuilder; +import com.bdwise.prometheus.client.converter.ConvertUtil; +import com.bdwise.prometheus.client.converter.query.DefaultQueryResult; +import com.bdwise.prometheus.client.converter.query.MatrixData; +import com.bdwise.prometheus.client.converter.query.VectorData; + +import junit.framework.TestCase; + +public class PromqlTest extends TestCase { + private final static String TARGET_SERVER = "http://52.192.4.59:30900"; + + private RestTemplate template = null; + + @Override + protected void setUp() throws Exception { + HttpComponentsClientHttpRequestFactory httpRequestFactory = new HttpComponentsClientHttpRequestFactory(); + httpRequestFactory.setConnectTimeout(1000); + httpRequestFactory.setReadTimeout(2000); + HttpClient httpClient = HttpClientBuilder.create() + .setMaxConnTotal(100) + .setMaxConnPerRoute(10) + .build(); + httpRequestFactory.setHttpClient(httpClient); + + template = new RestTemplate(httpRequestFactory); + } + + public void testSimpleRangeQuery() throws MalformedURLException { + RangeQueryBuilder rangeQueryBuilder = QueryBuilderType.RangeQuery.newInstance(TARGET_SERVER); + URI targetUri = rangeQueryBuilder.withQuery("irate(received_api_call_total[60s])") + .withStartEpochTime(System.currentTimeMillis() / 1000 - 60*10) + .withEndEpochTime(System.currentTimeMillis() / 1000) + .withStepTime("60s") + .build(); + + System.out.println(targetUri.toURL().toString()); + + String rtVal = template.getForObject(targetUri, String.class); + + + + + DefaultQueryResult result = ConvertUtil.convertQueryResultString(rtVal); + + + System.out.println(result); + } + + public void testSimpleInstantQuery() throws MalformedURLException { + InstantQueryBuilder iqb = QueryBuilderType.InstantQuery.newInstance(TARGET_SERVER); + URI targetUri = iqb.withQuery("irate(received_api_call_total[60s])").build(); + System.out.println(targetUri.toURL().toString()); + + + String rtVal = template.getForObject(targetUri, String.class); + + + DefaultQueryResult result = ConvertUtil.convertQueryResultString(rtVal); + + + System.out.println(result); + } +}