@mastra/observability 1.16.1-alpha.0 → 1.16.1-alpha.1

package/dist/index.js

@@ -998,6 +998,7 @@ var PricingModel = class {
 
 // src/metrics/pricing-registry.ts
 var DATA_FILE_NAME = "pricing-data.jsonl";
+var BEDROCK_GEOGRAPHY_PREFIXES = /* @__PURE__ */ new Set(["global", "us", "eu", "apac", "jp", "au"]);
 var MINIFIED_METER_TO_CANONICAL = {
   it: "input_tokens",
   ot: "output_tokens",
@@ -1032,7 +1033,7 @@ var PricingRegistry = class _PricingRegistry {
     return _PricingRegistry.globalRegistry;
   }
   get(args) {
-    const variants = getModelVariants(args.model);
+    const variants = getModelVariants(args.model, normalizeProvider(args.provider));
     for (const variant of variants) {
       const key = makePricingKey({ provider: args.provider, model: variant });
       const match = this.pricingModels.get(key);
@@ -1126,7 +1127,7 @@ function normalizeProvider(provider) {
   const dotIndex = normalized.indexOf(".");
   return dotIndex !== -1 ? normalized.substring(0, dotIndex) : normalized;
 }
-function getModelVariants(model) {
+function getModelVariants(model, provider) {
   const variants = /* @__PURE__ */ new Set();
   const add = (v) => {
     variants.add(v);
@@ -1141,6 +1142,22 @@ function getModelVariants(model) {
     add(withoutVendor);
     add(withoutVendor.replace(/\./g, "-"));
   }
+  if (provider === "amazon-bedrock") {
+    const addBedrockVariant = (v) => {
+      add(v);
+      add(v.replace(/-(?:v)?\d+(?::\d+)?$/, ""));
+    };
+    const segments = model.split(".");
+    const withoutGeography = BEDROCK_GEOGRAPHY_PREFIXES.has(segments[0] ?? "") ? segments.slice(1).join(".") : model;
+    addBedrockVariant(withoutGeography);
+    addBedrockVariant(withoutGeography.replace(/\./g, "-"));
+    const vendorSeparator = withoutGeography.indexOf(".");
+    if (vendorSeparator !== -1) {
+      const withoutVendor = withoutGeography.substring(vendorSeparator + 1);
+      addBedrockVariant(withoutVendor);
+      addBedrockVariant(withoutVendor.replace(/\./g, "-"));
+    }
+  }
   return [...variants];
 }
 function stripDateSuffix(model) {
@@ -1505,6 +1522,7 @@ function getDurationMetricName(span) {
       return "mastra_agent_duration_ms";
     case SpanType.TOOL_CALL:
     case SpanType.MCP_TOOL_CALL:
+    case SpanType.PROVIDER_TOOL_CALL:
       return "mastra_tool_duration_ms";
     case SpanType.CLIENT_TOOL_CALL:
       return null;
@@ -2464,6 +2482,7 @@ function isSpanInternal(spanType, flags) {
     // Tool-related spans
     case SpanType.TOOL_CALL:
     case SpanType.MCP_TOOL_CALL:
+    case SpanType.PROVIDER_TOOL_CALL:
       return (flags & InternalSpans.TOOL) !== 0;
     // Model-related spans
     case SpanType.MODEL_GENERATION: