From bf05436fea758f12605c0de3c3dfc172d2b20b94 Mon Sep 17 00:00:00 2001 From: pm-nilesh-chate Date: Wed, 30 Mar 2022 06:43:36 +0000 Subject: [PATCH] Update Some Dependencies - Part 4 (#2162) --- account/account.go | 3 ++- adapters/vidoomy/vidoomy_test.go | 3 ++- adapters/yahoossp/yahoossp_test.go | 3 ++- config/bidderinfo.go | 2 +- config/bidderinfo_validate_test.go | 5 +++-- config/config.go | 4 ++++ config/config_test.go | 4 ++++ endpoints/openrtb2/auction.go | 10 +++++----- endpoints/openrtb2/video_auction.go | 2 +- errortypes/aggregate_test.go | 2 +- exchange/events.go | 2 +- firstpartydata/first_party_data.go | 3 ++- go.mod | 13 ++++++------- go.sum | 26 +++++++++++++------------- metrics/config/metrics.go | 5 ++++- static/bidder-info/synacormedia.yaml | 5 ----- 16 files changed, 51 insertions(+), 41 deletions(-) diff --git a/account/account.go b/account/account.go index 1b2cf158941..fc38b943e8e 100644 --- a/account/account.go +++ b/account/account.go @@ -5,7 +5,8 @@ import ( "encoding/json" "fmt" - jsonpatch "github.com/evanphx/json-patch/v5" + jsonpatch "gopkg.in/evanphx/json-patch.v4" + "github.com/prebid/prebid-server/config" "github.com/prebid/prebid-server/errortypes" "github.com/prebid/prebid-server/metrics" diff --git a/adapters/vidoomy/vidoomy_test.go b/adapters/vidoomy/vidoomy_test.go index c918139527e..11654a0cb5a 100644 --- a/adapters/vidoomy/vidoomy_test.go +++ b/adapters/vidoomy/vidoomy_test.go @@ -3,7 +3,8 @@ package vidoomy import ( "testing" - "github.com/influxdata/influxdb/pkg/testing/assert" + "github.com/stretchr/testify/assert" + "github.com/prebid/prebid-server/adapters/adapterstest" "github.com/prebid/prebid-server/config" "github.com/prebid/prebid-server/openrtb_ext" diff --git a/adapters/yahoossp/yahoossp_test.go b/adapters/yahoossp/yahoossp_test.go index 214457c0b24..a7702f3f8b4 100644 --- a/adapters/yahoossp/yahoossp_test.go +++ b/adapters/yahoossp/yahoossp_test.go @@ -3,7 +3,8 @@ package yahoossp import ( "testing" - "github.com/influxdata/influxdb/pkg/testing/assert" + "github.com/stretchr/testify/assert" + "github.com/prebid/prebid-server/adapters/adapterstest" "github.com/prebid/prebid-server/config" "github.com/prebid/prebid-server/openrtb_ext" diff --git a/config/bidderinfo.go b/config/bidderinfo.go index 12e51a3c381..536acf3140d 100644 --- a/config/bidderinfo.go +++ b/config/bidderinfo.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/prebid/prebid-server/openrtb_ext" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) // BidderInfos contains a mapping of bidder name to bidder info. diff --git a/config/bidderinfo_validate_test.go b/config/bidderinfo_validate_test.go index 6a1b18ab092..c33c829fc43 100644 --- a/config/bidderinfo_validate_test.go +++ b/config/bidderinfo_validate_test.go @@ -9,11 +9,12 @@ import ( "strings" "testing" + "github.com/stretchr/testify/assert" + "gopkg.in/yaml.v3" + "github.com/prebid/prebid-server/config" "github.com/prebid/prebid-server/openrtb_ext" "github.com/prebid/prebid-server/usersync" - "github.com/stretchr/testify/assert" - "gopkg.in/yaml.v2" ) const bidderInfoRelativePath = "../static/bidder-info" diff --git a/config/config.go b/config/config.go index bb746d7824a..bf954873d4d 100644 --- a/config/config.go +++ b/config/config.go @@ -430,8 +430,10 @@ func (cfg *Metrics) validate(errs []error) []error { type InfluxMetrics struct { Host string `mapstructure:"host"` Database string `mapstructure:"database"` + Measurement string `mapstructure:"measurement"` Username string `mapstructure:"username"` Password string `mapstructure:"password"` + AlignTimestamps bool `mapstructure:"align_timestamps"` MetricSendInterval int `mapstructure:"metric_send_interval"` } @@ -710,8 +712,10 @@ func SetupViper(v *viper.Viper, filename string) { v.SetDefault("metrics.disabled_metrics.adapter_gdpr_request_blocked", false) v.SetDefault("metrics.influxdb.host", "") v.SetDefault("metrics.influxdb.database", "") + v.SetDefault("metrics.influxdb.measurement", "") v.SetDefault("metrics.influxdb.username", "") v.SetDefault("metrics.influxdb.password", "") + v.SetDefault("metrics.influxdb.align_timestamps", false) v.SetDefault("metrics.influxdb.metric_send_interval", 20) v.SetDefault("metrics.prometheus.port", 0) v.SetDefault("metrics.prometheus.namespace", "") diff --git a/config/config_test.go b/config/config_test.go index 766244c4de6..d06a9fd8f2f 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -319,8 +319,10 @@ metrics: influxdb: host: upstream:8232 database: metricsdb + measurement: anyMeasurement username: admin password: admin1324 + align_timestamps: true metric_send_interval: 30 disabled_metrics: account_adapter_details: true @@ -557,8 +559,10 @@ func TestFullConfig(t *testing.T) { cmpStrings(t, "recaptcha_secret", cfg.RecaptchaSecret, "asdfasdfasdfasdf") cmpStrings(t, "metrics.influxdb.host", cfg.Metrics.Influxdb.Host, "upstream:8232") cmpStrings(t, "metrics.influxdb.database", cfg.Metrics.Influxdb.Database, "metricsdb") + cmpStrings(t, "metrics.influxdb.measurement", cfg.Metrics.Influxdb.Measurement, "anyMeasurement") cmpStrings(t, "metrics.influxdb.username", cfg.Metrics.Influxdb.Username, "admin") cmpStrings(t, "metrics.influxdb.password", cfg.Metrics.Influxdb.Password, "admin1324") + cmpBools(t, "metrics.influxdb.align_timestamps", cfg.Metrics.Influxdb.AlignTimestamps, true) cmpInts(t, "metrics.influxdb.metric_send_interval", cfg.Metrics.Influxdb.MetricSendInterval, 30) cmpStrings(t, "", cfg.CacheURL.GetBaseURL(), "http://prebidcache.net") cmpStrings(t, "", cfg.GetCachedAssetURL("a0eebc99-9c0b-4ef8-bb00-6bb9bd380a11"), "http://prebidcache.net/cache?uuid=a0eebc99-9c0b-4ef8-bb00-6bb9bd380a11") diff --git a/endpoints/openrtb2/auction.go b/endpoints/openrtb2/auction.go index 14efa07dd15..a1be816a26d 100644 --- a/endpoints/openrtb2/auction.go +++ b/endpoints/openrtb2/auction.go @@ -13,17 +13,16 @@ import ( "strconv" "time" - "github.com/prebid/prebid-server/firstpartydata" - "github.com/prebid/prebid-server/version" - "github.com/buger/jsonparser" - jsonpatch "github.com/evanphx/json-patch/v5" "github.com/gofrs/uuid" "github.com/golang/glog" "github.com/julienschmidt/httprouter" "github.com/mxmCherry/openrtb/v15/native1" nativeRequests "github.com/mxmCherry/openrtb/v15/native1/request" "github.com/mxmCherry/openrtb/v15/openrtb2" + "golang.org/x/net/publicsuffix" + jsonpatch "gopkg.in/evanphx/json-patch.v4" + accountService "github.com/prebid/prebid-server/account" "github.com/prebid/prebid-server/adapters" "github.com/prebid/prebid-server/analytics" @@ -31,6 +30,7 @@ import ( "github.com/prebid/prebid-server/currency" "github.com/prebid/prebid-server/errortypes" "github.com/prebid/prebid-server/exchange" + "github.com/prebid/prebid-server/firstpartydata" "github.com/prebid/prebid-server/metrics" "github.com/prebid/prebid-server/openrtb_ext" "github.com/prebid/prebid-server/prebid_cache_client" @@ -43,7 +43,7 @@ import ( "github.com/prebid/prebid-server/util/httputil" "github.com/prebid/prebid-server/util/iputil" "github.com/prebid/prebid-server/util/uuidutil" - "golang.org/x/net/publicsuffix" + "github.com/prebid/prebid-server/version" ) const storedRequestTimeoutMillis = 50 diff --git a/endpoints/openrtb2/video_auction.go b/endpoints/openrtb2/video_auction.go index 15fe118c718..5437b40e078 100644 --- a/endpoints/openrtb2/video_auction.go +++ b/endpoints/openrtb2/video_auction.go @@ -15,11 +15,11 @@ import ( "time" "github.com/buger/jsonparser" - jsonpatch "github.com/evanphx/json-patch/v5" "github.com/gofrs/uuid" "github.com/golang/glog" "github.com/julienschmidt/httprouter" "github.com/mxmCherry/openrtb/v15/openrtb2" + jsonpatch "gopkg.in/evanphx/json-patch.v4" accountService "github.com/prebid/prebid-server/account" "github.com/prebid/prebid-server/analytics" diff --git a/errortypes/aggregate_test.go b/errortypes/aggregate_test.go index 2d4ce21b493..86a1d15e6b0 100644 --- a/errortypes/aggregate_test.go +++ b/errortypes/aggregate_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "github.com/influxdata/influxdb/pkg/testing/assert" + "github.com/stretchr/testify/assert" ) func TestAggregateError(t *testing.T) { diff --git a/exchange/events.go b/exchange/events.go index 9a4f33af2c5..3ede283f901 100644 --- a/exchange/events.go +++ b/exchange/events.go @@ -4,13 +4,13 @@ import ( "encoding/json" "time" - jsonpatch "github.com/evanphx/json-patch/v5" "github.com/mxmCherry/openrtb/v15/openrtb2" "github.com/prebid/prebid-server/analytics" "github.com/prebid/prebid-server/config" "github.com/prebid/prebid-server/endpoints/events" "github.com/prebid/prebid-server/metrics" "github.com/prebid/prebid-server/openrtb_ext" + jsonpatch "gopkg.in/evanphx/json-patch.v4" ) // eventTracking has configuration fields needed for adding event tracking to an auction response diff --git a/firstpartydata/first_party_data.go b/firstpartydata/first_party_data.go index 89498d065dd..d194044824f 100644 --- a/firstpartydata/first_party_data.go +++ b/firstpartydata/first_party_data.go @@ -4,8 +4,9 @@ import ( "encoding/json" "fmt" - jsonpatch "github.com/evanphx/json-patch/v5" "github.com/mxmCherry/openrtb/v15/openrtb2" + jsonpatch "gopkg.in/evanphx/json-patch.v4" + "github.com/prebid/prebid-server/errortypes" "github.com/prebid/prebid-server/openrtb_ext" ) diff --git a/go.mod b/go.mod index aaaab17882c..5c3c4856bcf 100644 --- a/go.mod +++ b/go.mod @@ -11,25 +11,23 @@ require ( github.com/chasex/glog v0.0.0-20160217080310-c62392af379c github.com/coocood/freecache v1.2.0 github.com/docker/go-units v0.4.0 - github.com/evanphx/json-patch/v5 v5.6.0 github.com/gofrs/uuid v4.2.0+incompatible github.com/golang/glog v1.0.0 - github.com/influxdata/influxdb v1.6.1 github.com/julienschmidt/httprouter v1.3.0 github.com/lib/pq v1.0.0 github.com/magiconair/properties v1.8.5 - github.com/mitchellh/copystructure v1.1.2 - github.com/mxmCherry/openrtb/v15 v15.0.0 + github.com/mitchellh/copystructure v1.2.0 + github.com/mxmCherry/openrtb/v15 v15.0.1 github.com/prebid/go-gdpr v1.11.0 github.com/prebid/prebid-server v0.0.0-00010101000000-000000000000 github.com/prometheus/client_golang v1.11.0 github.com/prometheus/client_model v0.2.0 - github.com/rcrowley/go-metrics v0.0.0-20180503174638-e2704e165165 + github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 github.com/rs/cors v1.8.2 github.com/sergi/go-diff v1.2.0 // indirect github.com/spf13/viper v1.10.1 github.com/stretchr/testify v1.7.0 - github.com/vrischmann/go-metrics-influxdb v0.0.0-20160917065939-43af8332c303 + github.com/vrischmann/go-metrics-influxdb v0.1.1 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v0.0.0-20180816142147-da425ebb7609 @@ -38,7 +36,8 @@ require ( github.com/yudai/pp v2.0.1+incompatible // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd golang.org/x/text v0.3.7 - gopkg.in/yaml.v2 v2.4.0 + gopkg.in/evanphx/json-patch.v4 v4.12.0 + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) replace github.com/prebid/prebid-server => ./ diff --git a/go.sum b/go.sum index 3cbf6681213..207102bc435 100644 --- a/go.sum +++ b/go.sum @@ -123,8 +123,6 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go. github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= -github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= -github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= @@ -257,9 +255,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/influxdata/influxdb v1.6.1 h1:OseoBlzI5ftNI/bczyxSWq6PKRCNEeiXvyWP/wS5fB0= -github.com/influxdata/influxdb v1.6.1/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d h1:/WZQPMZNsjZ7IlCpsLGdQBINg5bxKQ1K1sh6awxLtkA= +github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -306,16 +303,16 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/copystructure v1.1.2 h1:Th2TIvG1+6ma3e/0/bopBKohOTY7s4dA8V2q4EUcBJ0= -github.com/mitchellh/copystructure v1.1.2/go.mod h1:EBArHfARyrSWO/+Wyr9zwEkc6XMFB9XyNgFNmRkZZU4= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= +github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE= -github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= +github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= @@ -371,8 +368,9 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/rcrowley/go-metrics v0.0.0-20180503174638-e2704e165165 h1:nkcn14uNmFEuGCb2mBZbBb24RdNRL08b/wb+xBOYpuk= -github.com/rcrowley/go-metrics v0.0.0-20180503174638-e2704e165165/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= @@ -411,8 +409,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/vrischmann/go-metrics-influxdb v0.0.0-20160917065939-43af8332c303 h1:Va10CytCCYRm4xBTses5ZDeDjeIQjhaiC9nRCe/yflI= -github.com/vrischmann/go-metrics-influxdb v0.0.0-20160917065939-43af8332c303/go.mod h1:Xdcad1nGVhQfhoV0go+/4WaI/RZkWlvfjkVCdpMTxPY= +github.com/vrischmann/go-metrics-influxdb v0.1.1 h1:xneKFRjsS4BiVYvAKaM/rOlXYd1pGHksnES0ECCJLgo= +github.com/vrischmann/go-metrics-influxdb v0.1.1/go.mod h1:q7YC8bFETCYopXRMtUvQQdLaoVhpsEwvQS2zZEYCqg8= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= @@ -861,6 +859,8 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= +gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= diff --git a/metrics/config/metrics.go b/metrics/config/metrics.go index 39e7f47f0ea..822bc7879ea 100644 --- a/metrics/config/metrics.go +++ b/metrics/config/metrics.go @@ -24,14 +24,17 @@ func NewMetricsEngine(cfg *config.Configuration, adapterList []openrtb_ext.Bidde // Currently use go-metrics as the metrics piece for influx returnEngine.GoMetrics = metrics.NewMetrics(gometrics.NewPrefixedRegistry("prebidserver."), adapterList, cfg.Metrics.Disabled, syncerKeys) engineList = append(engineList, returnEngine.GoMetrics) + // Set up the Influx logger go influxdb.InfluxDB( returnEngine.GoMetrics.MetricsRegistry, // metrics registry time.Second*time.Duration(cfg.Metrics.Influxdb.MetricSendInterval), // Configurable interval cfg.Metrics.Influxdb.Host, // the InfluxDB url cfg.Metrics.Influxdb.Database, // your InfluxDB database + cfg.Metrics.Influxdb.Measurement, // your measurement cfg.Metrics.Influxdb.Username, // your InfluxDB user - cfg.Metrics.Influxdb.Password, // your InfluxDB password + cfg.Metrics.Influxdb.Password, // your InfluxDB password, + cfg.Metrics.Influxdb.AlignTimestamps, // align timestamps ) // Influx is not added to the engine list as goMetrics takes care of it already. } diff --git a/static/bidder-info/synacormedia.yaml b/static/bidder-info/synacormedia.yaml index 589fce9c7fb..1769ab8282d 100644 --- a/static/bidder-info/synacormedia.yaml +++ b/static/bidder-info/synacormedia.yaml @@ -13,8 +13,3 @@ userSync: iframe: url: "https://ad-cdn.technoratimedia.com/html/usersync.html?cb={{.RedirectURL}}" userMacro: "[USER_ID]" -userSync: - # synacormedia supports user syncing, but requires configuration by the host. contact this - # bidder directly at the email address in this file to ask about enabling user sync. - supports: - - iframe \ No newline at end of file