Skip to content
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

Admatic: Add headers #4083

Merged
merged 65 commits into from
Jan 28, 2025
Merged

Admatic: Add headers #4083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
d7218f0
admatic s2s
bakicam May 2, 2024
594a808
Merge branch 'prebid:master' into master
bakicam May 2, 2024
546cda3
Update admatic.go
bakicam May 2, 2024
435b598
formatted jsons
bakicam May 2, 2024
dbec2de
fmt
bakicam May 2, 2024
c05d833
Merge branch 'prebid:master' into master
farukcam May 13, 2024
094bd52
Update admatic.go
bakicam May 14, 2024
87dd911
Merge branch 'master' of https://github.com/Admatic-Sofware/prebid-se…
bakicam May 14, 2024
49b9c49
Merge branch 'prebid:master' into master
farukcam May 22, 2024
bc0468f
impIDs
bakicam May 23, 2024
f6caf06
Merge branch 'master' of https://github.com/Admatic-Sofware/prebid-se…
bakicam May 23, 2024
801a99c
Merge branch 'prebid:master' into master
farukcam May 23, 2024
60a434c
Update admatic.json
bakicam May 23, 2024
331f4f0
Merge branch 'master' of https://github.com/Admatic-Sofware/prebid-se…
bakicam May 23, 2024
4fb522c
Merge branch 'prebid:master' into master
farukcam May 23, 2024
ac61d1c
Update admatic.go
bakicam May 24, 2024
f978cf0
Update admatic.go
bakicam May 24, 2024
f025b87
Update admatic.yaml
bakicam May 24, 2024
b02724b
Update admatic.go
bakicam May 24, 2024
63387d3
Update admatic.go
bakicam May 24, 2024
6754f16
Merge branch 'prebid:master' into master
farukcam May 27, 2024
c5a8a1e
Merge branch 'prebid:master' into master
farukcam May 30, 2024
61369b4
Merge branch 'prebid:master' into master
farukcam May 31, 2024
41258e8
Merge branch 'prebid:master' into master
farukcam Jun 2, 2024
6d11972
Merge branch 'prebid:master' into master
farukcam Jun 4, 2024
fbb1c27
Merge branch 'prebid:master' into master
farukcam Jun 5, 2024
186ce42
Merge branch 'prebid:master' into master
farukcam Jun 5, 2024
a3c2dd9
Merge branch 'prebid:master' into master
farukcam Jun 7, 2024
ac73568
Merge branch 'prebid:master' into master
farukcam Jun 11, 2024
6577bc0
Merge branch 'prebid:master' into master
farukcam Jun 17, 2024
af62418
Merge branch 'prebid:master' into master
farukcam Jun 24, 2024
81e7c20
Merge branch 'prebid:master' into master
farukcam Jun 24, 2024
4d10b47
Merge branch 'prebid:master' into master
farukcam Jun 25, 2024
d1dfaef
Update admatic.go
bakicam Jun 26, 2024
83b23a1
Merge branch 'prebid:master' into master
farukcam Jun 28, 2024
6198a7b
Merge branch 'prebid:master' into master
farukcam Jun 28, 2024
6558291
solved problems
bakicam Jun 29, 2024
9fe986d
Update server-error.json
bakicam Jun 29, 2024
3dced1b
update server error
bakicam Jun 29, 2024
fa1bbba
Create bad-request.json
bakicam Jun 29, 2024
c2655e5
Merge branch 'prebid:master' into master
farukcam Jul 2, 2024
5fc719d
solved problems
bakicam Jul 2, 2024
06a91e3
Create multiple-imps-with-error.json
bakicam Jul 2, 2024
9d10bdd
Update multiple-imps-with-error.json
bakicam Jul 2, 2024
1df070a
Create multiple-imps.json
bakicam Jul 2, 2024
d20bbb8
Update multiple-imps.json
bakicam Jul 2, 2024
11629c5
Merge branch 'prebid:master' into master
farukcam Jul 3, 2024
429bc6c
Merge branch 'prebid:master' into master
farukcam Aug 20, 2024
1541bc0
Merge branch 'prebid:master' into master
bakicam Dec 1, 2024
8cc81a7
add adapter headers
bakicam Dec 1, 2024
e7b6f38
Merge branch 'master' of https://github.com/Admatic-Sofware/prebid-se…
bakicam Dec 1, 2024
26e50b2
pretty file
bakicam Dec 1, 2024
95057fa
Merge branch 'prebid:master' into master
farukcam Dec 19, 2024
313c6a1
add test headers to test json
bakicam Dec 19, 2024
b46d969
add device object to test json
bakicam Dec 19, 2024
c10cd11
Update server-error.json
bakicam Dec 19, 2024
2e17308
Merge branch 'prebid:master' into master
farukcam Jan 8, 2025
686ebd0
Merge branch 'prebid:master' into master
farukcam Jan 9, 2025
2f962c9
Merge branch 'prebid:master' into master
farukcam Jan 10, 2025
13ec60c
Merge branch 'prebid:master' into master
farukcam Jan 15, 2025
f41426b
Merge branch 'prebid:master' into master
farukcam Jan 17, 2025
5127e2f
Merge branch 'prebid:master' into master
farukcam Jan 20, 2025
981b35e
Merge branch 'prebid:master' into master
farukcam Jan 22, 2025
fe786a5
Merge branch 'prebid:master' into master
farukcam Jan 27, 2025
6e30190
added ipv6
bakicam Jan 27, 2025
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
25 changes: 21 additions & 4 deletions adapters/admatic/admatic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,22 @@ func (a *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapte
var requests []*adapters.RequestData
var errs []error

headers := http.Header{}
headers.Add("Content-Type", "application/json;charset=utf-8")
headers.Add("Accept", "application/json")
if request.Device != nil {
if len(request.Device.UA) > 0 {
headers.Add("User-Agent", request.Device.UA)
}

if len(request.Device.IPv6) > 0 {
headers.Add("X-Forwarded-For", request.Device.IPv6)
}

if len(request.Device.IP) > 0 {
headers.Add("X-Forwarded-For", request.Device.IP)
}
}
Comment on lines +38 to +53
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add JSON test coverage for this logic by adding and/or updating 2 JSON tests, one where device is nil and one where device is not nil with ua, ip and ipv6 set. You can verify the headers are set correctly by including the following in your JSON test:

"httpCalls": [
    {
      "expectedRequest": {
        "headers": {
          "Content-Type": [
            "application/json;charset=utf-8"
          ],
          "Accept": [
            "application/json"
          ],
          etc...
``

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi,
We added this.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add coverage for the case where IPv6 is set?

requestCopy := *request
for _, imp := range request.Imp {
requestCopy.Imp = []openrtb2.Imp{imp}
Expand All @@ -52,10 +68,11 @@ func (a *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapte
}

request := &adapters.RequestData{
Method: http.MethodPost,
Body: requestJSON,
Uri: endpoint,
ImpIDs: openrtb_ext.GetImpIDs(requestCopy.Imp),
Method: http.MethodPost,
Body: requestJSON,
Uri: endpoint,
Headers: headers,
ImpIDs: openrtb_ext.GetImpIDs(requestCopy.Imp),
}

requests = append(requests, request)
Expand Down
26 changes: 26 additions & 0 deletions adapters/admatic/admatictest/exemplary/banner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"mockBidRequest": {
"id": "test-request-id-banner",
"device": {
"ua": "test-user-agent",
"ip": "123.123.123.123",
"language": "en",
"dnt": 0
},
"imp": [
{
"id": "test-imp-id-banner",
Expand All @@ -24,9 +30,29 @@
"httpCalls": [
{
"expectedRequest": {
"headers": {
"Content-Type": [
"application/json;charset=utf-8"
],
"Accept": [
"application/json"
],
"User-Agent": [
"test-user-agent"
],
"X-Forwarded-For": [
"123.123.123.123"
]
},
"uri": "http://pbs.admatic.com.tr?host=layer.serve.admatic.com.tr",
"body": {
"id": "test-request-id-banner",
"device": {
"ua": "test-user-agent",
"ip": "123.123.123.123",
"language": "en",
"dnt": 0
},
"imp": [
{
"id": "test-imp-id-banner",
Expand Down
122 changes: 122 additions & 0 deletions adapters/admatic/admatictest/exemplary/headers_ipv4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"mockBidRequest": {
"id": "test-request-id-banner",
"device": {
"ua": "test-user-agent",
"ip": "123.123.123.123",
"language": "en",
"dnt": 0
},
"imp": [
{
"id": "test-imp-id-banner",
"banner": {
"format": [
{
"w": 728,
"h": 90
}
]
},
"ext": {
"bidder": {
"host": "layer.serve.admatic.com.tr",
"networkId": 12345
}
}
}
]
},
"httpCalls": [
{
"expectedRequest": {
"headers": {
"Content-Type": [
"application/json;charset=utf-8"
],
"Accept": [
"application/json"
],
"User-Agent": [
"test-user-agent"
],
"X-Forwarded-For": [
"123.123.123.123"
]
},
"uri": "http://pbs.admatic.com.tr?host=layer.serve.admatic.com.tr",
"body": {
"id": "test-request-id-banner",
"device": {
"ua": "test-user-agent",
"ip": "123.123.123.123",
"language": "en",
"dnt": 0
},
"imp": [
{
"id": "test-imp-id-banner",
"banner": {
"format": [
{
"w": 728,
"h": 90
}
]
},
"ext": {
"bidder": {
"host": "layer.serve.admatic.com.tr",
"networkId": 12345
}
}
}
]
},
"impIDs": ["test-imp-id-banner"]
},
"mockResponse": {
"status": 200,
"body": {
"id": "test-request-id-banner",
"seatbid": [
{
"seat": "admatic",
"bid": [
{
"id": "8ee514f1-b2b8-4abb-89fd-084437d1e800",
"impid": "test-imp-id-banner",
"price": 0.5,
"adm": "some-test-ad-banner",
"crid": "crid_10",
"w": 728,
"h": 90
}
]
}
],
"cur": "USD"
}
}
}
],
"expectedBidResponses": [
{
"currency": "USD",
"bids": [
{
"bid": {
"id": "8ee514f1-b2b8-4abb-89fd-084437d1e800",
"impid": "test-imp-id-banner",
"price": 0.5,
"adm": "some-test-ad-banner",
"crid": "crid_10",
"w": 728,
"h": 90
},
"type": "banner"
}
]
}
]
}
123 changes: 123 additions & 0 deletions adapters/admatic/admatictest/exemplary/headers_ipv6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
{
"mockBidRequest": {
"id": "test-request-id-banner",
"device": {
"ua": "test-user-agent",
"ipv6": "2607:fb90:f27:4512:d800:cb23:a603:e245",
"language": "en",
"dnt": 0
},
"imp": [
{
"id": "test-imp-id-banner",
"banner": {
"format": [
{
"w": 728,
"h": 90
}
]
},
"ext": {
"bidder": {
"host": "layer.serve.admatic.com.tr",
"networkId": 12345
}
}
}
]
},
"httpCalls": [
{
"expectedRequest": {
"headers": {
"Content-Type": [
"application/json;charset=utf-8"
],
"Accept": [
"application/json"
],
"User-Agent": [
"test-user-agent"
],
"X-Forwarded-For": [
"2607:fb90:f27:4512:d800:cb23:a603:e245"
]
},
"uri": "http://pbs.admatic.com.tr?host=layer.serve.admatic.com.tr",
"body": {
"id": "test-request-id-banner",
"device": {
"ua": "test-user-agent",
"ipv6": "2607:fb90:f27:4512:d800:cb23:a603:e245",
"language": "en",
"dnt": 0
},
"imp": [
{
"id": "test-imp-id-banner",
"banner": {
"format": [
{
"w": 728,
"h": 90
}
]
},
"ext": {
"bidder": {
"host": "layer.serve.admatic.com.tr",
"networkId": 12345
}
}
}
]
},
"impIDs": ["test-imp-id-banner"]
},
"mockResponse": {
"status": 200,
"body": {
"id": "test-request-id-banner",
"seatbid": [
{
"seat": "admatic",
"bid": [
{
"id": "8ee514f1-b2b8-4abb-89fd-084437d1e800",
"impid": "test-imp-id-banner",
"price": 0.5,
"adm": "some-test-ad-banner",
"crid": "crid_10",
"w": 728,
"h": 90
}
]
}
],
"cur": "USD"
}
}
}
],
"expectedBidResponses": [
{
"currency": "USD",
"bids": [
{
"bid": {
"id": "8ee514f1-b2b8-4abb-89fd-084437d1e800",
"impid": "test-imp-id-banner",
"price": 0.5,
"adm": "some-test-ad-banner",
"crid": "crid_10",
"w": 728,
"h": 90
},
"type": "banner"
}
]
}
]
}

32 changes: 32 additions & 0 deletions adapters/admatic/admatictest/exemplary/multiple-imps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"mockBidRequest": {
"id": "test-request-id-banner",
"device": {
"ua": "test-user-agent",
"ip": "123.123.123.123",
"language": "en",
"dnt": 0
},
"imp": [
{
"id": "test-imp-id-banner",
Expand Down Expand Up @@ -41,9 +47,29 @@
"httpCalls": [
{
"expectedRequest": {
"headers": {
"Content-Type": [
"application/json;charset=utf-8"
],
"Accept": [
"application/json"
],
"User-Agent": [
"test-user-agent"
],
"X-Forwarded-For": [
"123.123.123.123"
]
},
"uri": "http://pbs.admatic.com.tr?host=layer.serve.admatic.com.tr",
"body": {
"id": "test-request-id-banner",
"device": {
"ua": "test-user-agent",
"ip": "123.123.123.123",
"language": "en",
"dnt": 0
},
"imp": [
{
"id": "test-imp-id-banner",
Expand Down Expand Up @@ -95,6 +121,12 @@
"uri": "http://pbs.admatic.com.tr?host=layer2.serve.admatic.com.tr",
"body": {
"id": "test-request-id-banner",
"device": {
"ua": "test-user-agent",
"ip": "123.123.123.123",
"language": "en",
"dnt": 0
},
"imp": [
{
"id": "test-imp-id-banner2",
Expand Down
Loading
Loading