Merge branch 'prebid_v2.0.1' into prebid_v2.0.2

PubMatic-OpenWrap · Nov 28, 2023 · 7c7a9a0 · 7c7a9a0
2 parents 180eb41 + f983e9f
commit 7c7a9a0
Show file tree

Hide file tree

Showing 423 changed files with 75,331 additions and 559 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+*	@viral-vala @shriprasad-marathe @ganesh-salpure
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,12 @@
+# Description
+
+Please add change description or link to ticket, docs, etc.
+
+# Checklist:
+
+- [ ] PR commit list is unique (rebase/pull with the origin branch to keep master clean).
+- [ ] JIRA number is added in the PR title and the commit message.
+- [ ] Updated the `header-bidding` repo with appropiate commit id.
+- [ ] Documented the new changes.
+
+For Prebid upgrade, refer: https://inside.pubmatic.com:8443/confluence/display/Products/Prebid-server+upgrade
diff --git a/.github/workflows/adapter-code-coverage.yml b/.github/workflows/adapter-code-coverage.yml
@@ -43,6 +43,8 @@ jobs:
         id: run_coverage
         if: steps.get_directories.outputs.result != ''
         run: |
+          git config --global url."https://${USERNAME}:${TOKEN}@git.pubmatic.com".insteadOf "https://git.pubmatic.com"
+
           directories=$(echo '${{ steps.get_directories.outputs.result }}' | jq -r '.[]')
           go mod download
 
@@ -65,13 +67,18 @@ jobs:
           # remove pull request branch files
           cd ..
           rm -f -r ./*
+        env:
+          GO111MODULE: "on"
+          GOPRIVATE: "git.pubmatic.com/PubMatic/*"
+          TOKEN: ${{ secrets.PM_OPENWRAP_CICD_PASSWORD }}
+          USERNAME: ${{ secrets.PM_OPENWRAP_CICD_USERNAME }}
 
       - name: Checkout coverage-preview branch
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
           ref: coverage-preview
-          repository: prebid/prebid-server
+          repository: PubMatic-OpenWrap/prebid-server
 
       - name: Commit coverage files to coverage-preview branch
         if: steps.run_coverage.outputs.coverage_dir != ''

diff --git a/.github/workflows/cross-repo-issue.yml b/.github/workflows/cross-repo-issue.yml
@@ -4,7 +4,7 @@ on:
   pull_request_target:
     types: [closed]
     branches:
-      - "master"
+      - "master-disable"
 
 jobs:
   cross-repo:

diff --git a/.github/workflows/validate-merge.yml b/.github/workflows/validate-merge.yml
@@ -2,7 +2,10 @@ name: Validate Merge
 
 on:
   pull_request:
-    branches: [master]
+    branches:
+      - master
+      - main
+      - ci
 
 jobs:
   validate-merge:
@@ -19,6 +22,10 @@ jobs:
 
     - name: Validate
       run: |
+        git config --global url."https://${USERNAME}:${TOKEN}@git.pubmatic.com".insteadOf "https://git.pubmatic.com"
         ./validate.sh --nofmt --cov --race 10
       env:
         GO111MODULE: "on"
+        GOPRIVATE: "git.pubmatic.com/PubMatic/*"
+        TOKEN: ${{ secrets.PM_OPENWRAP_CICD_PASSWORD }}
+        USERNAME: ${{ secrets.PM_OPENWRAP_CICD_USERNAME }}
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -28,6 +28,10 @@ jobs:
 
     - name: Validate
       run: |
+        git config --global url."https://${USERNAME}:${TOKEN}@git.pubmatic.com".insteadOf "https://git.pubmatic.com"
         ./validate.sh --nofmt --cov --race 10
       env:
         GO111MODULE: "on"
+        GOPRIVATE: "git.pubmatic.com/PubMatic/*"
+        TOKEN: ${{ secrets.PM_OPENWRAP_CICD_PASSWORD }}
+        USERNAME: ${{ secrets.PM_OPENWRAP_CICD_USERNAME }}
diff --git a/.gitignore b/.gitignore
@@ -40,6 +40,7 @@ inventory_url.yaml
 
 # generated log files during tests
 analytics/config/testFiles/
+analytics/config/xyz*
 analytics/filesystem/testFiles/
 
 # autogenerated version file
@@ -56,3 +57,5 @@ analytics/filesystem/testFiles/
 *~
 *.swp
 *.swo
+pbsimage
+manual_build
diff --git a/Makefile b/Makefile
@@ -33,3 +33,26 @@ image:
 # format runs format
 format:
 	./scripts/format.sh -f true
+
+mockgen: mockgeninstall mockgendb mockgencache mockgenmetrics
+
+# export GOPATH=~/go ; GOBIN=~/go/bin; export PATH=$PATH:$GOBIN   
+mockgeninstall:
+	go install github.com/golang/mock/[email protected]
+
+mockgendb:
+	mkdir -p modules/pubmatic/openwrap/database/mock modules/pubmatic/openwrap/database/mock_driver
+	mockgen database/sql/driver Driver,Connector,Conn,DriverContext > modules/pubmatic/openwrap/database/mock_driver/mock.go
+	mockgen github.com/PubMatic-OpenWrap/prebid-server/v2/modules/pubmatic/openwrap/database Database > modules/pubmatic/openwrap/database/mock/mock.go
+
+mockgencache:
+	mkdir -p modules/pubmatic/openwrap/cache/mock
+	mockgen github.com/PubMatic-OpenWrap/prebid-server/v2/modules/pubmatic/openwrap/cache Cache > modules/pubmatic/openwrap/cache/mock/mock.go
+
+mockgenmetrics:
+	mkdir -p modules/pubmatic/openwrap/metrics/mock
+	mockgen github.com/PubMatic-OpenWrap/prebid-server/modules/v2/pubmatic/openwrap/metrics MetricsEngine > modules/pubmatic/openwrap/metrics/mock/mock.go
+
+mockgenlogger:
+	mkdir -p analytics/pubmatic/mhttp/mock
+	mockgen github.com/PubMatic-OpenWrap/prebid-server/analytics/pubmatic/mhttp HttpCallInterface,MultiHttpContextInterface > analytics/pubmatic/mhttp/mock/mock.go
diff --git a/README.md b/README.md
@@ -30,8 +30,8 @@ Download and prepare Prebid Server:
 
 ```bash
 cd YOUR_DIRECTORY
-git clone https://github.com/prebid/prebid-server src/github.com/prebid/prebid-server
-cd src/github.com/prebid/prebid-server
+git clone https://github.com/PubMatic-OpenWrap/prebid-server src/github.com/PubMatic-OpenWrap/prebid-server
+cd src/github.com/PubMatic-OpenWrap/prebid-server
 ```
 
 Run the automated tests:
@@ -69,11 +69,10 @@ of exported types.
 
 Want to [add an adapter](https://docs.prebid.org/prebid-server/developers/add-new-bidder-go.html)? Found a bug? Great!
 
-Report bugs, request features, and suggest improvements [on Github](https://github.com/prebid/prebid-server/issues).
-
-Or better yet, [open a pull request](https://github.com/prebid/prebid-server/compare) with the changes you'd like to see.
+Or better yet, [open a pull request](https://github.com/PubMatic-OpenWrap/prebid-server/compare) with the changes you'd like to see.
 
 ## IDE Recommendations
 
 The quickest way to start developing Prebid Server in a reproducible environment isolated from your host OS
 is by using Visual Studio Code with [Remote Container Setup](devcontainer.md).
+
diff --git a/adapters/appnexus/appnexus.go b/adapters/appnexus/appnexus.go
@@ -140,16 +140,17 @@ func (a *adapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *adapters.E
 		return nil, append(errs, err)
 	}
 
+	// Commenting out the following piece of code to avoid populating adpod_id in the Appnexus request (ref: https://inside.pubmatic.com:9443/jira/browse/UOE-6196)
 	// For long form requests if adpodId feature enabled, adpod_id must be sent downstream.
 	// Adpod id is a unique identifier for pod
 	// All impressions in the same pod must have the same pod id in request extension
 	// For this all impressions in  request should belong to the same pod
 	// If impressions number per pod is more than maxImpsPerReq - divide those imps to several requests but keep pod id the same
 	// If  adpodId feature disabled and impressions number per pod is more than maxImpsPerReq  - divide those imps to several requests but do not include ad pod id
-	if isVIDEO == 1 && *shouldGenerateAdPodId {
+	/*if isVIDEO == 1 && *shouldGenerateAdPodId {
 		requests, errors := a.buildAdPodRequests(request.Imp, request, reqExt, reqExtAppnexus, requestURI.String())
 		return requests, append(errs, errors...)
-	}
+	}*/
 
 	requests, errors := splitRequests(request.Imp, request, reqExt, reqExtAppnexus, requestURI.String())
 	return requests, append(errs, errors...)

diff --git a/adapters/appnexus/appnexustest/video/video-same-adpodid-two-imps-same-pod.json b/adapters/appnexus/appnexustest/video/video-same-adpodid-two-imps-same-pod.json
@@ -47,8 +47,7 @@
 			"id": "test-request-id",
 			"ext": {
 				"appnexus": {
-				 "adpod_id": "10",
-				  "hb_source": 6
+				 "hb_source": 6
 				}
 			},
 			"imp": [
@@ -94,4 +93,4 @@
 	  }
 	],
     "expectedBidResponses": [{"currency":"USD","bids":[]}]
-  }
+  }
diff --git a/adapters/bidder.go b/adapters/bidder.go
@@ -100,6 +100,7 @@ type TypedBid struct {
 	BidMeta      *openrtb_ext.ExtBidPrebidMeta
 	BidType      openrtb_ext.BidType
 	BidVideo     *openrtb_ext.ExtBidPrebidVideo
+	BidTargets   map[string]string
 	DealPriority int
 	Seat         openrtb_ext.BidderName
 }
@@ -115,12 +116,20 @@ type ResponseData struct {
 	Headers    http.Header
 }
 
+type BidRequestParams struct {
+	ImpIndex     int
+	VASTTagIndex int
+}
+
 // RequestData packages together the fields needed to make an http.Request.
 type RequestData struct {
+	Params  *BidRequestParams
 	Method  string
 	Uri     string
 	Body    []byte
 	Headers http.Header
+
+	BidderName openrtb_ext.BidderName `json:"-"`
 }
 
 // ExtImpBidder can be used by Bidders to unmarshal any request.imp[i].ext.

diff --git a/adapters/conversant/conversant.go b/adapters/conversant/conversant.go
@@ -73,7 +73,7 @@ func (c *ConversantAdapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *
 }
 
 func parseCnvrParams(imp *openrtb2.Imp, cnvrExt openrtb_ext.ExtImpConversant) {
-	imp.DisplayManager = "prebid-s2s"
+	imp.DisplayManager = "pubmatic-openwrap"
 	imp.DisplayManagerVer = "2.0.0"
 
 	if imp.BidFloor <= 0 && cnvrExt.BidFloor > 0 {

diff --git a/adapters/conversant/conversanttest/exemplary/banner.json b/adapters/conversant/conversanttest/exemplary/banner.json
@@ -41,7 +41,7 @@
               "tagid": "mytag",
               "secure": 1,
               "bidfloor": 0.01,
-              "displaymanager": "prebid-s2s",
+              "displaymanager": "pubmatic-openwrap",
               "displaymanagerver": "2.0.0",
               "banner": {
                 "format": [{"w": 300, "h": 250}]

diff --git a/adapters/conversant/conversanttest/exemplary/simple_app.json b/adapters/conversant/conversanttest/exemplary/simple_app.json
@@ -45,7 +45,7 @@
               "tagid": "mytag",
               "secure": 1,
               "bidfloor": 0.01,
-              "displaymanager": "prebid-s2s",
+              "displaymanager": "pubmatic-openwrap",
               "displaymanagerver": "2.0.0",
               "banner": {
                 "format": [{"w": 300, "h": 250}]

diff --git a/adapters/conversant/conversanttest/exemplary/video.json b/adapters/conversant/conversanttest/exemplary/video.json
@@ -49,7 +49,7 @@
               "tagid": "mytag",
               "secure": 1,
               "bidfloor": 0.01,
-              "displaymanager": "prebid-s2s",
+              "displaymanager": "pubmatic-openwrap",
               "displaymanagerver": "2.0.0",
               "video": {
                 "w": 300,

diff --git a/adapters/conversant/conversanttest/supplemental/server_badresponse.json b/adapters/conversant/conversanttest/supplemental/server_badresponse.json
@@ -30,7 +30,7 @@
         "imp": [
           {
             "id": "1",
-            "displaymanager": "prebid-s2s",
+            "displaymanager": "pubmatic-openwrap",
             "displaymanagerver": "2.0.0",
             "banner": {
               "format": [{"w": 300, "h": 250}]

diff --git a/adapters/conversant/conversanttest/supplemental/server_nocontent.json b/adapters/conversant/conversanttest/supplemental/server_nocontent.json
@@ -30,7 +30,7 @@
         "imp": [
           {
             "id": "1",
-            "displaymanager": "prebid-s2s",
+            "displaymanager": "pubmatic-openwrap",
             "displaymanagerver": "2.0.0",
             "banner": {
               "format": [{"w": 300, "h": 250}]

diff --git a/adapters/conversant/conversanttest/supplemental/server_unknownstatus.json b/adapters/conversant/conversanttest/supplemental/server_unknownstatus.json
@@ -30,7 +30,7 @@
         "imp": [
           {
             "id": "1",
-            "displaymanager": "prebid-s2s",
+            "displaymanager": "pubmatic-openwrap",
             "displaymanagerver": "2.0.0",
             "banner": {
               "format": [{"w": 300, "h": 250}]

diff --git a/adapters/conversant/conversanttest/supplemental/test_params.json b/adapters/conversant/conversanttest/supplemental/test_params.json
@@ -107,7 +107,7 @@
             "bidfloor": 7,
             "secure": 1,
             "tagid": "mytag",
-            "displaymanager": "prebid-s2s",
+            "displaymanager": "pubmatic-openwrap",
             "displaymanagerver": "2.0.0",
             "video": {
               "api": [1,2],
@@ -126,7 +126,7 @@
             "bidfloor": 1,
             "secure": 1,
             "tagid": "mytag",
-            "displaymanager": "prebid-s2s",
+            "displaymanager": "pubmatic-openwrap",
             "displaymanagerver": "2.0.0",
             "video": {
               "api": [1,2],
@@ -154,7 +154,7 @@
             "bidfloor": 7,
             "secure": 1,
             "tagid": "mytag",
-            "displaymanager": "prebid-s2s",
+            "displaymanager": "pubmatic-openwrap",
             "displaymanagerver": "2.0.0",
             "video": {
               "api": [1,2],
@@ -182,7 +182,7 @@
             "bidfloor": -3,
             "secure": 1,
             "tagid": "mytag",
-            "displaymanager": "prebid-s2s",
+            "displaymanager": "pubmatic-openwrap",
             "displaymanagerver": "2.0.0",
             "video": {
               "api": [1,2],
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* @viral-vala @shriprasad-marathe @ganesh-salpure