Reorder RTC vendors and fix documentation (#39247)

ampproject · Jul 13, 2023 · d799cd9 · d799cd9
1 parent 5e0aa54
commit d799cd9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 25 deletions.
diff --git a/extensions/amp-a4a/rtc-documentation.md b/extensions/amp-a4a/rtc-documentation.md
@@ -131,18 +131,21 @@ The `errorReportingUrl` property is optional. The only available macros are ERRO
 -   Andbeyond
 -   Browsi
 -   Criteo
+-   Denakop
 -   FLUX
 -   Freestar
 -   Future Plc
 -   Galaxie Media
 -   Highfivve
+-   Hubvisor
 -   [Improve Digital](https://www.improvedigital.com)
 -   IndexExchange
 -   Kargo
--   NewsPassID
 -   Lotame
 -   Media.net
 -   Mediasquare
+-   Navegg
+-   NewsPassID
 -   Nexx360.io
 -   OpenX
 -   PubMatic OpenWrap
@@ -152,6 +155,7 @@ The `errorReportingUrl` property is optional. The only available macros are ERRO
 -   Rubicon
 -   Salesforce
 -   [Snigel](https://www.snigel.com)
+-   Sonobi
 -   T13
 -   Tail
 -   The Ozone Project
@@ -613,9 +617,9 @@ This is not allowed:
 
 <table>
   <tr>
-   <td>Callout 1: <a href="`https://www.vendor1.com/foo?slot_id=1234"`>`https://www.vendor1.com/foo?slot_id=1234`</a>
+   <td>Callout 1: `https://www.vendor1.com/foo?slot_id=1234`
 <p>
-Callout 2: <a href="`https://www.vendor1.com/foo?slot_id=1234`">`https://www.vendor1.com/foo?slot_id=1234`</a>
+Callout 2: `https://www.vendor1.com/foo?slot_id=1234`
    </td>
   </tr>
   <tr>
@@ -628,9 +632,9 @@ This is allowed:
 
 <table>
   <tr>
-   <td>Callout 1: <a href="`https://www.vendor1.com/foo?slot_id=1234`">`https://www.vendor1.com/foo?slot_id=1234`</a>
+   <td>Callout 1: `https://www.vendor1.com/foo?slot_id=1234`
 <p>
-Callout 2: <a href="`https://www.vendor1.com/foo?slot_id=1234`">`https://www.vendor1.com/foo?slot_id=5678`</a>
+Callout 2: `https://www.vendor1.com/foo?slot_id=5678`
    </td>
   </tr>
   <tr>

diff --git a/src/service/real-time-config/callout-vendors.js b/src/service/real-time-config/callout-vendors.js
@@ -80,6 +80,11 @@ const RTC_VENDORS = jsonConfiguration({
     ],
     disableKeyAppend: true,
   },
+  denakop: {
+    url: 'https://ib.adnxs.com/prebid/amp?tag_id=PLACEMENT_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adcid=ADCID&purl=HREF&gdpr_consent=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
+    macros: ['PLACEMENT_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
+    disableKeyAppend: true,
+  },
   freestar: {
     url: 'https://prebid-amp.pub.network/openrtb2/amp?tag_id=TAG_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adc=ADCID&purl=HREF&gdpr_consent=CONSENT_STRING&account=ACCOUNT_ID',
     macros: ['TAG_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
@@ -105,6 +110,11 @@ const RTC_VENDORS = jsonConfiguration({
     macros: ['PLACEMENT_ID', 'CONSENT_STRING'],
     disableKeyAppend: true,
   },
+  improvedigital: {
+    url: 'https://pbs.360yield.com/openrtb2/amp?tag_id=TAG_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adc=ADCID&purl=HREF&consent_string=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
+    macros: ['TAG_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
+    disableKeyAppend: true,
+  },
   indexexchange: {
     url: 'https://amp.casalemedia.com/amprtc?v=1&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&s=SITE_ID&p=CANONICAL_URL&consent_state=CONSENT_STATE&consent_string=CONSENT_STRING',
     macros: ['SITE_ID', 'CONSENT_STATE', 'CONSENT_STRING'],
@@ -189,11 +199,6 @@ const RTC_VENDORS = jsonConfiguration({
     macros: ['TAG_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
     disableKeyAppend: true,
   },
-  denakop: {
-    url: 'https://ib.adnxs.com/prebid/amp?tag_id=PLACEMENT_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adcid=ADCID&purl=HREF&gdpr_consent=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
-    macros: ['PLACEMENT_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
-    disableKeyAppend: true,
-  },
   prebidflux: {
     url: 'https://prebid-server.flux-adserver.com/openrtb2/amp?tag_id=TAG_ID',
     macros: ['TAG_ID'],
@@ -214,11 +219,21 @@ const RTC_VENDORS = jsonConfiguration({
     macros: ['PLACEMENT_ID', 'DIV_ID'],
     disableKeyAppend: true,
   },
+  richaudience: {
+    url: 'https://shb.richaudience.com/amp?p=PLACEMENT_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&mref=CANONICAL_URL&timeout=TIMEOUT&adcid=ADCID&purl=HREF&targeting=TGT&consentString=CONSENT_STRING&gdpr=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
+    macros: ['PLACEMENT_ID', 'CONSENT_STRING'],
+    disableKeyAppend: true,
+  },
   salesforcedmp: {
     url: 'https://cdn.krxd.net/userdata/v2/amp/ORGANIZATION_ID?segments_key=SEGMENTS_KEY&kuid_key=USER_KEY',
     macros: ['ORGANIZATION_ID', 'SEGMENTS_KEY', 'USER_KEY'],
     disableKeyAppend: true,
   },
+  snigel: {
+    url: 'https://adserv.snigelweb.com/bp/v1/openrtb2/amp?tag_id=PLACEMENT_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adcid=ADCID&purl=HREF&consent_string=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
+    macros: ['PLACEMENT_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
+    disableKeyAppend: true,
+  },
   sonobi: {
     url: 'https://apex.go.sonobi.com/trinity.json?key_maker=%7B%22_DIVIDER_ATTR(data-slot)%7C1%22%3A%22PLACEMENT_ID_DIVIDER_ATTR(width)xATTR(height)%2CATTR(data-multi-size)%22%7D&ref=CANONICAL_URL&lib_name=amp&lib_v=0.1&pv=PAGEVIEWID&amp=1',
     disableKeyAppend: true,
@@ -229,11 +244,6 @@ const RTC_VENDORS = jsonConfiguration({
     macros: ['TAG_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
     disableKeyAppend: true,
   },
-  improvedigital: {
-    url: 'https://pbs.360yield.com/openrtb2/amp?tag_id=TAG_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adc=ADCID&purl=HREF&consent_string=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
-    macros: ['TAG_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
-    disableKeyAppend: true,
-  },
   tail: {
     url: 'https://ACCOUNT_ID.seg.t.tailtarget.com/amp',
     macros: ['ACCOUNT_ID'],
@@ -249,16 +259,6 @@ const RTC_VENDORS = jsonConfiguration({
     macros: ['ADSLOT_ID', 'CONSENT_STRING'],
     disableKeyAppend: true,
   },
-  snigel: {
-    url: 'https://adserv.snigelweb.com/bp/v1/openrtb2/amp?tag_id=PLACEMENT_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adcid=ADCID&purl=HREF&consent_string=CONSENT_STRING&account=ACCOUNT_ID&gdpr_applies=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
-    macros: ['PLACEMENT_ID', 'CONSENT_STRING', 'ACCOUNT_ID'],
-    disableKeyAppend: true,
-  },
-  richaudience: {
-    url: 'https://shb.richaudience.com/amp?p=PLACEMENT_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&mref=CANONICAL_URL&timeout=TIMEOUT&adcid=ADCID&purl=HREF&targeting=TGT&consentString=CONSENT_STRING&gdpr=CONSENT_METADATA(gdprApplies)&addtl_consent=CONSENT_METADATA(additionalConsent)&consent_type=CONSENT_METADATA(consentStringType)',
-    macros: ['PLACEMENT_ID', 'CONSENT_STRING'],
-    disableKeyAppend: true,
-  },
 });
 
 // DO NOT MODIFY: Setup for tests