axiom 0.22.1 → 0.22.2

package/dist/bin.cjs

@@ -610,7 +610,7 @@ var import_api4 = require("@opentelemetry/api");
 // package.json
 var package_default = {
   name: "axiom",
-  version: "0.22.1",
+  version: "0.22.2",
   type: "module",
   author: "Axiom, Inc.",
   contributors: [
@@ -1561,11 +1561,111 @@ var import_sdk_trace_node = require("@opentelemetry/sdk-trace-node");
 var import_resources = require("@opentelemetry/resources");
 var import_exporter_trace_otlp_http = require("@opentelemetry/exporter-trace-otlp-http");
 var import_api10 = require("@opentelemetry/api");
+
+// src/config/loader.ts
+var import_c12 = require("c12");
+var import_defu = require("defu");
+
+// src/config/index.ts
+var DEFAULT_EVAL_INCLUDE = ["**/*.eval.{ts,js,mts,mjs,cts,cjs}"];
+function createPartialDefaults() {
+  return {
+    eval: {
+      url: process.env.AXIOM_URL || "https://api.axiom.co",
+      token: process.env.AXIOM_TOKEN,
+      dataset: process.env.AXIOM_DATASET,
+      instrumentation: null,
+      include: [...DEFAULT_EVAL_INCLUDE],
+      exclude: [],
+      timeoutMs: 6e4
+    }
+  };
+}
+function validateConfig(config) {
+  const errors = [];
+  if (!config.eval?.token) {
+    errors.push(
+      "eval.token is required (set in axiom.config.ts or AXIOM_TOKEN environment variable)"
+    );
+  }
+  if (!config.eval?.dataset) {
+    errors.push(
+      "eval.dataset is required (set in axiom.config.ts or AXIOM_DATASET environment variable)"
+    );
+  }
+  if (!config.eval?.url) {
+    console.log(
+      "eval.url was not specified. Defaulting to `https://api.axiom.co`. Please set it in axiom.config.ts or AXIOM_URL environment variable if you want to use a different endpoint."
+    );
+  }
+  const instrumentation = config.eval?.instrumentation;
+  if (instrumentation !== null && instrumentation !== void 0 && typeof instrumentation !== "function") {
+    errors.push(
+      "eval.instrumentation must be a function returning OTEL setup information or null."
+    );
+  }
+  if (errors.length > 0) {
+    throw new AxiomCLIError(`Invalid Axiom configuration:
+  - ${errors.join("\n  - ")}`);
+  }
+  return config;
+}
+
+// src/config/loader.ts
+function customMerger(target, source) {
+  const merged = (0, import_defu.defu)(source, target);
+  if (source?.eval && "include" in source.eval) {
+    merged.eval.include = source.eval.include;
+  }
+  return merged;
+}
+async function loadConfig(cwd = process.cwd()) {
+  try {
+    const defaults = createPartialDefaults();
+    const result = await (0, import_c12.loadConfig)({
+      name: "axiom",
+      cwd,
+      // Support common config file extensions
+      configFile: "axiom.config",
+      // Don't use defaultConfig - we'll merge manually to control array behavior
+      // Disable configs other than .ts/.js/.mts/.mjs/.cts/.cjs
+      rcFile: false,
+      globalRc: false,
+      packageJson: false,
+      giget: false
+    });
+    const mergedConfig = customMerger(defaults, result.config);
+    const validatedConfig = validateConfig(mergedConfig);
+    return {
+      config: validatedConfig
+    };
+  } catch (error) {
+    if (error instanceof AxiomCLIError) {
+      throw error;
+    }
+    throw new AxiomCLIError(`Failed to load config file: ${errorToString(error)}`);
+  }
+}
+
+// src/evals/instrument.ts
 var axiomProvider;
 var axiomTracer;
 var userProvider;
 var initializationPromise = null;
 var initialized = false;
+async function resolveInstrumentationHook(config) {
+  if (config.eval.instrumentation) {
+    return config.eval.instrumentation;
+  }
+  try {
+    const { config: loadedConfig } = await loadConfig(process.cwd());
+    return loadedConfig.eval.instrumentation ?? null;
+  } catch (error) {
+    throw new AxiomCLIError(
+      `Failed to reload instrumentation from config: ${errorToString(error)}`
+    );
+  }
+}
 async function runInstrumentationHook(hook, options) {
   try {
     return await hook(options);
@@ -1595,11 +1695,11 @@ function setupEvalProvider(connection) {
   axiomProvider = new import_sdk_trace_node.NodeTracerProvider({
     resource: (0, import_resources.resourceFromAttributes)({
       ["service.name"]: "axiom",
-      ["service.version"]: "0.22.1"
+      ["service.version"]: "0.22.2"
     }),
     spanProcessors: [processor]
   });
-  axiomTracer = axiomProvider.getTracer("axiom", "0.22.1");
+  axiomTracer = axiomProvider.getTracer("axiom", "0.22.2");
 }
 async function initInstrumentation(config) {
   if (initialized) {
@@ -1611,12 +1711,12 @@ async function initInstrumentation(config) {
   }
   initializationPromise = (async () => {
     if (!config.enabled) {
-      axiomTracer = import_api10.trace.getTracer("axiom", "0.22.1");
+      axiomTracer = import_api10.trace.getTracer("axiom", "0.22.2");
       initialized = true;
       return;
     }
     const connection = resolveAxiomConnection(config.config);
-    const hook = config.config.eval.instrumentation;
+    const hook = await resolveInstrumentationHook(config.config);
     let hookResult = void 0;
     if (hook) {
       config.config.eval.instrumentation = hook;
@@ -1769,91 +1869,6 @@ function isGlob(str) {
   return /[*?[\]{}!]/.test(str);
 }
 
-// src/config/loader.ts
-var import_c12 = require("c12");
-var import_defu = require("defu");
-
-// src/config/index.ts
-var DEFAULT_EVAL_INCLUDE = ["**/*.eval.{ts,js,mts,mjs,cts,cjs}"];
-function createPartialDefaults() {
-  return {
-    eval: {
-      url: process.env.AXIOM_URL || "https://api.axiom.co",
-      token: process.env.AXIOM_TOKEN,
-      dataset: process.env.AXIOM_DATASET,
-      instrumentation: null,
-      include: [...DEFAULT_EVAL_INCLUDE],
-      exclude: [],
-      timeoutMs: 6e4
-    }
-  };
-}
-function validateConfig(config) {
-  const errors = [];
-  if (!config.eval?.token) {
-    errors.push(
-      "eval.token is required (set in axiom.config.ts or AXIOM_TOKEN environment variable)"
-    );
-  }
-  if (!config.eval?.dataset) {
-    errors.push(
-      "eval.dataset is required (set in axiom.config.ts or AXIOM_DATASET environment variable)"
-    );
-  }
-  if (!config.eval?.url) {
-    console.log(
-      "eval.url was not specified. Defaulting to `https://api.axiom.co`. Please set it in axiom.config.ts or AXIOM_URL environment variable if you want to use a different endpoint."
-    );
-  }
-  const instrumentation = config.eval?.instrumentation;
-  if (instrumentation !== null && instrumentation !== void 0 && typeof instrumentation !== "function") {
-    errors.push(
-      "eval.instrumentation must be a function returning OTEL setup information or null."
-    );
-  }
-  if (errors.length > 0) {
-    throw new AxiomCLIError(`Invalid Axiom configuration:
-  - ${errors.join("\n  - ")}`);
-  }
-  return config;
-}
-
-// src/config/loader.ts
-function customMerger(target, source) {
-  const merged = (0, import_defu.defu)(source, target);
-  if (source?.eval && "include" in source.eval) {
-    merged.eval.include = source.eval.include;
-  }
-  return merged;
-}
-async function loadConfig(cwd = process.cwd()) {
-  try {
-    const defaults = createPartialDefaults();
-    const result = await (0, import_c12.loadConfig)({
-      name: "axiom",
-      cwd,
-      // Support common config file extensions
-      configFile: "axiom.config",
-      // Don't use defaultConfig - we'll merge manually to control array behavior
-      // Disable configs other than .ts/.js/.mts/.mjs/.cts/.cjs
-      rcFile: false,
-      globalRc: false,
-      packageJson: false,
-      giget: false
-    });
-    const mergedConfig = customMerger(defaults, result.config);
-    const validatedConfig = validateConfig(mergedConfig);
-    return {
-      config: validatedConfig
-    };
-  } catch (error) {
-    if (error instanceof AxiomCLIError) {
-      throw error;
-    }
-    throw new AxiomCLIError(`Failed to load config file: ${errorToString(error)}`);
-  }
-}
-
 // src/cli/commands/eval.command.ts
 var loadEvalCommand = (program2, flagOverrides = {}) => {
   return program2.addCommand(
@@ -2029,7 +2044,7 @@ var import_commander4 = require("commander");
 var loadVersionCommand = (program2) => {
   return program2.addCommand(
     new import_commander4.Command("version").description("cli version").action(() => {
-      console.log("0.22.1");
+      console.log("0.22.2");
     })
   );
 };
@@ -2039,7 +2054,7 @@ var { loadEnvConfig } = import_env.default;
 loadEnvConfig(process.cwd());
 var { cleanedArgv, overrides } = extractOverrides(process.argv.slice(2));
 var program = new import_commander5.Command();
-program.name("axiom").description("Axiom's CLI to manage your objects and run evals").version("0.22.1");
+program.name("axiom").description("Axiom's CLI to manage your objects and run evals").version("0.22.2");
 loadPushCommand(program);
 loadPullCommand(program);
 loadEvalCommand(program, overrides);