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

HPCC-32689 Include/Exclude pending scopes in metrics #19132

Merged
merged 1 commit into from
Sep 27, 2024
Merged

HPCC-32689 Include/Exclude pending scopes in metrics #19132

merged 1 commit into from
Sep 27, 2024

Conversation

GordonSmith
Copy link
Member

@GordonSmith GordonSmith commented Sep 19, 2024 •
edited
Loading

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

@github-actions GitHub Actions
Copy link

Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-32689

Jirabot Action Result:
Workflow Transition To: Merge Pending
Updated PR

jeclrsg
jeclrsg requested changes Sep 23, 2024
View reviewed changes
Copy link
Contributor

@jeclrsg jeclrsg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GordonSmith GH Actions had noted one lint warning about a missing dependency, and I saw one other minor change with a couple variable names

esp/src/src-react/components/Metrics.tsx Outdated
.metrics(scopesTableMetrics, view.scopeTypes, view.properties, scopeFilter, matchCase)
.lazyRender()
;
}, [includePendingItems, matchCase, metrics, scopeFilter, scopesTable, view.properties, view.scopeTypes]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lint warning about metricGraph missing from dependencies

esp/src/src-react/hooks/metrics.ts Outdated
@@ -303,18 +314,18 @@ export function useWorkunitMetrics(
});
}, [workunit, state, count, scopeFilter, nestedFilter]);

return [data, columns, activities, properties, measures, scopeTypes, status, increment];
return { metrics, columns, activities, properties, measures, scopeTypes, status, refresh: increment };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bit of a nitpick I guess, but I might've done metrics: data here (and line 378) instead of having the state variable and it's setter have mismatched names.

@GordonSmith GordonSmith force-pushed the HPCC-32689-EXCLUDE_PENDING_SCOPES branch from b9d6ee7 to c025e3f Compare September 27, 2024 09:39
@GordonSmith
Copy link
Member Author

Changes made as per review.

@GordonSmith
HPCC-32689 Include/Exclude pending scopes in metrics
35cc7c8 
Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
@GordonSmith GordonSmith force-pushed the HPCC-32689-EXCLUDE_PENDING_SCOPES branch from c025e3f to 35cc7c8 Compare September 27, 2024 09:46
@GordonSmith
Copy link
Member Author

Rebased

@GordonSmith GordonSmith merged commit 44e211e into hpcc-systems:candidate-9.2.x Sep 27, 2024
20 of 27 checks passed
@GordonSmith GordonSmith deleted the HPCC-32689-EXCLUDE_PENDING_SCOPES branch September 27, 2024 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeclrsg jeclrsg jeclrsg requested changes

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

Successfully merging this pull request may close these issues.
2 participants
@GordonSmith @jeclrsg