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-1229: Save shard-specific query subplans to metrics #2027

Open
wants to merge 39 commits into
base: integration
Choose a base branch
from
Open

Issue-1229: Save shard-specific query subplans to metrics #2027

wants to merge 39 commits into from

Conversation

foster33
Copy link
Collaborator

@foster33 foster33 commented Jul 7, 2023

Aims to add query subplans to the metrics for the query. Also will make the subplans viewable via the metrics endpoint.

Fixes #1229

foster33 and others added 29 commits February 23, 2023 20:37
@foster33
Initial push of work for addition of subplans
d40be51
@foster33
Update response object to new object
6ff174b
@drewfarris @hgklohr
Update query limits handling to allow rules based on systemFrom values (
c0dbbc4 
#1960)

Conflicts:
	web-services/query/src/test/java/datawave/webservice/query/runner/ExtendedQueryExecutorBeanTest.java
	web-services/query/src/test/java/datawave/webservice/query/runner/QueryExecutorBeanTest.java
@foster33
Add query options to query endpoints
94a7068
@foster33
Correct subplan field name
907180a
@ivakegg
Merge branch 'release/version3.42' into feature/issue-1229
2013860
@foster33
Add check for null to resolve NPE for metrics endpoint
721c25f
@foster33
Updates for subplan endpoint
b0a72a8
@foster33
re-add previously removed code
b670cae
@foster33
Merge integration branch
92e7e83
@foster33
Correct import formatting
f3f6c2d
@ivakegg
re #1229: Updated to expect subPlan additions.
9de1f22
@ivakegg
Updated to new metric service snapshot version
3818535
@ivakegg
sendQueryMetric whenever the metric is updated
468ae0a
@ivakegg
Merge remote-tracking branch 'origin/integration' into feature/issue-…
6d7614c 
…1229
@ivakegg
Fixed missing grouping context parameter
7839918
@ivakegg
pass metric through to the logic
849a0c4
@ivakegg
import order
c557582
@ivakegg
accumulo2.1.1
795878e
@ivakegg
accumulo 2.1.1
dfb427d
@ivakegg
Set the logic metric
111983b
@ivakegg
Allow tests to work for now
0d375e5
@ivakegg
Revert "Allow tests to work for now"
f127d1f 
This reverts commit 0d375e5.
@ivakegg
return subplans from the query when needed
5f35619
@ivakegg
only blacklist page metrics when getting plans
d69d7b4
@ivakegg
Parse the subplan
7cad0a9
@foster33
Merge branch 'integration' into feature/issue-1229
0f204c2
@ivakegg
Updated query tests to expect query metric calls
5d3a7cc
@ivakegg
Added the micrometer commons jar
7a12c1d
@foster33 foster33 changed the title WIP: issue-1229: Save shard-specific query subplans to metrics Issue-1229: Save shard-specific query subplans to metrics Jul 17, 2023
billoley
billoley requested changes Sep 12, 2023
View reviewed changes
contrib/datawave-quickstart/bin/services/accumulo/bootstrap.sh Outdated Show resolved Hide resolved
pom.xml Outdated Show resolved Hide resolved
pom.xml Outdated Show resolved Hide resolved
warehouse/query-core/src/main/java/datawave/query/metrics/ShardTableQueryMetricHandler.java Outdated Show resolved Hide resolved
@foster33
Copy link
Collaborator Author

There are currently test failures within VisitorFunctionTest relating to EasyMock expectations.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ivakegg ivakegg ivakegg left review comments

@billoley billoley billoley requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Save shard-specific query plans to metrics
4 participants
@foster33 @ivakegg @billoley @drewfarris