test

PubMatic-OpenWrap · Jan 6, 2025 · bd5a66e · bd5a66e
1 parent 3359a04
commit bd5a66e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/endpoints/openrtb2/test_utils.go b/endpoints/openrtb2/test_utils.go
@@ -14,7 +14,6 @@ import (
 	"testing"
 	"time"
 
-	"git.pubmatic.com/vastunwrap/unwrap"
 	"github.com/buger/jsonparser"
 	"github.com/julienschmidt/httprouter"
 	"github.com/prebid/openrtb/v20/openrtb2"
@@ -1204,9 +1203,6 @@ func (te *exchangeTestWrapper) HoldAuction(ctx context.Context, r *exchange.Auct
 	return te.ex.HoldAuction(ctx, r, debugLog)
 }
 
-func (te *exchangeTestWrapper) RecordFastXMLTestMetrics(ctx *unwrap.UnwrapContext, etreeResp, fastxmlResp *unwrap.UnwrapResponse) {
-}
-
 // buildTestExchange returns an exchange with mock bidder servers and mock currency conversion server
 func buildTestExchange(testCfg *testConfigValues, adapterMap map[openrtb_ext.BidderName]exchange.AdaptedBidder, mockBidServersArray []*httptest.Server, mockCurrencyRatesServer *httptest.Server, bidderInfos config.BidderInfos, cfg *config.Configuration, met metrics.MetricsEngine, mockFetcher stored_requests.CategoryFetcher) (exchange.Exchange, []*httptest.Server) {
 	if len(testCfg.MockBidders) == 0 {

diff --git a/exchange/exchange.go b/exchange/exchange.go
@@ -14,7 +14,6 @@ import (
 	"strings"
 	"time"
 
-	"git.pubmatic.com/vastunwrap/unwrap"
 	"github.com/prebid/prebid-server/v2/modules/pubmatic/openwrap/models/nbr"
 	"github.com/prebid/prebid-server/v2/modules/pubmatic/openwrap/utils"
 	"github.com/prebid/prebid-server/v2/privacy"
@@ -57,7 +56,6 @@ type extCacheInstructions struct {
 type Exchange interface {
 	// HoldAuction executes an OpenRTB v2.5 Auction.
 	HoldAuction(ctx context.Context, r *AuctionRequest, debugLog *DebugLog) (*AuctionResponse, error)
-	RecordFastXMLTestMetrics(ctx *unwrap.UnwrapContext, etreeResp, fastxmlResp *unwrap.UnwrapResponse)
 }
 
 // IdFetcher can find the user's ID for a specific Bidder.

diff --git a/exchange/exchange_ow.go b/exchange/exchange_ow.go
@@ -185,10 +185,10 @@ func recordBids(ctx context.Context, metricsEngine metrics.MetricsEngine, pubID
 	}
 }
 
-func (e *exchange) RecordFastXMLTestMetrics(ctx *unwrap.UnwrapContext, etreeResp, fastxmlResp *unwrap.UnwrapResponse) {
-	e.me.RecordXMLParserResponseTime(metrics.XMLParserLabelFastXML, "unwrap", ctx.FastXMLTestCtx.FastXMLStats.ResponseTime)
-	e.me.RecordXMLParserResponseTime(metrics.XMLParserLabelETree, "unwrap", ctx.FastXMLTestCtx.ETreeStats.ResponseTime)
-	e.me.RecordXMLParserResponseMismatch("unwrap", (etreeResp != fastxmlResp))
+func RecordFastXMLTestMetrics(metricsEngine metrics.MetricsEngine, ctx *unwrap.UnwrapContext, etreeResp, fastxmlResp *unwrap.UnwrapResponse) {
+	metricsEngine.RecordXMLParserResponseTime(metrics.XMLParserLabelFastXML, "unwrap", ctx.FastXMLTestCtx.FastXMLStats.ResponseTime)
+	metricsEngine.RecordXMLParserResponseTime(metrics.XMLParserLabelETree, "unwrap", ctx.FastXMLTestCtx.ETreeStats.ResponseTime)
+	metricsEngine.RecordXMLParserResponseMismatch("unwrap", string(etreeResp.Response) != string(fastxmlResp.Response))
 }
 
 func recordVastVersion(metricsEngine metrics.MetricsEngine, adapterBids map[openrtb_ext.BidderName]*entities.PbsOrtbSeatBid) {

diff --git a/router/router_ow.go b/router/router_ow.go
@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	unwrap "git.pubmatic.com/vastunwrap/unwrap"
+	"github.com/PubMatic-OpenWrap/prebid-server/v2/exchange"
 	"github.com/julienschmidt/httprouter"
 	middleware "github.com/prebid/prebid-server/v2/modules/pubmatic/openwrap/middleware/adpod"
 )
@@ -56,10 +57,9 @@ func (r *Router) registerOpenWrapEndpoints(openrtbEndpoint, ampEndpoint httprout
 }
 
 func initFastXMLTest() {
-	if g_ex != nil {
+	if g_metrics != nil {
 		unwrap.InitRecordFastXMLTestMetrics(func(ctx *unwrap.UnwrapContext, etreeResp, fastxmlResp *unwrap.UnwrapResponse) {
-			e := *g_ex
-			e.RecordFastXMLTestMetrics(ctx, etreeResp, fastxmlResp)
+			exchange.RecordFastXMLTestMetrics(g_metrics, ctx, etreeResp, fastxmlResp)
 		})
 	}
 }