Skip to content

Revert "Tests: fix alert.general metric conflict" #3947

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

Merged
CTMBNara merged 1 commit into from
May 5, 2025
Merged

Revert "Tests: fix alert.general metric conflict" #3947

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
1 change: 1 addition & 0 deletions src/test/groovy/org/prebid/server/functional/model/privacy/Metric.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import org.prebid.server.functional.model.request.setuid.SetuidRequest

enum Metric {

ALERT_GENERAL("alerts.general"),
PROCESSED_ACTIVITY_RULES_COUNT("requests.activity.processedrules.count"),
ACCOUNT_PROCESSED_RULES_COUNT("requests.activity.processedrules.count"),
TEMPLATE_ADAPTER_DISALLOWED_COUNT("adapter.{bidderName}.activity.{activityType}.disallowed.count"),
Expand Down
9 changes: 5 additions & 4 deletions src/test/groovy/org/prebid/server/functional/tests/privacy/GppFetchBidActivitiesSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import static org.prebid.server.functional.model.pricefloors.Country.USA
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ACCOUNT_DISALLOWED_COUNT
import static org.prebid.server.functional.model.privacy.Metric.ACCOUNT_PROCESSED_RULES_COUNT
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
import static org.prebid.server.functional.model.privacy.Metric.ALERT_GENERAL
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
Expand Down Expand Up @@ -693,7 +694,7 @@ class GppFetchBidActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1

where:
gppAccountsConfig << [[new AccountGppConfig(code: IAB_US_GENERAL, config: new GppModuleConfig(skipSids: [US_NAT_V1]), enabled: false),
Expand Down Expand Up @@ -867,7 +868,7 @@ class GppFetchBidActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS auction call when custom privacy regulation with normalizing should ignore call to bidder"() {
Expand Down Expand Up @@ -1424,7 +1425,7 @@ class GppFetchBidActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS amp call when privacy module contain invalid property should respond with an error"() {
Expand Down Expand Up @@ -1623,7 +1624,7 @@ class GppFetchBidActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS amp call when custom privacy regulation with normalizing should ignore call to bidder"() {
Expand Down
9 changes: 5 additions & 4 deletions src/test/groovy/org/prebid/server/functional/tests/privacy/GppSyncUserActivitiesSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ import static org.prebid.server.functional.model.config.UsNationalPrivacySection
import static org.prebid.server.functional.model.pricefloors.Country.CAN
import static org.prebid.server.functional.model.pricefloors.Country.USA
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
import static org.prebid.server.functional.model.privacy.Metric.ALERT_GENERAL
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
Expand Down Expand Up @@ -656,7 +657,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS cookie sync call when privacy module contain invalid code should include proper responded with bidders URLs"() {
Expand Down Expand Up @@ -816,7 +817,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS cookie sync when custom privacy regulation with normalizing should exclude bidders URLs"() {
Expand Down Expand Up @@ -1549,7 +1550,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS setuid request call when privacy module contain invalid code should respond with valid bidders UIDs cookies"() {
Expand Down Expand Up @@ -1724,7 +1725,7 @@ class GppSyncUserActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS setuid call when custom privacy regulation with normalizing should reject bidders with status code invalidStatusCode"() {
Expand Down
9 changes: 5 additions & 4 deletions ...st/groovy/org/prebid/server/functional/tests/privacy/GppTransmitEidsActivitiesSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ import static org.prebid.server.functional.model.pricefloors.Country.USA
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ACCOUNT_DISALLOWED_COUNT
import static org.prebid.server.functional.model.privacy.Metric.ACCOUNT_PROCESSED_RULES_COUNT
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
import static org.prebid.server.functional.model.privacy.Metric.ALERT_GENERAL
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
Expand Down Expand Up @@ -1022,7 +1023,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS auction call when privacy module contain invalid property should respond with an error"() {
Expand Down Expand Up @@ -1184,7 +1185,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS auction call when custom privacy regulation with normalizing that match custom config should have empty EIDS fields"() {
Expand Down Expand Up @@ -2096,7 +2097,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS amp call when privacy module contain invalid property should respond with an error"() {
Expand Down Expand Up @@ -2294,7 +2295,7 @@ class GppTransmitEidsActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS amp call when custom privacy regulation with normalizing should change request consent and call to bidder"() {
Expand Down
9 changes: 5 additions & 4 deletions ...ovy/org/prebid/server/functional/tests/privacy/GppTransmitPreciseGeoActivitiesSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import static org.prebid.server.functional.model.pricefloors.Country.USA
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ACCOUNT_DISALLOWED_COUNT
import static org.prebid.server.functional.model.privacy.Metric.ACCOUNT_PROCESSED_RULES_COUNT
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
import static org.prebid.server.functional.model.privacy.Metric.ALERT_GENERAL
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
Expand Down Expand Up @@ -1358,7 +1359,7 @@ class GppTransmitPreciseGeoActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS auction call when privacy module contain invalid code should respond with an error"() {
Expand Down Expand Up @@ -1572,7 +1573,7 @@ class GppTransmitPreciseGeoActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS auction call when custom privacy regulation with normalizing should change request consent and call to bidder"() {
Expand Down Expand Up @@ -2612,7 +2613,7 @@ class GppTransmitPreciseGeoActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS amp call when privacy module contain invalid code should respond with an error"() {
Expand Down Expand Up @@ -2862,7 +2863,7 @@ class GppTransmitPreciseGeoActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS amp call when custom privacy regulation with normalizing should change request consent and call to bidder"() {
Expand Down
9 changes: 5 additions & 4 deletions ...st/groovy/org/prebid/server/functional/tests/privacy/GppTransmitUfpdActivitiesSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ import static org.prebid.server.functional.model.pricefloors.Country.USA
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ACCOUNT_DISALLOWED_COUNT
import static org.prebid.server.functional.model.privacy.Metric.ACCOUNT_PROCESSED_RULES_COUNT
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_ADAPTER_DISALLOWED_COUNT
import static org.prebid.server.functional.model.privacy.Metric.ALERT_GENERAL
import static org.prebid.server.functional.model.privacy.Metric.PROCESSED_ACTIVITY_RULES_COUNT
import static org.prebid.server.functional.model.privacy.Metric.TEMPLATE_REQUEST_DISALLOWED_COUNT
import static org.prebid.server.functional.model.request.GppSectionId.USP_V1
Expand Down Expand Up @@ -1377,7 +1378,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS auction call when privacy module contain invalid property should respond with an error"() {
Expand Down Expand Up @@ -1572,7 +1573,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS auction call when custom privacy regulation with normalizing that match custom config should have empty UFPD fields"() {
Expand Down Expand Up @@ -2747,7 +2748,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS amp call when privacy module contain invalid property should respond with an error"() {
Expand Down Expand Up @@ -2978,7 +2979,7 @@ class GppTransmitUfpdActivitiesSpec extends PrivacyBaseSpec {

and: "Metrics for disallowed activities should be updated"
def metrics = activityPbsService.sendCollectedMetricsRequest()
assert metrics[ALERT_GENERAL] == 1
assert metrics[ALERT_GENERAL.getValue()] == 1
}

def "PBS amp call when custom privacy regulation with normalizing should change request consent and call to bidder"() {
Expand Down
Loading