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.

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

AgreementEvents with common fields - compatibility with updated ya-client #869

Merged
merged 23 commits into from
Dec 21, 2020

Conversation

nieznanysprawiciel
Copy link
Contributor

@nieznanysprawiciel nieznanysprawiciel commented Dec 14, 2020

resolves: #868
related to changes in ya-client: golemfactory/ya-client#79

Remember!!! Update referenced branch on ya-client to master, before merging this PR

@nieznanysprawiciel nieznanysprawiciel self-assigned this Dec 14, 2020
@nieznanysprawiciel nieznanysprawiciel marked this pull request as ready for review December 14, 2020 13:36
@nieznanysprawiciel nieznanysprawiciel requested review from a team December 14, 2020 13:36
Copy link
Contributor

@tworec tworec left a comment

Choose a reason for hiding this comment

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

pls update panic msgs in tests also

tworec
tworec previously approved these changes Dec 14, 2020
@tworec tworec force-pushed the market/agreement-events-extract-common-fields branch from 715f5e3 to 2af6ab5 Compare December 14, 2020 23:03
@tworec tworec force-pushed the market/agreement-events-extract-common-fields branch from dce5a97 to f2cda7b Compare December 15, 2020 11:29
@tworec tworec force-pushed the market/agreement-events-extract-common-fields branch 2 times, most recently from b7111f0 to a17add8 Compare December 21, 2020 16:37
@tworec tworec force-pushed the market/agreement-events-extract-common-fields branch from a17add8 to fa24515 Compare December 21, 2020 16:41
match terminator {
OwnerType::Provider => counter!("market.agreements.provider.terminated", 1),
OwnerType::Requestor => counter!("market.agreements.requestor.terminated", 1),
};

terminate_reason_metric(&msg.reason, owner_type);
inc_terminate_metrics(&msg.reason, owner_type);
Copy link
Contributor

Choose a reason for hiding this comment

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

this now contains the above metrics, so we need to remove them :(
sorry, my fault

let filename = captures.get(1).unwrap().as_str().to_string();
let testname = captures.get(2).unwrap().as_str().to_string();

format!("{}.{}", filename, testname)
Copy link
Contributor

Choose a reason for hiding this comment

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

👍

@tworec tworec merged commit 542e909 into master Dec 21, 2020
@tworec tworec deleted the market/agreement-events-extract-common-fields branch December 21, 2020 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

AgreementEvents - use struct with common fields as proposed by Adam Wierzbicki
2 participants