Release 0.8.19:

* Fixed wrong interactions between private tracer and global tracer

Author: Andrei Bratu

package.json

@@ -1,6 +1,6 @@
 {
     "name": "humanloop",
-    "version": "0.8.18",
+    "version": "0.8.19",
     "private": false,
     "repository": "https://github.com/humanloop/humanloop-node",
     "main": "./index.js",

src/context.ts

@@ -1,4 +1,5 @@
-import * as contextApi from "@opentelemetry/api";
+import * as otel_api from "@opentelemetry/api";
+import { AsyncHooksContextManager } from "@opentelemetry/context-async-hooks";
 
 import { HumanloopRuntimeError } from "./error";
 import {
@@ -7,15 +8,18 @@ import {
     HUMANLOOP_CONTEXT_TRACE_ID,
 } from "./otel/constants";
 
+export const HL_CONTEXT = new AsyncHooksContextManager();
+HL_CONTEXT.enable();
+
 export function getTraceId(): string | undefined {
-    const key = contextApi.createContextKey(HUMANLOOP_CONTEXT_TRACE_ID);
-    const value = contextApi.context.active().getValue(key);
+    const key = otel_api.createContextKey(HUMANLOOP_CONTEXT_TRACE_ID);
+    const value = HL_CONTEXT.active().getValue(key);
     return (value || undefined) as string | undefined;
 }
 
-export function setTraceId(flowLogId: string): contextApi.Context {
-    const key = contextApi.createContextKey(HUMANLOOP_CONTEXT_TRACE_ID);
-    return contextApi.context.active().setValue(key, flowLogId);
+export function setTraceId(flowLogId: string): otel_api.Context {
+    const key = otel_api.createContextKey(HUMANLOOP_CONTEXT_TRACE_ID);
+    return HL_CONTEXT.active().setValue(key, flowLogId);
 }
 
 export type DecoratorContext = {
@@ -26,14 +30,14 @@ export type DecoratorContext = {
 
 export function setDecoratorContext(
     decoratorContext: DecoratorContext,
-): contextApi.Context {
-    const key = contextApi.createContextKey(HUMANLOOP_CONTEXT_DECORATOR);
-    return contextApi.context.active().setValue(key, decoratorContext);
+): otel_api.Context {
+    const key = otel_api.createContextKey(HUMANLOOP_CONTEXT_DECORATOR);
+    return HL_CONTEXT.active().setValue(key, decoratorContext);
 }
 
 export function getDecoratorContext(): DecoratorContext | undefined {
-    const key = contextApi.createContextKey(HUMANLOOP_CONTEXT_DECORATOR);
-    return (contextApi.context.active().getValue(key) || undefined) as
+    const key = otel_api.createContextKey(HUMANLOOP_CONTEXT_DECORATOR);
+    return (HL_CONTEXT.active().getValue(key) || undefined) as
         | DecoratorContext
         | undefined;
 }
@@ -134,14 +138,14 @@ export class EvaluationContext {
 
 export function setEvaluationContext(
     evaluationContext: EvaluationContext,
-): contextApi.Context {
-    const key = contextApi.createContextKey(HUMANLOOP_CONTEXT_EVALUATION);
-    return contextApi.context.active().setValue(key, evaluationContext);
+): otel_api.Context {
+    const key = otel_api.createContextKey(HUMANLOOP_CONTEXT_EVALUATION);
+    return HL_CONTEXT.active().setValue(key, evaluationContext);
 }
 
 export function getEvaluationContext(): EvaluationContext | undefined {
-    const key = contextApi.createContextKey(HUMANLOOP_CONTEXT_EVALUATION);
-    return (contextApi.context.active().getValue(key) || undefined) as
+    const key = otel_api.createContextKey(HUMANLOOP_CONTEXT_EVALUATION);
+    return (HL_CONTEXT.active().getValue(key) || undefined) as
         | EvaluationContext
         | undefined;
 }

src/decorators/flow.ts

@@ -1,10 +1,9 @@
-import * as contextApi from "@opentelemetry/api";
 import { Tracer } from "@opentelemetry/api";
 import { ReadableSpan } from "@opentelemetry/sdk-trace-node";
 
 import { HumanloopClient } from "../Client";
 import { ChatMessage, FlowLogRequest, FlowLogResponse } from "../api";
-import { getTraceId, setDecoratorContext, setTraceId } from "../context";
+import { HL_CONTEXT, getTraceId, setDecoratorContext, setTraceId } from "../context";
 import { jsonifyIfNotString, writeToOpenTelemetrySpan } from "../otel";
 import {
     HUMANLOOP_FILE_TYPE_KEY,
@@ -42,7 +41,7 @@ export function flowUtilityFactory<I, O>(
             ? I
             : never,
     ) => {
-        return contextApi.context.with(
+        return HL_CONTEXT.with(
             setDecoratorContext({
                 path: path,
                 type: fileType,
@@ -77,7 +76,7 @@ export function flowUtilityFactory<I, O>(
                                 ...initLogInputs,
                             });
 
-                        return await contextApi.context.with(
+                        return await HL_CONTEXT.with(
                             setTraceId(flowLogResponse.id),
                             async () => {
                                 let logOutput: string | undefined;

src/decorators/prompt.ts

@@ -1,12 +1,10 @@
-import * as contextApi from "@opentelemetry/api";
-
-import { setDecoratorContext } from "../evals";
+import { HL_CONTEXT, setDecoratorContext } from "../context";
 
 export function promptDecoratorFactory<I, O>(path: string, callable: (inputs: I) => O) {
     const fileType = "prompt";
 
     const wrappedFunction = (inputs: I) => {
-        return contextApi.context.with(
+        return HL_CONTEXT.with(
             setDecoratorContext({
                 path: path,
                 type: fileType,

src/evals/run.ts

@@ -7,13 +7,11 @@
  * Functions in this module should be accessed via the Humanloop client. They should
  * not be called directly.
  */
-import * as contextApi from "@opentelemetry/api";
 import cliProgress from "cli-progress";
 import _, { capitalize } from "lodash";
 
 import {
     BooleanEvaluatorStatsResponse,
-    ChatMessage,
     CreateEvaluationRequestEvaluatorsItem,
     DatapointResponse,
     DatasetResponse,
@@ -35,25 +33,23 @@ import {
     PromptRequest,
     PromptResponse,
     RunStatsResponse,
-    ToolKernelRequest,
     ToolLogRequest,
     ToolRequest,
     ToolResponse,
 } from "../api";
 import {
     EvaluationContext,
+    HL_CONTEXT,
     getEvaluationContext,
     setEvaluationContext,
 } from "../context";
 import { HumanloopRuntimeError } from "../error";
 import { Humanloop, HumanloopClient } from "../index";
-import { jsonifyIfNotString } from "../otel/helpers";
 import {
     Dataset,
     Evaluator,
     EvaluatorCheck,
     File,
-    FileResponse,
     LocalEvaluator,
     LocalEvaluatorReturnTypeEnum,
     OnlineEvaluator,
@@ -371,7 +367,7 @@ export async function runEval<I, O>(
             throw new Error(`Datapoint 'inputs' attribute is undefined.`);
         }
 
-        contextApi.context.with(
+        HL_CONTEXT.with(
             setEvaluationContext(
                 new EvaluationContext({
                     sourceDatapointId: datapoint.id,

src/humanloop.client.ts

@@ -166,15 +166,13 @@ class HumanloopTracerSingleton {
                 ),
             ],
         });
-        const instrumentations: Instrumentation[] = [];
         if (config.instrumentProviders?.OpenAI) {
             const openaiInstrumentation = new OpenAIInstrumentation({
                 enrichTokens: true,
             });
             openaiInstrumentation.manuallyInstrument(config.instrumentProviders.OpenAI);
             openaiInstrumentation.setTracerProvider(this.tracerProvider);
             openaiInstrumentation.enable();
-            instrumentations.push(openaiInstrumentation);
         }
         if (config.instrumentProviders?.Anthropic) {
             const anthropicInstrumentation = new AnthropicInstrumentation();
@@ -183,7 +181,6 @@ class HumanloopTracerSingleton {
             );
             anthropicInstrumentation.setTracerProvider(this.tracerProvider);
             anthropicInstrumentation.enable();
-            instrumentations.push(anthropicInstrumentation);
         }
         if (config.instrumentProviders?.CohereAI) {
             const cohereInstrumentation = new CohereInstrumentation();
@@ -192,16 +189,8 @@ class HumanloopTracerSingleton {
             );
             cohereInstrumentation.setTracerProvider(this.tracerProvider);
             cohereInstrumentation.enable();
-            instrumentations.push(cohereInstrumentation);
         }
 
-        this.tracerProvider.register();
-
-        registerInstrumentations({
-            tracerProvider: this.tracerProvider,
-            instrumentations,
-        });
-
         this.tracer = this.tracerProvider.getTracer("humanloop.sdk");
     }