Skip to content

Commit 0cef9fa

Browse files
authored
refactor: use package json auto generated export also for npm package name (#2203)
* refactor: rename VERSION to NPM_PACKAGE_VERSION * refactor: use auto-generated NPM_PACKAGE_NAME * fix: remove the NPM_ prefix from the auto generated names * fix: use PACKAGE_NAME in host-metrics * chore: apply also for new instrumentation kafkajs
1 parent 69cd638 commit 0cef9fa

File tree

47 files changed

+108
-120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+108
-120
lines changed

packages/opentelemetry-host-metrics/src/BaseMetrics.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import * as api from '@opentelemetry/api';
1818
import * as metrics from '@opentelemetry/sdk-metrics';
1919

20-
import { VERSION } from './version';
20+
import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
2121

2222
/**
2323
* Metrics Collector Configuration
@@ -33,7 +33,7 @@ export interface MetricsCollectorConfig {
3333
url?: string;
3434
}
3535

36-
const DEFAULT_NAME = '@opentelemetry/host-metrics';
36+
const DEFAULT_NAME = PACKAGE_NAME;
3737

3838
/**
3939
* Base Class for metrics
@@ -50,7 +50,7 @@ export abstract class BaseMetrics {
5050
if (!config.meterProvider) {
5151
this._logger.warn('No meter provider, using default');
5252
}
53-
this._meter = meterProvider.getMeter(this._name, VERSION);
53+
this._meter = meterProvider.getMeter(this._name, PACKAGE_VERSION);
5454
}
5555

5656
/**

packages/winston-transport/src/OpenTelemetryTransportV3.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
import { Logger, logs } from '@opentelemetry/api-logs';
1818
import TransportStream = require('winston-transport');
19-
import { VERSION } from './version';
19+
import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
2020
import { emitLogRecord } from './utils';
2121

2222
export class OpenTelemetryTransportV3 extends TransportStream {
2323
private _logger: Logger;
2424

2525
constructor(options?: TransportStream.TransportStreamOptions) {
2626
super(options);
27-
this._logger = logs.getLogger('@opentelemetry/winston-transport', VERSION);
27+
this._logger = logs.getLogger(PACKAGE_NAME, PACKAGE_VERSION);
2828
}
2929

3030
public override log(info: any, callback: () => void) {

plugins/node/instrumentation-amqplib/src/amqplib.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ import {
7272
normalizeExchange,
7373
unmarkConfirmChannelTracing,
7474
} from './utils';
75-
import { VERSION } from './version';
75+
import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
7676

7777
export class AmqplibInstrumentation extends InstrumentationBase {
7878
protected override _config!: AmqplibInstrumentationConfig;
7979

8080
constructor(config: AmqplibInstrumentationConfig = {}) {
8181
super(
82-
'@opentelemetry/instrumentation-amqplib',
83-
VERSION,
82+
PACKAGE_NAME,
83+
PACKAGE_VERSION,
8484
Object.assign({}, DEFAULT_CONFIG, config)
8585
);
8686
}

plugins/node/instrumentation-cucumber/src/instrumentation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import type {
3838
} from '@cucumber/cucumber/lib/support_code_library_builder/types';
3939

4040
import { AttributeNames, CucumberInstrumentationConfig } from './types';
41-
import { VERSION } from './version';
41+
import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
4242

4343
const hooks = ['Before', 'BeforeStep', 'AfterStep', 'After'] as const;
4444
const steps = ['Given', 'When', 'Then'] as const;
@@ -50,7 +50,7 @@ export class CucumberInstrumentation extends InstrumentationBase {
5050
private module: Cucumber | undefined;
5151

5252
constructor(config: CucumberInstrumentationConfig = {}) {
53-
super('@opentelemetry/instrumentation-cucumber', VERSION, config);
53+
super(PACKAGE_NAME, PACKAGE_VERSION, config);
5454
}
5555

5656
init(): InstrumentationNodeModuleDefinition[] {

plugins/node/instrumentation-dataloader/src/instrumentation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
SpanKind,
2828
} from '@opentelemetry/api';
2929
import { DataloaderInstrumentationConfig } from './types';
30-
import { VERSION } from './version';
30+
import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
3131
import type * as Dataloader from 'dataloader';
3232

3333
const MODULE_NAME = 'dataloader';
@@ -45,7 +45,7 @@ type LoadManyFn = (typeof Dataloader.prototype)['loadMany'];
4545

4646
export class DataloaderInstrumentation extends InstrumentationBase {
4747
constructor(config: DataloaderInstrumentationConfig = {}) {
48-
super('@opentelemetry/instrumentation-dataloader', VERSION, config);
48+
super(PACKAGE_NAME, PACKAGE_VERSION, config);
4949
}
5050

5151
protected init() {

plugins/node/instrumentation-fs/src/instrumentation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
InstrumentationNodeModuleDefinition,
2222
isWrapped,
2323
} from '@opentelemetry/instrumentation';
24-
import { VERSION } from './version';
24+
import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
2525
import {
2626
CALLBACK_FUNCTIONS,
2727
PROMISE_FUNCTIONS,
@@ -53,7 +53,7 @@ function patchedFunctionWithOriginalProperties<
5353

5454
export default class FsInstrumentation extends InstrumentationBase {
5555
constructor(config: FsInstrumentationConfig = {}) {
56-
super('@opentelemetry/instrumentation-fs', VERSION, config);
56+
super(PACKAGE_NAME, PACKAGE_VERSION, config);
5757
}
5858

5959
init(): (

plugins/node/instrumentation-kafkajs/src/instrumentation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import type {
4444
Consumer,
4545
} from 'kafkajs';
4646
import { KafkaJsInstrumentationConfig } from './types';
47-
import { VERSION } from './version';
47+
import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
4848
import { bufferTextMapGetter } from './propagator';
4949
import {
5050
InstrumentationBase,
@@ -57,7 +57,7 @@ export class KafkaJsInstrumentation extends InstrumentationBase {
5757
protected override _config!: KafkaJsInstrumentationConfig;
5858

5959
constructor(config: KafkaJsInstrumentationConfig = {}) {
60-
super('@opentelemetry/instrumentation-kafkajs', VERSION, config);
60+
super(PACKAGE_NAME, PACKAGE_VERSION, config);
6161
}
6262

6363
protected init() {

plugins/node/instrumentation-lru-memoizer/src/instrumentation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import {
2020
InstrumentationConfig,
2121
InstrumentationNodeModuleDefinition,
2222
} from '@opentelemetry/instrumentation';
23-
import { VERSION } from './version';
23+
import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
2424

2525
export default class LruMemoizerInstrumentation extends InstrumentationBase {
2626
constructor(config: InstrumentationConfig = {}) {
27-
super('@opentelemetry/instrumentation-lru-memoizer', VERSION, config);
27+
super(PACKAGE_NAME, PACKAGE_VERSION, config);
2828
}
2929

3030
init(): InstrumentationNodeModuleDefinition[] {

plugins/node/instrumentation-mongoose/src/mongoose.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
InstrumentationModuleDefinition,
2828
InstrumentationNodeModuleDefinition,
2929
} from '@opentelemetry/instrumentation';
30-
import { VERSION } from './version';
30+
import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
3131
import {
3232
SEMATTRS_DB_OPERATION,
3333
SEMATTRS_DB_STATEMENT,
@@ -61,7 +61,7 @@ export class MongooseInstrumentation extends InstrumentationBase {
6161
protected override _config!: MongooseInstrumentationConfig;
6262

6363
constructor(config: MongooseInstrumentationConfig = {}) {
64-
super('@opentelemetry/instrumentation-mongoose', VERSION, config);
64+
super(PACKAGE_NAME, PACKAGE_VERSION, config);
6565
}
6666

6767
override setConfig(config: MongooseInstrumentationConfig = {}) {

plugins/node/instrumentation-runtime-node/src/instrumentation.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const { eventLoopUtilization } = performance;
1818

1919
import { InstrumentationBase } from '@opentelemetry/instrumentation';
2020

21-
import { VERSION } from './version';
21+
import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
2222
import { RuntimeNodeInstrumentationConfig } from './types';
2323

2424
const ELUS_LENGTH = 2;
@@ -32,8 +32,8 @@ export class RuntimeNodeInstrumentation extends InstrumentationBase {
3232

3333
constructor(config: RuntimeNodeInstrumentationConfig = {}) {
3434
super(
35-
'@opentelemetry/instrumentation-runtime-node',
36-
VERSION,
35+
PACKAGE_NAME,
36+
PACKAGE_VERSION,
3737
Object.assign({}, DEFAULT_CONFIG, config)
3838
);
3939
}

0 commit comments

Comments
 (0)