Skip to content

Commit e7ddb07

Browse files
committed
Scott's review
1 parent 99fb3e4 commit e7ddb07

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

gdpr/impl.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ type permissionsImpl struct {
2020
fetchVendorList VendorListFetcher
2121
gdprDefaultValue string
2222
hostVendorID int
23+
metrics metrics.MetricsEngine
2324
nonStandardPublishers map[string]struct{}
2425
purposeEnforcerBuilder PurposeEnforcerBuilder
2526
vendorIDs map[openrtb_ext.BidderName]uint16
@@ -29,8 +30,6 @@ type permissionsImpl struct {
2930
consent string
3031
gdprSignal Signal
3132
publisherID string
32-
33-
metrics metrics.MetricsEngine
3433
}
3534

3635
// HostCookiesAllowed determines whether the host is allowed to set cookies on the user's device

gdpr/vendorlist-fetching.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func newOccasionalSaver(timeout time.Duration) func(ctx context.Context, client
116116
}
117117
}
118118

119-
func saveOne(ctx context.Context, client *http.Client, url string, saver saveVendors, metricsEngine metrics.MetricsEngine) uint16 {
119+
func saveOne(ctx context.Context, client *http.Client, url string, saver saveVendors, me metrics.MetricsEngine) uint16 {
120120
req, err := http.NewRequest("GET", url, nil)
121121
if err != nil {
122122
glog.Errorf("Failed to build GET %s request. Cookie syncs may be affected: %v", url, err)
@@ -137,11 +137,10 @@ func saveOne(ctx context.Context, client *http.Client, url string, saver saveVen
137137
}
138138
if resp.StatusCode != http.StatusOK {
139139
glog.Errorf("GET %s returned %d. Cookie syncs may be affected.", url, resp.StatusCode)
140-
//metricsEngine.RecordVendorListFetch(fail)
140+
me.RecordGvlListRequest()
141141
return 0
142142
}
143-
// log GVL fetch metric here
144-
//metricsEngine.RecordVendorListFetch(success)
143+
me.RecordGvlListRequest()
145144

146145
var newList api.VendorList
147146
newList, err = vendorlist2.ParseEagerly(respBody)

metrics/go_metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ func NewMetrics(registry metrics.Registry, exchanges []openrtb_ext.BidderName, d
303303
newMetrics.PrebidCacheRequestTimerSuccess = metrics.GetOrRegisterTimer("prebid_cache_request_time.ok", registry)
304304
newMetrics.PrebidCacheRequestTimerError = metrics.GetOrRegisterTimer("prebid_cache_request_time.err", registry)
305305
newMetrics.StoredResponsesMeter = metrics.GetOrRegisterMeter("stored_responses", registry)
306-
newMetrics.GvlListRequestsMeter = metrics.GetOrRegisterMeter("gvl_list_requests", registry)
306+
newMetrics.GvlListRequestsMeter = metrics.GetOrRegisterMeter("gvl_requests", registry)
307307
newMetrics.OverheadTimer = makeOverheadTimerMetrics(registry)
308308
newMetrics.BidderServerResponseTimer = metrics.GetOrRegisterTimer("bidder_server_response_time_seconds", registry)
309309

metrics/go_metrics_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestNewMetrics(t *testing.T) {
3636
ensureContains(t, registry, "setuid_requests.gdpr_blocked_host_cookie", m.SetUidStatusMeter[SetUidGDPRHostCookieBlocked])
3737
ensureContains(t, registry, "setuid_requests.syncer_unknown", m.SetUidStatusMeter[SetUidSyncerUnknown])
3838
ensureContains(t, registry, "stored_responses", m.StoredResponsesMeter)
39-
ensureContains(t, registry, "gvl_list_requests", m.GvlListRequestsMeter)
39+
ensureContains(t, registry, "gvl_requests", m.GvlListRequestsMeter)
4040

4141
ensureContains(t, registry, "prebid_cache_request_time.ok", m.PrebidCacheRequestTimerSuccess)
4242
ensureContains(t, registry, "prebid_cache_request_time.err", m.PrebidCacheRequestTimerError)

metrics/prometheus/prometheus.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ func NewMetrics(cfg config.PrometheusMetrics, disabledMetrics config.DisabledMet
366366
"Count of total requests to Prebid Server that have stored responses")
367367

368368
metrics.gvlListRequests = newCounterWithoutLabels(cfg, reg,
369-
"gvl_list_requests",
369+
"gvl_requests",
370370
"Count number of times GVL list is fetched")
371371

372372
metrics.adapterBids = newCounter(cfg, reg,

0 commit comments

Comments
 (0)