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
2 changes: 1 addition & 1 deletion e2e/remix/app/routes/maybe-error.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { LoaderArgs } from '@remix-run/node'
import { json } from '@remix-run/node'
import { useLoaderData } from '@remix-run/react'
import { initHighlight } from '~/utils/init-highlight'
import { initHighlight } from '~/utils/init-highlight.server'

export async function loader({ request }: LoaderArgs) {
initHighlight()
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@
"diff": "^4.0.4",
"tar": "^7.5.11",
"devalue": "^5.6.2",
"undici@5.28.4": "5.29.0",
"undici@^5": "^5.29.0",
"undici@5.28.4": "^6.24.0",
"undici@^5": "^6.24.0",
"undici@5.29.0": "^6.24.0",
"undici@^5.28.4": "^6.24.0",
"undici@^6": "^6.24.0",
"undici@^6.18.2": "^6.24.0",
"undici@^6.21.2": "^6.24.0",
Expand Down
32 changes: 16 additions & 16 deletions sdk/highlight-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,22 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/api-logs": "^0.57.2",
"@opentelemetry/auto-instrumentations-node": "^0.56.0",
"@opentelemetry/core": "^1.30.1",
"@opentelemetry/exporter-jaeger": "^1.30.1",
"@opentelemetry/exporter-logs-otlp-http": "^0.57.2",
"@opentelemetry/exporter-metrics-otlp-http": "^0.57.2",
"@opentelemetry/exporter-trace-otlp-http": "^0.57.2",
"@opentelemetry/instrumentation": "^0.57.2",
"@opentelemetry/otlp-exporter-base": "^0.57.2",
"@opentelemetry/otlp-transformer": "^0.57.2",
"@opentelemetry/resources": "^1.30.1",
"@opentelemetry/sdk-logs": "^0.57.2",
"@opentelemetry/sdk-node": "^0.57.2",
"@opentelemetry/sdk-trace-base": "^1.30.1",
"@opentelemetry/semantic-conventions": "^1.30.0",
"@opentelemetry/winston-transport": "^0.10.0",
"@opentelemetry/api-logs": "^0.203.0",
"@opentelemetry/auto-instrumentations-node": "^0.62.0",
"@opentelemetry/core": "^2.0.1",
"@opentelemetry/exporter-jaeger": "^2.0.1",
"@opentelemetry/exporter-logs-otlp-http": "^0.203.0",
"@opentelemetry/exporter-metrics-otlp-http": "^0.203.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.203.0",
"@opentelemetry/instrumentation": "^0.203.0",
"@opentelemetry/otlp-exporter-base": "^0.203.0",
"@opentelemetry/otlp-transformer": "^0.203.0",
"@opentelemetry/resources": "^2.0.1",
"@opentelemetry/sdk-logs": "^0.203.0",
"@opentelemetry/sdk-node": "^0.203.0",
"@opentelemetry/sdk-trace-base": "^2.0.1",
"@opentelemetry/semantic-conventions": "^1.34.0",
"@opentelemetry/winston-transport": "^0.14.0",
"@rollup/plugin-commonjs": "^28.0.2",
"@rollup/plugin-json": "^6.1.0",
"@rollup/plugin-node-resolve": "^16.0.0",
Expand Down
2 changes: 2 additions & 0 deletions sdk/highlight-node/rollup.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@ const config = {
format: 'es',
sourcemap: true,
exports: 'auto',
inlineDynamicImports: true,
},
{
file: 'dist/index.cjs',
format: 'cjs',
sourcemap: true,
exports: 'auto',
inlineDynamicImports: true,
},
],
treeshake: 'safest',
Expand Down
17 changes: 10 additions & 7 deletions sdk/highlight-node/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ import {
registerInstrumentations,
} from '@opentelemetry/instrumentation'
import { CompressionAlgorithm } from '@opentelemetry/otlp-exporter-base'
import { processDetectorSync, Resource } from '@opentelemetry/resources'
import {
processDetector,
resourceFromAttributes,
} from '@opentelemetry/resources'
import { NodeSDK } from '@opentelemetry/sdk-node'
import {
AlwaysOnSampler,
Expand Down Expand Up @@ -205,23 +208,23 @@ export class Highlight {
attributes[otelAttr] = options[option]
}
}
const resource = new Resource(attributes)
const resource = resourceFromAttributes(attributes)

const exporter = new OTLPTraceExporter({
...config,
url: `${config.url}/v1/traces`,
})
this.processor = new BatchSpanProcessor(exporter, opts)

this.loggerProvider = new LoggerProvider({
resource,
})
const logsExporter = new OTLPLogExporter({
...config,
url: `${config.url}/v1/logs`,
})
const logsProcessor = new BatchLogRecordProcessor(logsExporter, opts)
this.loggerProvider.addLogRecordProcessor(logsProcessor)
this.loggerProvider = new LoggerProvider({
resource,
processors: [logsProcessor],
})

const metricsExporter = new OTLPMetricExporter({
...config,
Expand All @@ -235,7 +238,7 @@ export class Highlight {

this.otel = new NodeSDK({
autoDetectResources: true,
resourceDetectors: [processDetectorSync],
resourceDetectors: [processDetector],
resource,
spanProcessors: [this.processor],
logRecordProcessors: [logsProcessor],
Expand Down
5 changes: 2 additions & 3 deletions sdk/highlight-node/src/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
Span as OtelSpan,
SpanOptions,
} from '@opentelemetry/api'
import { ResourceAttributes } from '@opentelemetry/resources'
import { Highlight } from './client'
import log from './log'
import type { HighlightContext, Metric, NodeOptions } from './types.js'
Expand Down Expand Up @@ -61,7 +60,7 @@ export interface HighlightInterface {
requestId?: string,
metadata?: Attributes,
) => Promise<void>
setAttributes: (attributes: ResourceAttributes) => void
setAttributes: (attributes: Attributes) => void
_debug: (...data: any[]) => void
}

Expand Down Expand Up @@ -195,7 +194,7 @@ export const H: HighlightInterface = {
console.warn('highlight-node consumeAndFlush error: ', e)
}
},
setAttributes: (attributes: ResourceAttributes) => {
setAttributes: (attributes: Attributes) => {
return highlight_obj.setAttributes(attributes)
},

Expand Down
Loading
Loading