Use Agent365ExporterOptions for exporter and create AgenticTokenCache…

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

@@ -6,7 +6,9 @@ import { NodeSDK } from '@opentelemetry/sdk-node';
 import { ConsoleSpanExporter, BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
 import { SpanProcessor } from './tracing/processors/SpanProcessor';
 import { isAgent365ExporterEnabled } from './tracing/util';
-import { Agent365Exporter, TokenResolver } from './tracing/exporter/Agent365Exporter';
+import { Agent365Exporter } from './tracing/exporter/Agent365Exporter';
+import type { TokenResolver } from './tracing/exporter/Agent365ExporterOptions';
+import { Agent365ExporterOptions } from './tracing/exporter/Agent365ExporterOptions';
 import { resourceFromAttributes } from '@opentelemetry/resources';
 import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
 import { trace } from '@opentelemetry/api';
@@ -67,18 +69,21 @@ export class ObservabilityBuilder {
     return this;
   }
 
-  private getTraceExporter() {
-    if (isAgent365ExporterEnabled()){
-      if (!this.options.tokenResolver) {
-        throw new Error('tokenResolver must be provided when Agent365 exporter is enabled');
-      }
-      return new Agent365Exporter(
-        this.options.tokenResolver,
-        this.options.clusterCategory || 'prod'
-      );
-    } else {
-      return new ConsoleSpanExporter();
+  private createBatchProcessor(): BatchSpanProcessor {
+    if (!isAgent365ExporterEnabled()) {
+      return new BatchSpanProcessor(new ConsoleSpanExporter());
     }
+    const opts = new Agent365ExporterOptions();
+    opts.clusterCategory = this.options.clusterCategory || 'prod';
+    if (this.options.tokenResolver) {
+      opts.tokenResolver = this.options.tokenResolver;
+    }
+    return new BatchSpanProcessor(new Agent365Exporter(opts), {
+      maxQueueSize: opts.maxQueueSize,
+      scheduledDelayMillis: opts.scheduledDelayMilliseconds,
+      exportTimeoutMillis: opts.exporterTimeoutMilliseconds,
+      maxExportBatchSize: opts.maxExportBatchSize
+    });
   }
 
   private createResource() {
@@ -104,7 +109,7 @@ export class ObservabilityBuilder {
     const spanProcessor = new SpanProcessor();
 
     // 2. batch processor that actually ships spans out
-    const batchProcessor = new BatchSpanProcessor(this.getTraceExporter());
+    const batchProcessor = this.createBatchProcessor();
 
     const globalProvider: any = trace.getTracerProvider();
 

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

@@ -35,3 +35,4 @@ export { OpenTelemetryScope } from './tracing/scopes/OpenTelemetryScope';
 export { ExecuteToolScope } from './tracing/scopes/ExecuteToolScope';
 export { InvokeAgentScope } from './tracing/scopes/InvokeAgentScope';
 export { InferenceScope} from './tracing/scopes/InferenceScope';
+export { AgenticTokenCacheInstance } from './utils/AgenticTokenCache';

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

@@ -1,10 +1,16 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+// ------------------------------------------------------------------------------
+
 import { ExportResult,ExportResultCode } from '@opentelemetry/core';
 import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base';
 
 import { PowerPlatformApiDiscovery, ClusterCategory } from '@microsoft/agents-a365-runtime';
 import { partitionByIdentity, parseIdentityKey, hexTraceId, hexSpanId, kindName, statusName } from './utils';
-import logger, {formatError} from '../../utils/logging';
-
+import logger, { formatError } from '../../utils/logging';
+import { AgenticTokenCacheInstance } from '../../utils/AgenticTokenCache';
+import { Agent365ExporterOptions } from './Agent365ExporterOptions';
 const DEFAULT_HTTP_TIMEOUT_SECONDS = 30000; // 30 seconds in ms
 const DEFAULT_MAX_RETRIES = 3;
 
@@ -14,7 +20,7 @@ interface OTLPExportRequest {
 
 interface ResourceSpan {
   resource: {
-    attributes: Record<string, any> | null;
+    attributes: Record<string, unknown> | null;
   };
   scopeSpans: ScopeSpan[];
 }
@@ -35,7 +41,7 @@ interface OTLPSpan {
   kind: string;
   startTimeUnixNano: number;
   endTimeUnixNano: number;
-  attributes: Record<string, any> | null;
+  attributes: Record<string, unknown> | null;
   events?: OTLPEvent[] | null;
   links?: OTLPLink[] | null;
   status: OTLPStatus;
@@ -44,24 +50,20 @@ interface OTLPSpan {
 interface OTLPEvent {
   timeUnixNano: number;
   name: string;
-  attributes?: Record<string, any> | null;
+  attributes?: Record<string, unknown> | null;
 }
 
 interface OTLPLink {
   traceId: string;
   spanId: string;
-  attributes?: Record<string, any> | null;
+  attributes?: Record<string, unknown> | null;
 }
 
 interface OTLPStatus {
   code: string;
   message?: string;
 }
 
-/**
- * Token resolver function type - supports both sync and async implementations
- */
-export type TokenResolver = (agentId: string, tenantId: string) => string | null | Promise<string | null>;
 
 /**
  * Observability span exporter for Agent365:
@@ -71,20 +73,25 @@ export type TokenResolver = (agentId: string, tenantId: string) => string | null
  * - Adds Bearer token via token_resolver(agentId, tenantId)
  */
 export class Agent365Exporter implements SpanExporter {
-  private readonly tokenResolver: TokenResolver;
-  private readonly clusterCategory: ClusterCategory;
   private closed = false;
+  private readonly options: Agent365ExporterOptions;
 
-  constructor(
-    tokenResolver: TokenResolver,
-    clusterCategory: ClusterCategory = 'prod'
-  ) {
-    if (!tokenResolver) {
-      logger.error('[Agent365Exporter] token_resolver is not provided');
-      throw new Error('token_resolver must be provided.');
+  /**
+   * Initialize exporter with a fully constructed options instance.
+   * If tokenResolver is missing, installs cache-backed resolver.
+   */
+  constructor(options: Agent365ExporterOptions) {
+    if (!options) {
+      throw new Error('Agent365ExporterOptions must be provided (was null/undefined)');
+    }
+
+    if (!options.tokenResolver) {
+      options.tokenResolver = AgenticTokenCacheInstance.getObservabilityToken.bind(AgenticTokenCacheInstance);
+      logger.info('Agent365Exporter initialized with agentic resolver', `clusterCategory=${options.clusterCategory}`);
+    } else {
+      logger.info('Agent365Exporter initialized with custom tokenResolver', `clusterCategory=${options.clusterCategory}`);
     }
-    this.tokenResolver = tokenResolver;
-    this.clusterCategory = clusterCategory;
+    this.options = options;
   }
 
   /**
@@ -140,7 +147,7 @@ export class Agent365Exporter implements SpanExporter {
     const body = JSON.stringify(payload);
 
     // Resolve endpoint + token
-    const discovery = new PowerPlatformApiDiscovery(this.clusterCategory);
+    const discovery = new PowerPlatformApiDiscovery(this.options.clusterCategory as ClusterCategory);
     const endpoint = discovery.getTenantIslandClusterEndpoint(tenantId);
     const url = `https://${endpoint}/maven/agent365/agents/${agentId}/traces?api-version=1`;
     logger.info(`[Agent365Exporter] Resolved endpoint: ${endpoint}`);
@@ -149,7 +156,7 @@ export class Agent365Exporter implements SpanExporter {
       'content-type': 'application/json'
     };
 
-    const tokenResult = this.tokenResolver(agentId, tenantId);
+    const tokenResult = this.options.tokenResolver!(agentId, tenantId);
     const token = tokenResult instanceof Promise ? await tokenResult : tokenResult;
     if (token) {
       headers['authorization'] = `Bearer ${token}`;

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

@@ -0,0 +1,51 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+// ------------------------------------------------------------------------------
+
+import { ClusterCategory } from '@microsoft/agents-a365-runtime';
+/**
+ * A function that resolves and returns an authentication token for the given agent and tenant.
+ * Implementations may perform synchronous lookup (e.g., in-memory cache) or asynchronous network calls.
+ * Return null if a token cannot be provided; exporter will log and proceed without an authorization header.
+ */
+export type TokenResolver = (agentId: string, tenantId: string) => string | null | Promise<string | null>;
+
+/**
+ * Options controlling the behavior of the Agent365 OpenTelemetry span exporter.
+ *
+ * These values tune batching, timeouts, token acquisition and endpoint shape. All properties have sensible
+ * defaults so callers can usually construct without arguments and override selectively.
+ *
+ * @property {ClusterCategory | string} clusterCategory Environment / cluster category (e.g. "preprod", "prod").
+ * @property {TokenResolver} [tokenResolver] Optional delegate to obtain an auth token. If omitted the exporter will
+ *           fall back to reading the cached token (AgenticTokenCacheInstance.getObservabilityToken).
+ * @property {boolean} useS2SEndpoint When true uses service-to-service path (/maven/agent365/service/agents/{agentId}/traces);
+ *           when false uses the standard path (/maven/agent365/agents/{agentId}/traces).
+ * @property {number} maxQueueSize Maximum span queue size before drops occur (passed to BatchSpanProcessor).
+ * @property {number} scheduledDelayMilliseconds Delay between automatic batch flush attempts.
+ * @property {number} exporterTimeoutMilliseconds Per-export timeout (abort if exceeded).
+ * @property {number} maxExportBatchSize Maximum number of spans per export batch.
+ */
+export class Agent365ExporterOptions {
+  /** Environment / cluster category (e.g. "preprod", "prod"). */
+  public clusterCategory: ClusterCategory | string = 'preprod';
+
+  /** Optional delegate to resolve auth token; falls back to AgenticTokenCache when absent. */
+  public tokenResolver?: TokenResolver;
+
+  /** Use service-to-service endpoint variant when true; standard endpoint when false. */
+  public useS2SEndpoint: boolean = false;
+
+  /** Maximum span queue size before new spans are dropped. */
+  public maxQueueSize: number = 2048;
+
+  /** Delay (ms) between automatic batch flush attempts. */
+  public scheduledDelayMilliseconds: number = 5000;
+
+  /** Per-export timeout in milliseconds. */
+  public exporterTimeoutMilliseconds: number = 30000;
+
+  /** Maximum number of spans per export batch. */
+  public maxExportBatchSize: number = 512;
+}