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
4 changes: 2 additions & 2 deletions hypaware-core/plugins-workspace/format-jsonl/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { Buffer } from 'node:buffer'
import zlib from 'node:zlib'

import { SpanStatusCode, trace } from '@opentelemetry/api'
import { getTracer, SpanStatusCode } from '../../../../src/core/observability/index.js'

/** @typedef {import('../../../../collectivus-plugin-kernel-types').PluginActivationContext} PluginActivationContext */
/** @typedef {import('../../../../collectivus-plugin-kernel-types').QueryPartition} QueryPartition */
Expand Down Expand Up @@ -48,7 +48,7 @@ export async function activate(ctx) {
* @returns {Promise<SinkEncodedBlob>}
*/
async function encodePartition(partition, ctx) {
const tracer = trace.getTracer(PLUGIN_NAME, PLUGIN_VERSION)
const tracer = getTracer('plugin.format-jsonl')
return tracer.startActiveSpan(
'encoder.encode_jsonl',
{
Expand Down
5 changes: 2 additions & 3 deletions hypaware-core/plugins-workspace/format-parquet/src/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// @ts-check

import { SpanStatusCode, trace } from '@opentelemetry/api'

import { rowsToColumnSources } from './columns.js'
import { getTracer, SpanStatusCode } from '../../../../src/core/observability/index.js'

/** @typedef {import('../../../../collectivus-plugin-kernel-types').ColumnSpec} ColumnSpec */
/** @typedef {import('../../../../collectivus-plugin-kernel-types').PluginActivationContext} PluginActivationContext */
Expand Down Expand Up @@ -48,7 +47,7 @@ export async function activate(ctx) {
* @returns {Promise<SinkEncodedBlob>}
*/
async function encodePartition(partition, ctx) {
const tracer = trace.getTracer(PLUGIN_NAME, PLUGIN_VERSION)
const tracer = getTracer('plugin.format-parquet')
return tracer.startActiveSpan(
'encoder.encode_parquet',
{
Expand Down
5 changes: 2 additions & 3 deletions hypaware-core/plugins-workspace/otel/src/collector.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// @ts-check

import { trace } from '@opentelemetry/api'

import {
Attr,
getActiveSpan,
withSpan,
} from '../../../../src/core/observability/index.js'
import { columnsFor, otelTablePath, PLUGIN_NAME } from './datasets.js'
Expand Down Expand Up @@ -162,7 +161,7 @@ function asObject(value) {
* @param {number} port
*/
export function stampBoundAddress(host, port) {
const span = trace.getActiveSpan()
const span = getActiveSpan()
if (!span) return
span.setAttribute('listen_host', host)
span.setAttribute('listen_port', port)
Expand Down
246 changes: 0 additions & 246 deletions package-lock.json

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

12 changes: 0 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,6 @@
"smoke": "node ./hypaware-core/smoke/index.js"
},
"dependencies": {
"@opentelemetry/api": "^1.9.1",
"@opentelemetry/api-logs": "^0.218.0",
"@opentelemetry/core": "^2.7.1",
"@opentelemetry/exporter-logs-otlp-http": "^0.218.0",
"@opentelemetry/exporter-metrics-otlp-http": "^0.218.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.218.0",
"@opentelemetry/resources": "^2.7.1",
"@opentelemetry/sdk-logs": "^0.218.0",
"@opentelemetry/sdk-metrics": "^2.7.1",
"@opentelemetry/sdk-trace-base": "^2.7.1",
"@opentelemetry/sdk-trace-node": "^2.7.1",
"@opentelemetry/semantic-conventions": "^1.41.1",
"hyparquet": "^1.25.8",
"hyparquet-compressors": "^1.1.1",
"icebird": "^0.7.0",
Expand Down
4 changes: 3 additions & 1 deletion src/core/cli/dispatch.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
import process from 'node:process'
import path from 'node:path'
import { performance } from 'node:perf_hooks'
import { context, ROOT_CONTEXT, SpanStatusCode } from '@opentelemetry/api'

import {
Attr,
buildAttrs,
context,
getKernelInstruments,
getLogger,
getTracer,
installObservability,
ROOT_CONTEXT,
SpanStatusCode,
} from '../observability/index.js'
import { createCommandRegistry } from '../registry/commands.js'
import { createKernelRuntime } from '../runtime/activation.js'
Expand Down
9 changes: 5 additions & 4 deletions src/core/observability/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ export function installObservability(opts = {}) {
/**
* @param {{
* env: import('./env.js').ObservabilityEnv,
* resource: import('@opentelemetry/resources').Resource,
* tracer: { provider: import('@opentelemetry/sdk-trace-node').NodeTracerProvider|null },
* logger: { provider: import('@opentelemetry/sdk-logs').LoggerProvider|null },
* meter: { provider: import('@opentelemetry/sdk-metrics').MeterProvider|null, readers: import('@opentelemetry/sdk-metrics').MetricReader[] }
* resource: { attributes: Record<string, string|number|boolean> },
* tracer: { provider: import('./runtime.js').TracerProvider|null },
* logger: { provider: import('./runtime.js').LoggerProvider|null },
* meter: { provider: import('./runtime.js').MeterProvider|null, readers: object[] }
* }} parts
*/
function buildHandle({ env, resource, tracer, logger, meter }) {
Expand Down Expand Up @@ -91,3 +91,4 @@ export { getLogger } from './logger.js'
export { getMeter, getKernelInstruments } from './meter.js'
export { withSpan, runRoot } from './span_helpers.js'
export { buildAttrs, normalizeKey, Attr } from './attrs.js'
export { context, ROOT_CONTEXT, SpanStatusCode, getActiveSpan } from './runtime.js'
Loading