fix(openfeature): clarify direct EVP routing

Author: leoromanovsky

packages/dd-trace/src/evp_proxy/direct.js

@@ -4,10 +4,10 @@ const { format } = require('node:url')
 
 const { HttpsProxyAgent } = require('https-proxy-agent')
 const { getProxyForUrl } = require('proxy-from-env')
+const log = require('../log')
 
 /**
  * @typedef {object} DirectEVPRoute
- * @property {'direct'} mode - Route mode
  * @property {URL} url - Direct intake URL
  * @property {string} basePath - Direct intake base path
  * @property {object} headers - Direct intake authentication headers
@@ -36,15 +36,16 @@ function createDirectEVPRoute (config, intake) {
     const agent = proxyUrl ? new HttpsProxyAgent(proxyUrl) : undefined
 
     return {
-      mode: 'direct',
       url,
       basePath: '',
       headers: {
         'DD-API-KEY': apiKey,
       },
       ...(agent && { agent }),
     }
-  } catch {}
+  } catch (error) {
+    log.debug('Unable to configure direct EVP intake: %s', error.message)
+  }
 }
 
 module.exports = { createDirectEVPRoute }

packages/dd-trace/src/openfeature/writers/util.js

@@ -71,7 +71,6 @@ function setAgentlessStrategy (config, setWriterEnabledValue) {
   }, (error, localRoute) => {
     if (localRoute) {
       const route = {
-        mode: 'local',
         ...localRoute,
         headers: {
           [EVP_SUBDOMAIN_HEADER_NAME]: EVP_EVENT_PLATFORM_SUBDOMAIN,

packages/dd-trace/test/evp_proxy/direct.spec.js

@@ -10,14 +10,17 @@ describe('direct EVP route', () => {
   let createDirectEVPRoute
   let getProxyForUrl
   let HttpsProxyAgent
+  let log
 
   beforeEach(() => {
     getProxyForUrl = sinon.stub().returns('')
     HttpsProxyAgent = sinon.stub().callsFake(proxyUrl => ({ proxyUrl }))
+    log = { debug: sinon.spy() }
 
     ;({ createDirectEVPRoute } = proxyquire('../../src/evp_proxy/direct', {
       'https-proxy-agent': { HttpsProxyAgent },
       'proxy-from-env': { getProxyForUrl },
+      '../log': log,
     }))
   })
 
@@ -28,7 +31,6 @@ describe('direct EVP route', () => {
     }, 'event-platform-intake')
 
     assert.deepStrictEqual(route, {
-      mode: 'direct',
       url: new URL('https://event-platform-intake.datadoghq.com'),
       basePath: '',
       headers: {
@@ -71,5 +73,11 @@ describe('direct EVP route', () => {
       DD_API_KEY: 'test-api-key',
       site: 'not a host',
     }, 'event-platform-intake'), undefined)
+
+    sinon.assert.calledOnceWithExactly(
+      log.debug,
+      'Unable to configure direct EVP intake: %s',
+      sinon.match.string
+    )
   })
 })

packages/dd-trace/test/openfeature/writers/exposures-transport.spec.js

@@ -61,7 +61,6 @@ describe('OpenFeature Exposures Writer transport', () => {
       setExposureDeliveryStrategy(config, (enabled, route) => {
         try {
           assert.strictEqual(enabled, true)
-          assert.strictEqual(route.mode, 'local')
           assert.strictEqual(route.basePath, '/evp_proxy/v4')
           writer.setEnabled(enabled, route)
           resolve()
@@ -118,8 +117,8 @@ describe('OpenFeature Exposures Writer transport', () => {
       setExposureDeliveryStrategy(config, (enabled, route) => {
         try {
           assert.strictEqual(enabled, true)
-          assert.strictEqual(route.mode, 'local')
-          assert.strictEqual(route.fallback.mode, 'direct')
+          assert.strictEqual(route.basePath, '/evp_proxy/v4')
+          assert.strictEqual(route.fallback.basePath, '')
           writer.setEnabled(enabled, route)
           resolve()
         } catch (error) {
@@ -173,7 +172,7 @@ describe('OpenFeature Exposures Writer transport', () => {
       setExposureDeliveryStrategy(config, (enabled, route) => {
         try {
           assert.strictEqual(enabled, true)
-          assert.strictEqual(route.mode, 'direct')
+          assert.strictEqual(route.basePath, '')
           writer.setEnabled(enabled, route)
           resolve()
         } catch (error) {

packages/dd-trace/test/openfeature/writers/exposures.spec.js

@@ -410,7 +410,6 @@ describe('OpenFeature Exposures Writer', () => {
     it('should flush events through the selected EVP v4 proxy path', () => {
       const url = new URL('http://serverless-init:9126')
       writer.setEnabled(true, {
-        mode: 'local',
         url,
         basePath: '/evp_proxy/v4/',
         headers: {
@@ -446,7 +445,6 @@ describe('OpenFeature Exposures Writer', () => {
       const url = new URL('https://event-platform-intake.datadoghq.com')
       const agent = {}
       writer.setEnabled(true, {
-        mode: 'direct',
         url,
         basePath: '',
         agent,
@@ -478,14 +476,12 @@ describe('OpenFeature Exposures Writer', () => {
         const directAgent = {}
         request.onFirstCall().yieldsAsync(error, null, statusCode)
         writer.setEnabled(true, {
-          mode: 'local',
           url: localUrl,
           basePath: '/evp_proxy/v4',
           headers: {
             'X-Datadog-EVP-Subdomain': 'event-platform-intake',
           },
           fallback: {
-            mode: 'direct',
             url: directUrl,
             basePath: '',
             agent: directAgent,
@@ -524,14 +520,12 @@ describe('OpenFeature Exposures Writer', () => {
       it(`should not retry ambiguous local ${name} through direct intake`, async () => {
         request.yieldsAsync(error, null, statusCode)
         writer.setEnabled(true, {
-          mode: 'local',
           url: new URL('http://serverless-init:8126'),
           basePath: '/evp_proxy/v4',
           headers: {
             'X-Datadog-EVP-Subdomain': 'event-platform-intake',
           },
           fallback: {
-            mode: 'direct',
             url: new URL('https://event-platform-intake.datadoghq.com'),
             basePath: '',
             headers: {

packages/dd-trace/test/openfeature/writers/util.spec.js

@@ -74,7 +74,6 @@ describe('OpenFeature exposure delivery strategy', () => {
       basePath: '/evp_proxy/v4',
     }
     const directRoute = {
-      mode: 'direct',
       url: new URL('https://event-platform-intake.datadoghq.com'),
       basePath: '',
       headers: { 'DD-API-KEY': 'test-api-key' },
@@ -88,7 +87,6 @@ describe('OpenFeature exposure delivery strategy', () => {
       supportedPaths: ['/evp_proxy/v4', '/evp_proxy/v2'],
     }, sinon.match.func)
     sinon.assert.calledOnceWithExactly(setWriterEnabledValue, true, {
-      mode: 'local',
       ...localRoute,
       headers: {
         'X-Datadog-EVP-Subdomain': 'event-platform-intake',
@@ -113,7 +111,6 @@ describe('OpenFeature exposure delivery strategy', () => {
       supportedPaths: ['/evp_proxy/v4', '/evp_proxy/v2'],
     }, sinon.match.func)
     sinon.assert.calledOnceWithMatch(setWriterEnabledValue, true, {
-      mode: 'local',
       basePath: '/evp_proxy/v2',
     })
   })
@@ -124,7 +121,6 @@ describe('OpenFeature exposure delivery strategy', () => {
       featureFlags: { DD_FEATURE_FLAGS_CONFIGURATION_SOURCE: 'agentless' },
     }
     const directRoute = {
-      mode: 'direct',
       url: new URL('https://event-platform-intake.datadoghq.com'),
       basePath: '',
       headers: { 'DD-API-KEY': 'test-api-key' },
@@ -144,7 +140,6 @@ describe('OpenFeature exposure delivery strategy', () => {
       featureFlags: { DD_FEATURE_FLAGS_CONFIGURATION_SOURCE: 'agentless' },
     }
     const directRoute = {
-      mode: 'direct',
       url: new URL('https://event-platform-intake.datadoghq.com'),
       basePath: '',
       headers: { 'DD-API-KEY': 'test-api-key' },