Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/pr-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ jobs:
- name: Build
run: npm run build

- name: Format check
run: npm run format

- name: Lint
run: npm run lint

Comment thread
hectorhdzg marked this conversation as resolved.
Expand Down
7 changes: 7 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
**/dist/
**/node_modules/
**/src/generated/
**/*.d.ts
.env
tsdoc-metadata.json
lint-output.json
9 changes: 9 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"arrowParens": "always",
"bracketSpacing": true,
"endOfLine": "auto",
"printWidth": 100,
"semi": true,
"singleQuote": false,
"tabWidth": 2
}
2 changes: 2 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import eslint from "@eslint/js";
import prettier from "eslint-config-prettier";
import tseslint from "typescript-eslint";

export default tseslint.config(
eslint.configs.recommended,
...tseslint.configs.recommended,
prettier,
{
ignores: ["dist/", "node_modules/"],
},
Expand Down
27 changes: 18 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"clean": "rimraf dist",
"lint": "eslint src test",
"lint:fix": "eslint src test --fix",
"format": "prettier --check \"src/**/*.ts\" \"test/**/*.ts\" \"*.json\"",
"format:fix": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\" \"*.json\"",
"format": "prettier --list-different \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
"format:fix": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
"test": "vitest run",
"test:watch": "vitest",
"test:coverage": "vitest run --coverage",
Expand Down Expand Up @@ -108,7 +108,8 @@
"@vitest/coverage-istanbul": "^3.0.0",
"dotenv": "^16.0.0",
"eslint": "^9.0.0",
"prettier": "^3.0.0",
"eslint-config-prettier": "^10.1.8",
"prettier": "^3.3.3",
"rimraf": "^6.0.0",
"typescript": "^5.6.0",
"typescript-eslint": "^8.58.0",
Expand Down
28 changes: 20 additions & 8 deletions src/_a365/configuration/A365Configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,18 @@ export const A365_ENV_VARS = {
const DEFAULT_AUTH_SCOPE = "https://api.powerplatform.com/.default";

const VALID_CLUSTER_CATEGORIES: ReadonlySet<string> = new Set([
"local", "dev", "test", "preprod", "firstrelease",
"prod", "gov", "high", "dod", "mooncake", "ex", "rx",
"local",
"dev",
"test",
"preprod",
"firstrelease",
"prod",
"gov",
"high",
"dod",
"mooncake",
"ex",
"rx",
]);

/**
Expand Down Expand Up @@ -106,7 +116,10 @@ export class A365Configuration {

const envScopes = getEnv(A365_ENV_VARS.AUTH_SCOPES);
if (envScopes) {
authScopes = envScopes.split(",").map((s) => s.trim()).filter(Boolean);
authScopes = envScopes
.split(",")
.map((s) => s.trim())
.filter(Boolean);
}

const envDomain = getEnv(A365_ENV_VARS.DOMAIN);
Expand All @@ -128,10 +141,9 @@ export class A365Configuration {
this.perRequestExport = perRequestExport;

this.baggage = {
propagationEnabled: jsonA365?.baggage?.propagationEnabled
?? options?.baggage?.propagationEnabled ?? true,
enrichSpans: jsonA365?.baggage?.enrichSpans
?? options?.baggage?.enrichSpans ?? true,
propagationEnabled:
jsonA365?.baggage?.propagationEnabled ?? options?.baggage?.propagationEnabled ?? true,
enrichSpans: jsonA365?.baggage?.enrichSpans ?? options?.baggage?.enrichSpans ?? true,
};

this.hosting = {
Expand All @@ -156,7 +168,7 @@ export class A365Configuration {
if (hasNonTrivialOptions) {
Logger.getInstance().warn(
"A365 configuration options are set but A365 is not enabled. " +
"Set `a365.enabled: true` or `MICROSOFT_OTEL_A365_EXPORTER_ENABLED=true` to enable.",
"Set `a365.enabled: true` or `MICROSOFT_OTEL_A365_EXPORTER_ENABLED=true` to enable.",
);
}
}
Expand Down
17 changes: 5 additions & 12 deletions src/_a365/exporter/Agent365Exporter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ export class Agent365Exporter implements SpanExporter {
? `/observabilityService/tenants/${encodeURIComponent(tenantId)}/agents/${encodeURIComponent(agentId)}/traces`
: `/observability/tenants/${encodeURIComponent(tenantId)}/agents/${encodeURIComponent(agentId)}/traces`;

const baseUrl = this.options.domainOverride
?? resolveAgent365Endpoint(this.options.clusterCategory);
const baseUrl =
this.options.domainOverride ?? resolveAgent365Endpoint(this.options.clusterCategory);
const url = `${baseUrl}${endpointPath}?api-version=1`;

const headers: Record<string, string> = {
Expand All @@ -158,10 +158,7 @@ export class Agent365Exporter implements SpanExporter {
}
}

private async resolveToken(
agentId: string,
tenantId: string,
): Promise<string | null> {
private async resolveToken(agentId: string, tenantId: string): Promise<string | null> {
if (!this.options.tokenResolver) return null;
const result = this.options.tokenResolver(agentId, tenantId);
return result instanceof Promise ? result : result;
Expand Down Expand Up @@ -280,17 +277,13 @@ export class Agent365Exporter implements SpanExporter {
? ev.time[0] * 1_000_000_000 + ev.time[1]
: (ev.time as number);
const evAttrs =
ev.attributes && Object.keys(ev.attributes).length > 0
? { ...ev.attributes }
: null;
ev.attributes && Object.keys(ev.attributes).length > 0 ? { ...ev.attributes } : null;
return { timeUnixNano: timeNs, name: ev.name, attributes: evAttrs };
});

const links: OTLPLink[] = (sp.links ?? []).map((ln) => {
const lnAttrs =
ln.attributes && Object.keys(ln.attributes).length > 0
? { ...ln.attributes }
: null;
ln.attributes && Object.keys(ln.attributes).length > 0 ? { ...ln.attributes } : null;
return {
traceId: hexTraceId(ln.context.traceId),
spanId: hexSpanId(ln.context.spanId),
Expand Down
83 changes: 60 additions & 23 deletions src/_a365/exporter/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,22 +88,32 @@ export function asStr(v: unknown): string | undefined {
/** Get span kind name. */
export function kindName(kind: SpanKind): string {
switch (kind) {
case SpanKind.INTERNAL: return "INTERNAL";
case SpanKind.SERVER: return "SERVER";
case SpanKind.CLIENT: return "CLIENT";
case SpanKind.PRODUCER: return "PRODUCER";
case SpanKind.CONSUMER: return "CONSUMER";
default: return "UNSPECIFIED";
case SpanKind.INTERNAL:
return "INTERNAL";
case SpanKind.SERVER:
return "SERVER";
case SpanKind.CLIENT:
return "CLIENT";
case SpanKind.PRODUCER:
return "PRODUCER";
case SpanKind.CONSUMER:
return "CONSUMER";
default:
return "UNSPECIFIED";
}
}

/** Get status name. */
export function statusName(code: SpanStatusCode): string {
switch (code) {
case SpanStatusCode.UNSET: return "UNSET";
case SpanStatusCode.OK: return "OK";
case SpanStatusCode.ERROR: return "ERROR";
default: return "UNSET";
case SpanStatusCode.UNSET:
return "UNSET";
case SpanStatusCode.OK:
return "OK";
case SpanStatusCode.ERROR:
return "ERROR";
default:
return "UNSET";
}
}

Expand Down Expand Up @@ -169,7 +179,10 @@ function serializeOverflowSentinel(totalMessages: number): string {
*/
function trimString(value: string, bytesToShed: number): string {
const currentBytes = Buffer.byteLength(value, "utf8");
const targetContentBytes = Math.max(0, currentBytes - Math.max(1, bytesToShed) - TRUNCATED_SUFFIX_BYTES);
const targetContentBytes = Math.max(
0,
currentBytes - Math.max(1, bytesToShed) - TRUNCATED_SUFFIX_BYTES,
);
if (targetContentBytes <= 0) return TRUNCATED_SUFFIX;

let consumedBytes = 0;
Expand Down Expand Up @@ -209,7 +222,10 @@ function createBlobShrinkAction(
*/
function collectShrinkActions(
attributes: Record<string, unknown>,
parsedMessages: Map<string, { version: string; messages: Array<{ parts: Array<Record<string, unknown>> }> }>,
parsedMessages: Map<
string,
{ version: string; messages: Array<{ parts: Array<Record<string, unknown>> }> }
>,
): ShrinkAction[] {
const actions: ShrinkAction[] = [];

Expand Down Expand Up @@ -244,16 +260,23 @@ function collectShrinkActions(

// Tool/server JSON payload fields → sentinel
const jsonField =
partType === "tool_call" ? "arguments"
: partType === "tool_call_response" ? "response"
: partType === "server_tool_call" ? "server_tool_call"
: partType === "server_tool_call_response" ? "server_tool_call_response"
partType === "tool_call"
? "arguments"
: partType === "tool_call_response"
? "response"
: partType === "server_tool_call"
? "server_tool_call"
: partType === "server_tool_call_response"
? "server_tool_call_response"
: undefined;

if (jsonField && part[jsonField] !== undefined && part[jsonField] !== JSON_SENTINEL) {
let fieldSize: number;
try { fieldSize = Buffer.byteLength(JSON.stringify(part[jsonField]), "utf8"); }
catch { fieldSize = 0; }
try {
fieldSize = Buffer.byteLength(JSON.stringify(part[jsonField]), "utf8");
} catch {
fieldSize = 0;
}
if (fieldSize > 0) {
const action: ShrinkAction = {
contentBytes: fieldSize,
Expand All @@ -269,7 +292,10 @@ function collectShrinkActions(
}

// Text/reasoning → trim
if ((partType === "text" || partType === "reasoning") && typeof part.content === "string") {
if (
(partType === "text" || partType === "reasoning") &&
typeof part.content === "string"
) {
const contentSize = Buffer.byteLength(part.content, "utf8");
if (contentSize > MIN_SHRINKABLE_STRING_BYTES) {
const action: ShrinkAction = {
Expand Down Expand Up @@ -316,7 +342,10 @@ function collectShrinkActions(

function flushParsedMessages(
attributes: Record<string, unknown>,
parsedMessages: Map<string, { version: string; messages: Array<{ parts: Array<Record<string, unknown>> }> }>,
parsedMessages: Map<
string,
{ version: string; messages: Array<{ parts: Array<Record<string, unknown>> }> }
>,
): void {
for (const [key, wrapper] of parsedMessages) {
try {
Expand All @@ -329,7 +358,10 @@ function flushParsedMessages(

function flushParsedMessage(
attributes: Record<string, unknown>,
parsedMessages: Map<string, { version: string; messages: Array<{ parts: Array<Record<string, unknown>> }> }>,
parsedMessages: Map<
string,
{ version: string; messages: Array<{ parts: Array<Record<string, unknown>> }> }
>,
key: string,
): void {
const wrapper = parsedMessages.get(key);
Expand All @@ -345,7 +377,10 @@ function flushParsedMessage(
function runShrinkPhase(
span: OTLPSpanLike,
attributes: Record<string, unknown>,
parsedMessages: Map<string, { version: string; messages: Array<{ parts: Array<Record<string, unknown>> }> }>,
parsedMessages: Map<
string,
{ version: string; messages: Array<{ parts: Array<Record<string, unknown>> }> }
>,
currentSize: number,
): number {
let nextSize = currentSize;
Expand Down Expand Up @@ -429,7 +464,9 @@ export function truncateSpan<T extends OTLPSpanLike>(spanDict: T): T {
if (parsed && Array.isArray(parsed.messages)) {
messageCount = parsed.messages.length;
}
} catch { /* not valid JSON */ }
} catch {
/* not valid JSON */
}
}
attributes[key] = serializeOverflowSentinel(messageCount);
parsedMessages.delete(key);
Expand Down
Loading
Loading