Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: generalize the instrumentation file name #479

Merged
merged 2 commits into from
May 17, 2021
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
* limitations under the License.
*/

export * from './aws-lambda';
export * from './instrumentation';
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import * as path from 'path';

import { AwsLambdaInstrumentation } from '../../src/index';
import { AwsLambdaInstrumentation } from '../../src';
import {
BatchSpanProcessor,
InMemorySpanExporter,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
* limitations under the License.
*/

export * from './bunyan';
export * from './instrumentation';
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import * as assert from 'assert';
import * as Logger from 'bunyan';
import * as sinon from 'sinon';
import { Writable } from 'stream';
import { BunyanInstrumentation } from '../src/bunyan';
import { BunyanInstrumentation } from '../src';

const memoryExporter = new InMemorySpanExporter();
const provider = new NodeTracerProvider();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
* limitations under the License.
*/

export * from './dns';
export * from './instrumentation';
export { DnsInstrumentationConfig } from './types';
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
} from '@opentelemetry/tracing';
import * as assert from 'assert';
import { NodeTracerProvider } from '@opentelemetry/node';
import { DnsInstrumentation } from '../../src/dns';
import { DnsInstrumentation } from '../../src';
import * as Sinon from 'sinon';
import * as dns from 'dns';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
} from '@opentelemetry/tracing';
import * as assert from 'assert';
import { NodeTracerProvider } from '@opentelemetry/node';
import { DnsInstrumentation } from '../../src/dns';
import { DnsInstrumentation } from '../../src';
import * as dns from 'dns';
import * as utils from '../utils/utils';
import { assertSpan } from '../utils/assertSpan';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
} from '@opentelemetry/tracing';
import * as assert from 'assert';
import { NodeTracerProvider } from '@opentelemetry/node';
import { DnsInstrumentation } from '../../src/dns';
import { DnsInstrumentation } from '../../src';
import * as dns from 'dns';
import * as utils from '../utils/utils';
import { assertSpan } from '../utils/assertSpan';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
* limitations under the License.
*/

export * from './express';
export * from './instrumentation';
export { ExpressLayerType } from './enums/ExpressLayerType';
export { ExpressInstrumentationConfig } from './types';
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { kLayerPatched } from './express';
import { kLayerPatched } from './';
import { Request } from 'express';
import { SpanAttributes, Span } from '@opentelemetry/api';
import { InstrumentationConfig } from '@opentelemetry/instrumentation';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
* limitations under the License.
*/

export * from './graphql';
export * from './instrumentation';
export { GraphQLInstrumentationConfig } from './types';
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
* limitations under the License.
*/

export * from './hapi';
export * from './instrumentation';
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
* limitations under the License.
*/

export * from './ioredis';
export * from './instrumentation';
export { IORedisInstrumentationConfig } from './types';
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
IORedisInstrumentationConfig,
DbStatementSerializer,
} from './types';
import { IORedisInstrumentation } from './ioredis';
import { IORedisInstrumentation } from './';
import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
import { safeExecuteInTheMiddle } from '@opentelemetry/instrumentation';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
* limitations under the License.
*/

export * from './koa';
export * from './instrumentation';
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
* limitations under the License.
*/

export * from './mongodb';
export * from './instrumentation';
export { MongoDBInstrumentationConfig } from './types';
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
* limitations under the License.
*/

export * from './mysql';
export * from './instrumentation';
export { MySQLInstrumentationConfig } from './types';
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
* limitations under the License.
*/

export * from './net';
export * from './instrumentation';
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
import { NodeTracerProvider } from '@opentelemetry/node';
import * as net from 'net';
import * as assert from 'assert';
import { NetInstrumentation } from '../src/net';
import { NetInstrumentation } from '../src';
import { SocketEvent } from '../src/types';
import { assertIpcSpan, assertTcpSpan, IPC_PATH, HOST, PORT } from './utils';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
import { isWrapped } from '@opentelemetry/instrumentation';
import * as assert from 'assert';
import { NodeTracerProvider } from '@opentelemetry/node';
import { NetInstrumentation } from '../src/net';
import { NetInstrumentation } from '../src';
import * as Sinon from 'sinon';
import * as net from 'net';
import { HOST, PORT } from './utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
import { NodeTracerProvider } from '@opentelemetry/node';
import * as assert from 'assert';
import * as tls from 'tls';
import { NetInstrumentation } from '../src/net';
import { NetInstrumentation } from '../src';
import { SocketEvent } from '../src/types';
import {
assertTLSSpan,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
* limitations under the License.
*/

export * from './pg';
export * from './instrumentation';
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
PgPoolExtended,
} from './types';
import * as pgTypes from 'pg';
import { PgInstrumentation, PgInstrumentationConfig } from './pg';
import { PgInstrumentation, PgInstrumentationConfig } from './';

function arrayStringifyHelper(arr: Array<unknown>): string {
return '[' + arr.toString() + ']';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
* limitations under the License.
*/

export * from './pino';
export * from './instrumentation';
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import * as assert from 'assert';
import * as sinon from 'sinon';
import type * as Pino from 'pino';

import { PinoInstrumentation } from '../src/pino';
import { PinoInstrumentation } from '../src';

const memoryExporter = new InMemorySpanExporter();
const provider = new NodeTracerProvider();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
* limitations under the License.
*/

export * from './redis';
export * from './instrumentation';
export { RedisInstrumentationConfig } from './types';
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
} from '@opentelemetry/api';
import { RedisCommand, RedisPluginClientTypes } from './types';
import { EventEmitter } from 'events';
import { RedisInstrumentation } from './redis';
import { RedisInstrumentation } from './';
import { SemanticAttributes } from '@opentelemetry/semantic-conventions';

const endSpan = (span: Span, err?: Error | null) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
* limitations under the License.
*/

export * from './winston';
export * from './instrumentation';
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import * as sinon from 'sinon';
import { Writable } from 'stream';
import type * as Winston from 'winston';
import type { Winston3Logger } from '../src/types';
import { WinstonInstrumentation } from '../src/winston';
import { WinstonInstrumentation } from '../src';

const memoryExporter = new InMemorySpanExporter();
const provider = new NodeTracerProvider();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
* limitations under the License.
*/

export * from './documentLoad';
export * from './instrumentation';
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
* limitations under the License.
*/

export * from './userInteraction';
export * from './instrumentation';