feat(graphql): add top-level query for targetNodes #307

andrewazores · 2024-02-27T18:28:53Z

Welcome to Cryostat3! 👋

Before contributing, make sure you have:

Read the contributing guidelines
Linked a relevant issue which this PR resolves
Linked any other relevant issues, PR's, or documentation, if any
Resolved all conflicts, if any
Rebased your branch PR on top of the latest upstream main branch
Attached at least one of the following labels to the PR: [chore, ci, docs, feat, fix, test]
Signed all commits using a GPG signature

To recreate commits with GPG signature git fetch upstream && git rebase --force --gpg-sign upstream/main

Based on #294
Depends on cryostatio/cryostat-core#357
Depends on cryostatio/cryostat-core#358
Depends on #310

Description of the change:

This change allows an environment variable to be configured so that...

Motivation for the change:

This change is helpful because users may want to...

How to manually test:

Run CRYOSTAT_IMAGE=quay.io... bash smoketest.bash...
$ http --follow -v --auth=user:pass :8080/api/v3/graphql/schema.graphql and ensure new schema contains top-level query and subqueries
Open web UI, select localhost:0 target, archive both recordings. Wait a short while, then archive both again.
$ http --follow -v --auth=user:pass :8080/api/v2.2/graphql query='query { targetNodes { target { connectUrl jvmId recordings { active { aggregate { count } data { name } } archived { aggregate { count size } data { name } } } } } }'

$ http --follow -v --auth=user:pass :8080/api/v2.2/graphql query='query { targetNodes { target { connectUrl jvmId recordings { active { aggregate { count } data { name } } archived { aggregate { count size } data { name size } } } } } }'
POST /api/v2.2/graphql HTTP/1.1
Accept: application/json, */*;q=0.5
Accept-Encoding: gzip, deflate, br
Authorization: Basic dXNlcjpwYXNz
Connection: keep-alive
Content-Length: 183
Content-Type: application/json
Host: localhost:8080
User-Agent: HTTPie/3.2.2

{
    "query": "query { targetNodes { target { connectUrl jvmId recordings { active { aggregate { count } data { name } } archived { aggregate { count size } data { name size } } } } } }"
}


HTTP/1.1 308 Permanent Redirect
Content-Encoding: identity
Content-Length: 0
Date: Tue, 27 Feb 2024 19:53:00 GMT
Gap-Auth: user
Location: http://localhost:8080/api/v3/graphql



POST /api/v3/graphql HTTP/1.1
Accept: application/json, */*;q=0.5
Accept-Encoding: gzip, deflate, br
Authorization: Basic dXNlcjpwYXNz
Connection: keep-alive
Content-Length: 183
Content-Type: application/json
Host: localhost:8080
User-Agent: HTTPie/3.2.2

{
    "query": "query { targetNodes { target { connectUrl jvmId recordings { active { aggregate { count } data { name } } archived { aggregate { count size } data { name size } } } } } }"
}


HTTP/1.1 200 OK
Content-Length: 870
Content-Type: application/json
Date: Tue, 27 Feb 2024 19:53:00 GMT
Gap-Auth: user

{
    "data": {
        "targetNodes": [
            {
                "target": {
                    "connectUrl": "service:jmx:rmi:///jndi/rmi://localhost:0/jmxrmi",
                    "jvmId": "l7nbjOnSzkgpICnAWAsJ3T4nnNUHL1fLkEwFImQW1OQ=",
                    "recordings": {
                        "active": {
                            "aggregate": {
                                "count": 2
                            },
                            "data": [
                                {
                                    "name": "onstart"
                                },
                                {
                                    "name": "startup"
                                }
                            ]
                        },
                        "archived": {
                            "aggregate": {
                                "count": 4,
                                "size": 15707814
                            },
                            "data": [
                                {
                                    "name": "compose-cryostat-1_onstart_20240227T195230Z.jfr",
                                    "size": 3841100
                                },
                                {
                                    "name": "compose-cryostat-1_onstart_20240227T195239Z.jfr",
                                    "size": 4791696
                                },
                                {
                                    "name": "compose-cryostat-1_startup_20240227T195230Z.jfr",
                                    "size": 3537509
                                },
                                {
                                    "name": "compose-cryostat-1_startup_20240227T195239Z.jfr",
                                    "size": 3537509
                                }
                            ]
                        }
                    }
                }
            },
            {
                "target": {
                    "connectUrl": "service:jmx:rmi:///jndi/rmi://jfr-datasource:11223/jmxrmi",
                    "jvmId": "AJUhBprW6p1h8oaU2hGToT0ejRahSC_jplYUzIxCsa0=",
                    "recordings": {
                        "active": {
                            "aggregate": {
                                "count": 0
                            },
                            "data": []
                        },
                        "archived": {
                            "aggregate": {
                                "count": 0,
                                "size": 0
                            },
                            "data": []
                        }
                    }
                }
            }
        ]
    }
}

$ http --follow -v --auth=user:pass :8080/api/v2.2/graphql query='query { targetNodes { target { connectUrl jvmId recordings { active(filter: { names: ["onstart"] }) { aggregate { count } data { name startTime id remoteId metadata { labels { key value } } } } archived { aggregate { count size } data { name size } } } } } }'
POST /api/v2.2/graphql HTTP/1.1
Accept: application/json, */*;q=0.5
Accept-Encoding: gzip, deflate, br
Authorization: Basic dXNlcjpwYXNz
Connection: keep-alive
Content-Length: 273
Content-Type: application/json
Host: localhost:8080
User-Agent: HTTPie/3.2.2

{
    "query": "query { targetNodes { target { connectUrl jvmId recordings { active(filter: { names: [\"onstart\"] }) { aggregate { count } data { name startTime id remoteId metadata { labels { key value } } } } archived { aggregate { count size } data { name size } } } } } }"
}


HTTP/1.1 308 Permanent Redirect
Content-Encoding: identity
Content-Length: 0
Date: Tue, 27 Feb 2024 20:26:33 GMT
Gap-Auth: user
Location: http://localhost:8080/api/v3/graphql



POST /api/v3/graphql HTTP/1.1
Accept: application/json, */*;q=0.5
Accept-Encoding: gzip, deflate, br
Authorization: Basic dXNlcjpwYXNz
Connection: keep-alive
Content-Length: 273
Content-Type: application/json
Host: localhost:8080
User-Agent: HTTPie/3.2.2

{
    "query": "query { targetNodes { target { connectUrl jvmId recordings { active(filter: { names: [\"onstart\"] }) { aggregate { count } data { name startTime id remoteId metadata { labels { key value } } } } archived { aggregate { count size } data { name size } } } } } }"
}


HTTP/1.1 200 OK
Content-Length: 620
Content-Type: application/json
Date: Tue, 27 Feb 2024 20:26:33 GMT
Gap-Auth: user

{
    "data": {
        "targetNodes": [
            {
                "target": {
                    "connectUrl": "service:jmx:rmi:///jndi/rmi://jfr-datasource:11223/jmxrmi",
                    "jvmId": "EAN-0a170eS7CZfGI1zeBY3pECQvKF8BXc3_3hzlLl8=",
                    "recordings": {
                        "active": {
                            "aggregate": {
                                "count": 0
                            },
                            "data": []
                        },
                        "archived": {
                            "aggregate": {
                                "count": 0,
                                "size": 0
                            },
                            "data": []
                        }
                    }
                }
            },
            {
                "target": {
                    "connectUrl": "service:jmx:rmi:///jndi/rmi://localhost:0/jmxrmi",
                    "jvmId": "RG5KydIvRsZ3lJV57s5TZ5duoXZFWwDt2kS25C9FehU=",
                    "recordings": {
                        "active": {
                            "aggregate": {
                                "count": 1
                            },
                            "data": [
                                {
                                    "id": 1,
                                    "metadata": {
                                        "labels": []
                                    },
                                    "name": "onstart",
                                    "remoteId": 1,
                                    "startTime": 1709065431004
                                }
                            ]
                        },
                        "archived": {
                            "aggregate": {
                                "count": 0,
                                "size": 0
                            },
                            "data": []
                        }
                    }
                }
            }
        ]
    }
}

github-actions · 2024-02-27T18:29:07Z

Build Error! No Linked Issue found. Please link an issue or mention it in the body using #<issue_id>

github-actions · 2024-02-27T18:29:17Z

This PR/issue depends on:

andrewazores · 2024-02-28T20:04:48Z

/build_test

github-actions · 2024-02-28T20:05:16Z

Workflow started at 2/28/2024, 3:05:15 PM. View Actions Run.

github-actions · 2024-02-28T20:07:27Z

CI build and push: All tests pass ✅ (JDK21)
https://github.com/cryostatio/cryostat3/actions/runs/8086386692

github-actions · 2024-02-28T20:11:33Z

CI build and push: All tests pass ✅ (JDK17)
https://github.com/cryostatio/cryostat3/actions/runs/8086386692

…uery

… and doSnapshot

…d the same way GraphQL extension does

andrewazores · 2024-02-29T19:28:06Z

/build_test

github-actions · 2024-02-29T19:28:26Z

Workflow started at 2/29/2024, 2:28:25 PM. View Actions Run.

github-actions · 2024-02-29T19:30:38Z

CI build and push: All tests pass ✅ (JDK21)
https://github.com/cryostatio/cryostat3/actions/runs/8101544669

github-actions · 2024-02-29T19:34:38Z

CI build and push: All tests pass ✅ (JDK17)
https://github.com/cryostatio/cryostat3/actions/runs/8101544669

aali309

Looks good to me!

* feat(graphql): add top-level query for targetNodes * return targets with distinct JVM IDs, implement archived recordings query * implement active recordings query * refactor enum registration * implement subqueries (actually nested mutations) for doStartRecording and doSnapshot * add mbeanMetrics query * messaging server uses shared ObjectMapper * add Jackson serialization customizer so Map<String, String> is encoded the same way GraphQL extension does

andrewazores added feat New feature or request safe-to-test labels Feb 27, 2024

github-actions bot added the dependent label Feb 27, 2024

andrewazores force-pushed the graphql-targetnodes branch from 060007e to ef36d05 Compare February 27, 2024 21:02

andrewazores force-pushed the graphql branch from 77649fa to e6c3388 Compare February 28, 2024 21:14

andrewazores force-pushed the graphql-targetnodes branch from 9a5e934 to b133bff Compare February 28, 2024 21:14

This was referenced Feb 28, 2024

chore(mbeans): use own-defined type to replace java.lang.management.MemoryUsage cryostatio/cryostat-core#358

Merged

fix(graphql): emit notifications on server error response cryostatio/cryostat-web#1218

Merged

andrewazores force-pushed the graphql-targetnodes branch from 1656ca6 to c2931c9 Compare February 29, 2024 05:14

andrewazores mentioned this pull request Feb 29, 2024

chore(mbeans): adjust MBeanMetrics GraphQL query for updated schema cryostatio/cryostat-web#1219

Merged

7 tasks

andrewazores force-pushed the graphql branch from fcc623f to b8ddcd0 Compare February 29, 2024 19:27

andrewazores added 13 commits February 29, 2024 14:27

feat(graphql): add top-level query for targetNodes

b712549

return targets with distinct JVM IDs, implement archived recordings q…

82beaa9

…uery

implement active recordings query

e8d9ec6

only populate structs if requested

4747365

implement active recordings filter input

15f827c

implement archived recordings filter input

d23fca1

rename types to remove redundant 'Input' suffix

aa4776a

remove unused parameter

f81701f

refactor enum registration

2080b96

implement subqueries (actually nested mutations) for doStartRecording…

11a9369

… and doSnapshot

add @description to subqueries

d865595

add TODO

106c598

suppress unread field warnings on serialization classes

f5e850d

andrewazores added 8 commits February 29, 2024 14:27

remove unused injected fields

24e3a1c

reorder

7d00827

add mbeanMetrics query

3436ba8

remove manual registration of enum type

b6dafb9

refactor

d53aa75

messaging server uses shared ObjectMapper

745969a

add Jackson serialization customizer so Map<String, String> is encode…

1eb7756

…d the same way GraphQL extension does

update test for labels/annotations as key-value lists

512a0f3

andrewazores force-pushed the graphql-targetnodes branch from 3c0c31e to 512a0f3 Compare February 29, 2024 19:27

andrewazores marked this pull request as ready for review February 29, 2024 19:33

andrewazores requested review from aali309 and mwangggg February 29, 2024 19:33

andrewazores mentioned this pull request Feb 29, 2024

feat(graphql): reimplement GraphQL API #294

Merged

14 tasks

aali309 approved these changes Feb 29, 2024

View reviewed changes

andrewazores merged commit abbc171 into cryostatio:graphql Feb 29, 2024
7 of 8 checks passed

andrewazores deleted the graphql-targetnodes branch February 29, 2024 22:00

andrewazores mentioned this pull request Mar 8, 2024

[Task] GraphQL query for MBean metrics #303

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(graphql): add top-level query for targetNodes #307

feat(graphql): add top-level query for targetNodes #307

andrewazores commented Feb 27, 2024 •

edited

Loading

github-actions bot commented Feb 27, 2024

github-actions bot commented Feb 27, 2024 •

edited

Loading

andrewazores commented Feb 28, 2024

github-actions bot commented Feb 28, 2024

github-actions bot commented Feb 28, 2024

github-actions bot commented Feb 28, 2024

andrewazores commented Feb 29, 2024

github-actions bot commented Feb 29, 2024

github-actions bot commented Feb 29, 2024

github-actions bot commented Feb 29, 2024

aali309 left a comment

feat(graphql): add top-level query for targetNodes #307

feat(graphql): add top-level query for targetNodes #307

Conversation

andrewazores commented Feb 27, 2024 • edited Loading

Welcome to Cryostat3! 👋

Before contributing, make sure you have:

Description of the change:

Motivation for the change:

How to manually test:

github-actions bot commented Feb 27, 2024

github-actions bot commented Feb 27, 2024 • edited Loading

andrewazores commented Feb 28, 2024

github-actions bot commented Feb 28, 2024

github-actions bot commented Feb 28, 2024

github-actions bot commented Feb 28, 2024

andrewazores commented Feb 29, 2024

github-actions bot commented Feb 29, 2024

github-actions bot commented Feb 29, 2024

github-actions bot commented Feb 29, 2024

aali309 left a comment

Choose a reason for hiding this comment

andrewazores commented Feb 27, 2024 •

edited

Loading

github-actions bot commented Feb 27, 2024 •

edited

Loading