Skip to content
Open
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
23 changes: 19 additions & 4 deletions packages/instrumentation-undici/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"version": "0.14.0",
"description": "OpenTelemetry instrumentation for `undici` http client and Node.js fetch()",
"main": "build/src/index.js",
"module": "build/esm/index.js",
"types": "build/src/index.d.ts",
"type": "module",
"repository": {
"type": "git",
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git",
Expand All @@ -12,11 +14,11 @@
"scripts": {
"prepublishOnly": "npm run compile",
"setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-undici",
"compile": "tsc -p .",
"test": "nyc mocha test/**/*.test.ts",
"compile": "tsc --build tsconfig.json tsconfig.cjs.json && echo '{\"type\":\"commonjs\"}' > build/cjs/package.json",
"clean": "tsc --build --clean tsconfig.json tsconfig.cjs.json",
"test": "nyc mocha --loader=ts-node/esm test/**/*.test.ts",
"test-all-versions": "tav",
"tdd": "npm run test -- --watch-extensions ts --watch",
"clean": "rimraf build/*",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"watch": "tsc -w",
Expand All @@ -35,10 +37,23 @@
"engines": {
"node": "^18.19.0 || >=20.6.0"
},
"exports": {
"import": {
"types": "./build/src/index.d.ts",
"default": "./build/src/index.js"
},
"require": {
"types": "./build/cjs/index.d.ts",
"default": "./build/cjs/index.js"
}
},
"files": [
"build/src/**/*.js",
"build/src/**/*.js.map",
"build/src/**/*.d.ts"
"build/src/**/*.d.ts",
"build/cjs/**/*.js",
"build/cjs/**/*.js.map",
"build/cjs/**/*.d.ts"
],
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-undici/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

export { UndiciInstrumentation } from './undici';
export { UndiciInstrumentation } from './undici.js';
export type {
IgnoreRequestFunction,
RequestHookFunction,
Expand All @@ -23,4 +23,4 @@ export type {
UndiciInstrumentationConfig,
UndiciRequest,
UndiciResponse,
} from './types';
} from './types.js';
2 changes: 1 addition & 1 deletion packages/instrumentation-undici/src/internal-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { UndiciRequest, UndiciResponse } from './types';
import { UndiciRequest, UndiciResponse } from './types.js';

export interface ListenerRecord {
name: string;
Expand Down
8 changes: 4 additions & 4 deletions packages/instrumentation-undici/src/undici.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ import {
} from '@opentelemetry/api';

/** @knipignore */
import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
import { PACKAGE_NAME, PACKAGE_VERSION } from './version.js';

import {
ListenerRecord,
RequestHeadersMessage,
RequestMessage,
RequestTrailersMessage,
ResponseHeadersMessage,
} from './internal-types';
import { UndiciInstrumentationConfig, UndiciRequest } from './types';
import { SemanticAttributes } from './enums/SemanticAttributes';
} from './internal-types.js';
import { UndiciInstrumentationConfig, UndiciRequest } from './types.js';
import { SemanticAttributes } from './enums/SemanticAttributes.js';
import {
hrTime,
hrTimeDuration,
Expand Down
8 changes: 4 additions & 4 deletions packages/instrumentation-undici/test/fetch.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ import {
} from '@opentelemetry/sdk-trace-base';
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';

import { UndiciInstrumentation } from '../src/undici';
import { UndiciInstrumentation } from '../src/undici.js';

import { MockPropagation } from './utils/mock-propagation';
import { MockServer } from './utils/mock-server';
import { assertSpan } from './utils/assertSpan';
import { MockPropagation } from './utils/mock-propagation.js';
import { MockServer } from './utils/mock-server.js';
import { assertSpan } from './utils/assertSpan.js';

describe('UndiciInstrumentation `fetch` tests', function () {
let instrumentation: UndiciInstrumentation;
Expand Down
8 changes: 4 additions & 4 deletions packages/instrumentation-undici/test/metrics.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import {
MeterProvider,
} from '@opentelemetry/sdk-metrics';

import { UndiciInstrumentation } from '../src/undici';
import { UndiciInstrumentation } from '../src/undici.js';

import { MockServer } from './utils/mock-server';
import { MockMetricsReader } from './utils/mock-metrics-reader';
import { SemanticAttributes } from '../src/enums/SemanticAttributes';
import { MockServer } from './utils/mock-server.js';
import { MockMetricsReader } from './utils/mock-metrics-reader.js';
import { SemanticAttributes } from '../src/enums/SemanticAttributes.js';

describe('UndiciInstrumentation metrics tests', function () {
let instrumentation: UndiciInstrumentation;
Expand Down
15 changes: 11 additions & 4 deletions packages/instrumentation-undici/test/undici.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
import * as assert from 'assert';
import { Writable } from 'stream';
import { createRequire } from 'module';

import {
INVALID_SPAN_CONTEXT,
Expand All @@ -31,14 +32,20 @@ import {
} from '@opentelemetry/sdk-trace-base';
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';

import { UndiciInstrumentation } from '../src/undici';
import { UndiciInstrumentation } from '../src/undici.js';

import { MockPropagation } from './utils/mock-propagation';
import { MockServer } from './utils/mock-server';
import { assertSpan } from './utils/assertSpan';
import { MockPropagation } from './utils/mock-propagation.js';
import { MockServer } from './utils/mock-server.js';
import { assertSpan } from './utils/assertSpan.js';

import type { fetch, stream, request, Client, Dispatcher } from 'undici';

// NOTE: now this test is compiled to ESM and `require` is not available.
// So we do this to not make a refactor on code that is not publishwd to the user.
// This could be handled once https://github.com/open-telemetry/opentelemetry-js/issues/4898
// is closed.
const require = createRequire(import.meta.url);

// Undici docs (https://github.com/nodejs/undici#garbage-collection) suggest
// that an undici response body should always be consumed.
async function consumeResponseBody(body: Dispatcher.ResponseData['body']) {
Expand Down
2 changes: 1 addition & 1 deletion packages/instrumentation-undici/test/utils/assertSpan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
import { hrTimeToNanoseconds } from '@opentelemetry/core';
import { ReadableSpan } from '@opentelemetry/sdk-trace-base';
import * as assert from 'assert';
import { SemanticAttributes } from '../../src/enums/SemanticAttributes';
import { SemanticAttributes } from '../../src/enums/SemanticAttributes.js';

type IncomingHttpHeaders = Record<string, string | string[] | undefined>;

Expand Down
13 changes: 13 additions & 0 deletions packages/instrumentation-undici/tsconfig.cjs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"extends": "../../tsconfig.base",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/cjs",
"module": "commonjs",
"moduleResolution": "node10",
"tsBuildInfoFile": "build/cjs/tsconfig.cjs.tsbuildinfo"
},
"include": [
"src/**/*.ts"
]
}
6 changes: 4 additions & 2 deletions packages/instrumentation-undici/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
"extends": "../../tsconfig.base",
"extends": "../../tsconfig.base.esm.json",
"compilerOptions": {
"outDir": "build",
"rootDir": ".",
"outDir": "build"
"module": "node16",
"tsBuildInfoFile": "build/src/tsconfig.esm.tsbuildinfo"
},
"include": [
"src/**/*.ts",
Expand Down
Loading