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
8 changes: 2 additions & 6 deletions apps/sim/app/api/copilot/chat/stream/route.test.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import { trace } from '@opentelemetry/api'
import {
BasicTracerProvider,
InMemorySpanExporter,
SimpleSpanProcessor,
} from '@opentelemetry/sdk-trace-base'
import { InMemorySpanExporter, SimpleSpanProcessor, TracerProvider } from '@opentelemetry/sdk-trace'
import { authMockFns } from '@sim/testing'
import { NextRequest } from 'next/server'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
Expand Down Expand Up @@ -209,7 +205,7 @@ describe('copilot chat stream replay route', () => {
it('ends a still-running replay at its cap without a terminal so the client re-attaches', async () => {
const exporter = new InMemorySpanExporter()
trace.setGlobalTracerProvider(
new BasicTracerProvider({ spanProcessors: [new SimpleSpanProcessor(exporter)] })
new TracerProvider({ spanProcessors: [new SimpleSpanProcessor({ exporter })] })
)
vi.useFakeTimers()
getLatestRunForStream.mockResolvedValue({
Expand Down
10 changes: 5 additions & 5 deletions apps/sim/instrumentation-node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import type {
SamplingResult,
Span,
SpanProcessor,
} from '@opentelemetry/sdk-trace-base'
} from '@opentelemetry/sdk-trace'
import { createLogger } from '@sim/logger'
import { TraceAttr } from '@/lib/mothership/generated/trace-attributes-v1'
import { env } from './lib/core/config/env'
Expand Down Expand Up @@ -181,9 +181,8 @@ async function initializeOpenTelemetry() {
const { PeriodicExportingMetricReader } = await import('@opentelemetry/sdk-metrics')
const { OTLPLogExporter } = await import('@opentelemetry/exporter-logs-otlp-http')
const { BatchLogRecordProcessor } = await import('@opentelemetry/sdk-logs')
const { BatchSpanProcessor } = await import('@opentelemetry/sdk-trace-node')
const { TraceIdRatioBasedSampler, SamplingDecision } = await import(
'@opentelemetry/sdk-trace-base'
const { BatchSpanProcessor, TraceIdRatioBasedSampler, SamplingDecision } = await import(
'@opentelemetry/sdk-trace'
)

// Drops Next framework spans, inherits SAMPLED from business
Expand Down Expand Up @@ -255,7 +254,8 @@ async function initializeOpenTelemetry() {
})
}

const batchProcessor = new BatchSpanProcessor(exporter, {
const batchProcessor = new BatchSpanProcessor({
exporter,
maxQueueSize: telemetryConfig.batchSettings.maxQueueSize,
maxExportBatchSize: telemetryConfig.batchSettings.maxExportBatchSize,
scheduledDelayMillis: telemetryConfig.batchSettings.scheduledDelayMillis,
Expand Down
8 changes: 2 additions & 6 deletions apps/sim/lib/mothership/observability/timing.test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import { context, SpanStatusCode, trace } from '@opentelemetry/api'
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks'
import {
BasicTracerProvider,
InMemorySpanExporter,
SimpleSpanProcessor,
} from '@opentelemetry/sdk-trace-base'
import { InMemorySpanExporter, SimpleSpanProcessor, TracerProvider } from '@opentelemetry/sdk-trace'
import { dbChainMockFns } from '@sim/testing/mocks/database.mock'
import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
import { createTracedCliTransport } from '@/lib/mothership/agent-cli/traced-transport'
Expand All @@ -17,7 +13,7 @@ const transaction = dbChainMockFns.transaction

describe('Mothership boundary timing', () => {
const exporter = new InMemorySpanExporter()
const provider = new BasicTracerProvider({ spanProcessors: [new SimpleSpanProcessor(exporter)] })
const provider = new TracerProvider({ spanProcessors: [new SimpleSpanProcessor({ exporter })] })
const manager = new AsyncLocalStorageContextManager()

beforeAll(() => {
Expand Down
4 changes: 2 additions & 2 deletions apps/sim/lib/mothership/request/lifecycle/headless.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { propagation, trace } from '@opentelemetry/api'
import { W3CTraceContextPropagator } from '@opentelemetry/core'
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base'
import { TracerProvider } from '@opentelemetry/sdk-trace'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import type { OrchestratorResult } from '@/lib/mothership/request/types'

Expand All @@ -27,7 +27,7 @@ function createLifecycleResult(overrides?: Partial<OrchestratorResult>): Orchest

describe('runHeadlessCopilotLifecycle', () => {
beforeEach(() => {
trace.setGlobalTracerProvider(new BasicTracerProvider())
trace.setGlobalTracerProvider(new TracerProvider())
propagation.setGlobalPropagator(new W3CTraceContextPropagator())
})

Expand Down
4 changes: 2 additions & 2 deletions apps/sim/lib/mothership/request/lifecycle/start.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { propagation, trace } from '@opentelemetry/api'
import { W3CTraceContextPropagator } from '@opentelemetry/core'
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base'
import { TracerProvider } from '@opentelemetry/sdk-trace'
import { dbChainMockFns, resetDbChainMock, resetEnvFlagsMock, setEnvFlags } from '@sim/testing'
import {
billingAttributionMock,
Expand Down Expand Up @@ -187,7 +187,7 @@ describe('createSSEStream terminal error handling', () => {
},
})
)
trace.setGlobalTracerProvider(new BasicTracerProvider())
trace.setGlobalTracerProvider(new TracerProvider())
propagation.setGlobalPropagator(new W3CTraceContextPropagator())
vi.stubGlobal(
'fetch',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ vi.mock('@/lib/mothership/request/lifecycle/run', () => ({
}))

import { trace } from '@opentelemetry/api'
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base'
import { TracerProvider } from '@opentelemetry/sdk-trace'
import { db } from '@sim/db'
import { copilotChats, copilotRuns, permissions, user, workflow, workspace } from '@sim/db/schema'
import { generateId } from '@sim/utils/id'
Expand Down Expand Up @@ -513,7 +513,7 @@ describe.runIf(Boolean(redisUrl))('a turn whose stream exhausts its replay budge
beforeAll(() => {
trace.disable()
trace.setGlobalTracerProvider(
new BasicTracerProvider({
new TracerProvider({
spanProcessors: [
{
onStart: () => {},
Expand Down
3 changes: 1 addition & 2 deletions apps/sim/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,7 @@
"@opentelemetry/sdk-logs": "0.221.0",
"@opentelemetry/sdk-metrics": "2.10.0",
"@opentelemetry/sdk-node": "0.221.0",
"@opentelemetry/sdk-trace-base": "2.10.0",
"@opentelemetry/sdk-trace-node": "2.10.0",
"@opentelemetry/sdk-trace": "2.10.0",
"@opentelemetry/semantic-conventions": "^1.32.0",
"@radix-ui/react-avatar": "1.3.1",
"@radix-ui/react-checkbox": "1.4.1",
Expand Down
3 changes: 1 addition & 2 deletions bun.lock

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

Loading