Updates routing path for logs (#9361)

Author: mghaznav

packages/telemetry/src/logging/fetch-transport.test.ts

@@ -187,7 +187,7 @@ describe('FetchTransport', () => {
 
       const transport = new FetchTransport({
         ...testTransportParameters,
-        dynamicHeaders: [dynamicProvider]
+        dynamicHeaderProviders: [dynamicProvider]
       });
 
       //act
@@ -228,7 +228,7 @@ describe('FetchTransport', () => {
 
       const transport = new FetchTransport({
         ...testTransportParameters,
-        dynamicHeaders: [dynamicProvider]
+        dynamicHeaderProviders: [dynamicProvider]
       });
 
       //act

packages/telemetry/src/logging/fetch-transport.ts

@@ -54,7 +54,7 @@ function parseRetryAfterToMills(
 export interface FetchTransportParameters {
   url: string;
   headers: Headers;
-  dynamicHeaders?: DynamicHeaderProvider[];
+  dynamicHeaderProviders?: DynamicHeaderProvider[];
 }
 
 /**
@@ -73,12 +73,13 @@ export class FetchTransport implements IExporterTransport {
       const headers = this.parameters.headers;
 
       if (
-        this.parameters.dynamicHeaders &&
-        this.parameters.dynamicHeaders.length > 0
+        this.parameters.dynamicHeaderProviders &&
+        this.parameters.dynamicHeaderProviders.length > 0
       ) {
-        const dynamicHeaderPromises = this.parameters.dynamicHeaders.map(
-          provider => provider.getHeader()
-        );
+        const dynamicHeaderPromises =
+          this.parameters.dynamicHeaderProviders.map(provider =>
+            provider.getHeader()
+          );
         const resolvedHeaders = await Promise.all(dynamicHeaderPromises);
 
         for (const header of resolvedHeaders) {

packages/telemetry/src/logging/logger-provider.ts

@@ -31,26 +31,35 @@ import {
 } from '@opentelemetry/otlp-exporter-base';
 import { FetchTransport } from './fetch-transport';
 import { DynamicHeaderProvider } from '../types';
+import { FirebaseApp } from '@firebase/app';
 
 /**
  * Create a logger provider for the current execution environment.
  *
  * @internal
  */
 export function createLoggerProvider(
+  app: FirebaseApp,
   endpointUrl: string,
-  dynamicHeaders: DynamicHeaderProvider[] = []
+  dynamicHeaderProviders: DynamicHeaderProvider[] = []
 ): LoggerProvider {
   const resource = resourceFromAttributes({
     [ATTR_SERVICE_NAME]: 'firebase_telemetry_service'
   });
   if (endpointUrl.endsWith('/')) {
     endpointUrl = endpointUrl.slice(0, -1);
   }
-  const otlpEndpoint = `${endpointUrl}/api/v1/logs`;
+  const { projectId, appId, apiKey } = app.options;
+  const otlpEndpoint = `${endpointUrl}/v1/projects/${projectId}/apps/${appId}/logs`;
   const logExporter = new OTLPLogExporter(
-    { url: otlpEndpoint },
-    dynamicHeaders
+    {
+      url: otlpEndpoint,
+      headers: {
+        'Content-Type': 'application/json',
+        ...(apiKey ? { 'X-Goog-Api-Key': apiKey } : {})
+      }
+    },
+    dynamicHeaderProviders
   );
 
   return new LoggerProvider({
@@ -67,7 +76,7 @@ class OTLPLogExporter
 {
   constructor(
     config: OTLPExporterConfigBase = {},
-    dynamicHeaders: DynamicHeaderProvider[] = []
+    dynamicHeaderProviders: DynamicHeaderProvider[] = []
   ) {
     super(
       createOtlpNetworkExportDelegate(
@@ -79,10 +88,8 @@ class OTLPLogExporter
         JsonLogsSerializer,
         new FetchTransport({
           url: config.url!,
-          headers: new Headers({
-            'Content-Type': 'application/json'
-          }),
-          dynamicHeaders
+          headers: new Headers(config.headers),
+          dynamicHeaderProviders
         })
       )
     );

packages/telemetry/src/register.node.ts

@@ -36,7 +36,7 @@ export function registerTelemetry(): void {
 
         // getImmediate for FirebaseApp will always succeed
         const app = container.getProvider('app').getImmediate();
-        const loggerProvider = createLoggerProvider(endpointUrl);
+        const loggerProvider = createLoggerProvider(app, endpointUrl);
 
         return new TelemetryService(app, loggerProvider);
       },

packages/telemetry/src/register.ts

@@ -38,10 +38,11 @@ export function registerTelemetry(): void {
         // getImmediate for FirebaseApp will always succeed
         const app = container.getProvider('app').getImmediate();
         const appCheckProvider = container.getProvider('app-check-internal');
-        const dynamicHeaders = [new AppCheckProvider(appCheckProvider)];
+        const dynamicHeaderProviders = [new AppCheckProvider(appCheckProvider)];
         const loggerProvider = createLoggerProvider(
+          app,
           endpointUrl,
-          dynamicHeaders
+          dynamicHeaderProviders
         );
 
         return new TelemetryService(app, loggerProvider);