Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

issue 1494 #2

Closed
wants to merge 1 commit into from
Closed

issue 1494 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<com.google.dagger.version>2.45</com.google.dagger.version>
<com.google.dagger.compiler.version>2.45</com.google.dagger.compiler.version>

<io.cryostat.core.version>2.20.0</io.cryostat.core.version>
<io.cryostat.core.version>2.21.0-SNAPSHOT</io.cryostat.core.version>

<org.openjdk.nashorn.core.version>15.4</org.openjdk.nashorn.core.version>
<org.apache.commons.lang3.version>3.12.0</org.apache.commons.lang3.version>
Expand Down
27 changes: 0 additions & 27 deletions smoketest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,6 @@ runDemoApps() {
--name vertx-fib-demo-1 \
--env HTTP_PORT=8081 \
--env JMX_PORT=9093 \
--env CRYOSTAT_AGENT_APP_NAME="vertx-fib-demo-1" \
--env CRYOSTAT_AGENT_WEBCLIENT_SSL_TRUST_ALL="true" \
--env CRYOSTAT_AGENT_WEBCLIENT_SSL_VERIFY_HOSTNAME="false" \
--env CRYOSTAT_AGENT_WEBSERVER_HOST="localhost" \
--env CRYOSTAT_AGENT_WEBSERVER_PORT="8910" \
--env CRYOSTAT_AGENT_CALLBACK="http://localhost:8910/" \
--env CRYOSTAT_AGENT_BASEURI="${protocol}://localhost:${webPort}/" \
--env CRYOSTAT_AGENT_TRUST_ALL="true" \
--env CRYOSTAT_AGENT_AUTHORIZATION="Basic $(echo user:pass | base64)" \
--pod cryostat-pod \
--label io.cryostat.connectUrl="service:jmx:rmi:///jndi/rmi://localhost:9093/jmxrmi" \
--rm -d quay.io/andrewazores/vertx-fib-demo:0.12.2
Expand All @@ -130,15 +121,6 @@ runDemoApps() {
--env HTTP_PORT=8082 \
--env JMX_PORT=9094 \
--env USE_AUTH=true \
--env CRYOSTAT_AGENT_APP_NAME="vertx-fib-demo-2" \
--env CRYOSTAT_AGENT_WEBCLIENT_SSL_TRUST_ALL="true" \
--env CRYOSTAT_AGENT_WEBCLIENT_SSL_VERIFY_HOSTNAME="false" \
--env CRYOSTAT_AGENT_WEBSERVER_HOST="localhost" \
--env CRYOSTAT_AGENT_WEBSERVER_PORT="8911" \
--env CRYOSTAT_AGENT_CALLBACK="http://localhost:8911/" \
--env CRYOSTAT_AGENT_BASEURI="${protocol}://localhost:${webPort}/" \
--env CRYOSTAT_AGENT_TRUST_ALL="true" \
--env CRYOSTAT_AGENT_AUTHORIZATION="Basic $(echo user:pass | base64)" \
--pod cryostat-pod \
--label io.cryostat.connectUrl="service:jmx:rmi:///jndi/rmi://localhost:9094/jmxrmi" \
--rm -d quay.io/andrewazores/vertx-fib-demo:0.12.2
Expand All @@ -149,15 +131,6 @@ runDemoApps() {
--env JMX_PORT=9095 \
--env USE_SSL=true \
--env USE_AUTH=true \
--env CRYOSTAT_AGENT_APP_NAME="vertx-fib-demo-3" \
--env CRYOSTAT_AGENT_WEBCLIENT_SSL_TRUST_ALL="true" \
--env CRYOSTAT_AGENT_WEBCLIENT_SSL_VERIFY_HOSTNAME="false" \
--env CRYOSTAT_AGENT_WEBSERVER_HOST="localhost" \
--env CRYOSTAT_AGENT_WEBSERVER_PORT="8912" \
--env CRYOSTAT_AGENT_CALLBACK="http://localhost:8912/" \
--env CRYOSTAT_AGENT_BASEURI="${protocol}://localhost:${webPort}/" \
--env CRYOSTAT_AGENT_TRUST_ALL="true" \
--env CRYOSTAT_AGENT_AUTHORIZATION="Basic $(echo user:pass | base64)" \
--pod cryostat-pod \
--label io.cryostat.connectUrl="service:jmx:rmi:///jndi/rmi://localhost:9095/jmxrmi" \
--rm -d quay.io/andrewazores/vertx-fib-demo:0.12.2
Expand Down
1 change: 1 addition & 0 deletions src/main/java/io/cryostat/platform/PlatformClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ default void load(Promise<EnvironmentNode> promise) {
default List<ServiceRef> listUniqueReachableServices() {
Set<String> uniqueIds = new HashSet<>();
return listDiscoverableServices().stream()
.filter((ref)->!ref.getServiceUri().toString().startsWith("http"))
.filter((ref) -> ref.getJvmId() != null && uniqueIds.add(ref.getJvmId()))
.toList();
}
Expand Down