comments

Author: jsl517

packages/agents-a365-observability/src/ObservabilityBuilder.ts

@@ -152,10 +152,7 @@ export class ObservabilityBuilder {
     if (this.options.tokenResolver) {
       opts.tokenResolver = this.options.tokenResolver;
     }
-    if (this.options.configProvider) {
-      opts.configProvider = this.options.configProvider;
-    }
-    return new BatchSpanProcessor(new Agent365Exporter(opts), {
+    return new BatchSpanProcessor(new Agent365Exporter(opts, this.options.configProvider), {
       maxQueueSize: opts.maxQueueSize,
       scheduledDelayMillis: opts.scheduledDelayMilliseconds,
       exportTimeoutMillis: opts.exporterTimeoutMilliseconds,
@@ -174,13 +171,10 @@ export class ObservabilityBuilder {
       Object.assign(opts, this.options.exporterOptions);
     }
     opts.clusterCategory = this.options.clusterCategory || opts.clusterCategory || ClusterCategory.prod;
-    if (this.options.configProvider) {
-      opts.configProvider = this.options.configProvider;
-    }
 
     // For per-request export, token is retrieved from OTel Context by Agent365Exporter
     // using getExportToken(), so no tokenResolver is needed here
-    return new PerRequestSpanProcessor(new Agent365Exporter(opts));
+    return new PerRequestSpanProcessor(new Agent365Exporter(opts, this.options.configProvider));
   }
 
   private createExportProcessor(): BatchSpanProcessor | PerRequestSpanProcessor {

packages/agents-a365-observability/src/tracing/exporter/Agent365Exporter.ts

@@ -6,7 +6,8 @@
 import { ExportResult, ExportResultCode } from '@opentelemetry/core';
 import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base';
 
-import { PowerPlatformApiDiscovery, ClusterCategory } from '@microsoft/agents-a365-runtime';
+import { PowerPlatformApiDiscovery, ClusterCategory, IConfigurationProvider } from '@microsoft/agents-a365-runtime';
+import type { ObservabilityConfiguration } from '../../configuration';
 import {
   partitionByIdentity,
   parseIdentityKey,
@@ -88,12 +89,15 @@ interface OTLPStatus {
 export class Agent365Exporter implements SpanExporter {
   private closed = false;
   private readonly options: Agent365ExporterOptions;
+  private readonly configProvider?: IConfigurationProvider<ObservabilityConfiguration>;
 
   /**
    * Initialize exporter with a fully constructed options instance.
-   * If tokenResolver is missing, installs cache-backed resolver.
+   * @param options Exporter options controlling batching, timeouts, token acquisition and endpoint shape.
+   * @param configProvider Optional configuration provider. When supplied, the exporter uses it for
+   *        configuration lookups (custom domain, domain override) instead of the default env-based provider.
    */
-  constructor(options: Agent365ExporterOptions) {
+  constructor(options: Agent365ExporterOptions, configProvider?: IConfigurationProvider<ObservabilityConfiguration>) {
     if (!options) {
       throw new Error('Agent365ExporterOptions must be provided (was null/undefined)');
     }
@@ -102,6 +106,7 @@ export class Agent365Exporter implements SpanExporter {
       throw new Error('Agent365Exporter tokenResolver must be provided for batch export');
     }
     this.options = options;
+    this.configProvider = configProvider;
   }
 
   /**
@@ -165,15 +170,15 @@ export class Agent365Exporter implements SpanExporter {
 
     const payload = this.buildExportRequest(spans);
     const body = JSON.stringify(payload);
-    const usingCustomServiceEndpoint = useCustomDomainForObservability(this.options.configProvider);
+    const usingCustomServiceEndpoint = useCustomDomainForObservability(this.configProvider);
     // Select endpoint path based on S2S flag
     const endpointRelativePath =
       this.options.useS2SEndpoint
         ? `/maven/agent365/service/agents/${agentId}/traces`
         : `/maven/agent365/agents/${agentId}/traces`;
 
     let url: string;
-    const domainOverride = getAgent365ObservabilityDomainOverride(this.options.configProvider);
+    const domainOverride = getAgent365ObservabilityDomainOverride(this.configProvider);
     if (domainOverride) {
       url = `${domainOverride}${endpointRelativePath}?api-version=1`;
     } else if (usingCustomServiceEndpoint) {

packages/agents-a365-observability/src/tracing/exporter/Agent365ExporterOptions.ts

@@ -3,8 +3,7 @@
 // Licensed under the MIT License.
 // ------------------------------------------------------------------------------
 
-import { ClusterCategory, IConfigurationProvider } from '@microsoft/agents-a365-runtime';
-import type { ObservabilityConfiguration } from '../../configuration';
+import { ClusterCategory } from '@microsoft/agents-a365-runtime';
 
 /**
  * A function that resolves and returns an authentication token for the given agent and tenant.
@@ -49,11 +48,4 @@ export class Agent365ExporterOptions {
 
   /** Maximum number of spans per export batch. */
   public maxExportBatchSize: number = 512;
-
-  /**
-   * Optional configuration provider for ObservabilityConfiguration.
-   * When provided, this is used by the exporter for configuration lookups
-   * instead of the default provider that reads from environment variables.
-   */
-  public configProvider?: IConfigurationProvider<ObservabilityConfiguration>;
 }

tests/observability/core/observabilityBuilder-configProvider.test.ts

@@ -6,10 +6,13 @@ import { ObservabilityManager } from '@microsoft/agents-a365-observability/src/O
 import { ObservabilityConfiguration } from '@microsoft/agents-a365-observability/src/configuration/ObservabilityConfiguration';
 import { DefaultConfigurationProvider } from '@microsoft/agents-a365-runtime';
 
-// Capture Agent365Exporter constructor options without performing network calls.
+// Capture Agent365Exporter constructor args without performing network calls.
 jest.mock('@microsoft/agents-a365-observability/src/tracing/exporter/Agent365Exporter', () => ({
   Agent365Exporter: class {
-    constructor(opts: any) { (global as any).__capturedOpts = opts; }
+    constructor(opts: any, configProvider?: any) {
+      (global as any).__capturedOpts = opts;
+      (global as any).__capturedConfigProvider = configProvider;
+    }
     export() {/* no-op */}
     shutdown() {/* no-op */}
     forceFlush() {/* no-op */}
@@ -30,11 +33,13 @@ const makeProvider = (exporterEnabled?: boolean) =>
   }));
 
 const capturedOpts = () => (global as any).__capturedOpts as any | undefined;
+const capturedConfigProvider = () => (global as any).__capturedConfigProvider as any | undefined;
 
 describe('ObservabilityBuilder configProvider', () => {
   beforeEach(() => {
     delete process.env.ENABLE_A365_OBSERVABILITY_EXPORTER;
     delete (global as any).__capturedOpts;
+    delete (global as any).__capturedConfigProvider;
     capturedLogger = null;
     jest.spyOn(console, 'log').mockImplementation(() => {});
     jest.spyOn(console, 'warn').mockImplementation(() => {});
@@ -44,6 +49,10 @@ describe('ObservabilityBuilder configProvider', () => {
   afterEach(async () => {
     delete process.env.ENABLE_A365_OBSERVABILITY_EXPORTER;
     await ObservabilityManager.shutdown();
+    const actualLogging = jest.requireActual('@microsoft/agents-a365-observability/src/utils/logging') as any;
+    if (typeof actualLogging.resetLogger === 'function') {
+      actualLogging.resetLogger();
+    }
     jest.restoreAllMocks();
   });
 
@@ -61,7 +70,8 @@ describe('ObservabilityBuilder configProvider', () => {
       .build();
 
     expect(capturedOpts()).toBeDefined();
-    expect(capturedOpts().configProvider).toBe(provider);
+    expect(capturedConfigProvider()).toBe(provider);
+    expect(capturedOpts().configProvider).toBeUndefined();
     expect(capturedOpts().maxQueueSize).toBe(42);
     expect(capturedOpts().tokenResolver('a', 'b')).toBe('tok');
   });
@@ -90,12 +100,12 @@ describe('ObservabilityBuilder configProvider', () => {
     process.env.ENABLE_A365_OBSERVABILITY_EXPORTER = 'true';
     new ObservabilityBuilder().withTokenResolver(() => 't').build();
     expect(capturedOpts()).toBeDefined();
-    expect(capturedOpts().configProvider).toBeUndefined();
+    expect(capturedConfigProvider()).toBeUndefined();
   });
 
   it('ObservabilityManager.start() passes configProvider through to exporter', () => {
     const provider = makeProvider(true);
     ObservabilityManager.start({ serviceName: 'svc', tokenResolver: () => 't', configProvider: provider });
-    expect(capturedOpts()?.configProvider).toBe(provider);
+    expect(capturedConfigProvider()).toBe(provider);
   });
 });