Skip to content

Commit

Permalink
fix: dependencies warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
overbit committed Feb 29, 2024
1 parent b422716 commit cc53cbe
Show file tree
Hide file tree
Showing 14 changed files with 865 additions and 169 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ The setup consists of two main changes in the `main.ts` (to initialise the provi
// at the very top of the file
import { Tracing } from '@amplication/opentelemetry-nestjs';
import { ZipkinExporter } from '@opentelemetry/exporter-zipkin';
import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';

Tracing.init({
serviceName: 'my-service',
Expand Down Expand Up @@ -227,7 +227,7 @@ In an advanced use cases, you need to access the native OpenTelemetry Trace prov

```ts
import { Injectable } from '@nestjs/common';
import { Tracer } from '@opentelemetry/sdk-trace-base';
import { Tracer } from '@opentelemetry/sdk-trace-node';

@Injectable()
export class AppService {
Expand Down Expand Up @@ -377,7 +377,7 @@ import { Tracing } from '@amplication/opentelemetry-nestjs';
import { PrometheusExporter } from '@opentelemetry/exporter-prometheus';
import { PrometheusExporter } from '@opentelemetry/exporter-prometheus';
import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
import { CompositePropagator } from '@opentelemetry/core';
import { JaegerPropagator } from '@opentelemetry/propagator-jaeger';
import { B3InjectEncoding, B3Propagator } from '@opentelemetry/propagator-b3';
Expand Down Expand Up @@ -431,7 +431,7 @@ i.e.
import { Tracing } from '@amplication/opentelemetry-nestjs';
import { PrometheusExporter } from '@opentelemetry/exporter-prometheus';
import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
import { CompositePropagator } from '@opentelemetry/core';
import { AWSXRayPropagator } from '@opentelemetry/propagator-aws-xray';
import { AWSXRayIdGenerator } from '@opentelemetry/id-generator-aws-xray';
Expand Down Expand Up @@ -505,7 +505,7 @@ export class AppModule {}
// main.ts
// at the very top of the file
import { Tracing } from '@amplication/opentelemetry-nestjs';
import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';

Tracing.init({
serviceName: 'my-service',
Expand Down
990 changes: 845 additions & 145 deletions package-lock.json

Large diffs are not rendered by default.

12 changes: 4 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@amplication/opentelemetry-nestjs",
"version": "0.0.0-development",
"version": "5.0.0-beta.5",
"description": "OpenTelemetry module for Nestjs with auto instrumentation and resource detection. Initially forked from https://github.com/overbit/opentelemetry-nestjs.git",
"author": "Daniele Iasella <[email protected]>",
"license": "MIT",
Expand Down Expand Up @@ -43,12 +43,6 @@
"semantic-release": "semantic-release"
},
"dependencies": {
"@nestjs/event-emitter": "^2.0.4",
"@nestjs/graphql": "^12.1.1",
"@nestjs/microservices": "^10.3.3",
"@nestjs/platform-express": "^10.3.3",
"@nestjs/schedule": "^4.0.1",
"@nestjs/schematics": "^10.1.1",
"@opentelemetry/auto-instrumentations-node": "^0.41.1",
"@opentelemetry/context-async-hooks": "^1.21.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "^0.48.0",
Expand Down Expand Up @@ -93,6 +87,8 @@
"@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0",
"@nestjs/event-emitter": "^1.0.0 || ^2.0.0",
"@nestjs/microservices": "^8.0.0 || ^9.0.0 || ^10.0.0",
"@nestjs/graphql": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0"
"@nestjs/graphql": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
"@nestjs/platform-express": "^8.0.0 || ^9.0.0 || ^10.0.0",
"@nestjs/schedule": "^3.0.0 || ^4.0.1"
}
}
2 changes: 1 addition & 1 deletion src/OpenTelemetryModule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { OpenTelemetryModuleAsyncOption } from './OpenTelemetryModuleAsyncOption
import { DecoratorInjector } from './Trace/Injectors/DecoratorInjector';
import { ModuleRef } from '@nestjs/core';
import { EventEmitterModule } from '@nestjs/event-emitter';
import { Tracer } from '@opentelemetry/sdk-trace-base';
import { Tracer } from '@opentelemetry/sdk-trace-node';
import { OpenTelemetryModuleConfig } from './OpenTelemetryModuleConfig.interface';

export class OpenTelemetryModule {
Expand Down
2 changes: 1 addition & 1 deletion src/Trace/Injectors/BaseTraceInjector.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Test } from '@nestjs/testing';
import { Tracing } from '../../Tracing';
import { OpenTelemetryModule } from '../../OpenTelemetryModule';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-base';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-node';
import { Controller, Get, Injectable } from '@nestjs/common';
import { Span } from '../Decorators/Span';
import * as request from 'supertest';
Expand Down
2 changes: 1 addition & 1 deletion src/Trace/Injectors/ControllerInjector.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Test } from '@nestjs/testing';
import { Tracing } from '../../Tracing';
import { OpenTelemetryModule } from '../../OpenTelemetryModule';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-base';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-node';
import { Controller, ForbiddenException, Get } from '@nestjs/common';
import { Span } from '../Decorators/Span';
import * as request from 'supertest';
Expand Down
2 changes: 1 addition & 1 deletion src/Trace/Injectors/DecoratorInjector.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Test } from '@nestjs/testing';
import { OpenTelemetryModule } from '../../OpenTelemetryModule';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-base';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-node';
import { Controller, Get, Injectable } from '@nestjs/common';
import { Span } from '../Decorators/Span';
import * as request from 'supertest';
Expand Down
2 changes: 1 addition & 1 deletion src/Trace/Injectors/EventEmitterInjector.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Test } from '@nestjs/testing';
import { OpenTelemetryModule } from '../../OpenTelemetryModule';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-base';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-node';
import { Injectable } from '@nestjs/common';
import { Span } from '../Decorators/Span';
import { EventEmitterInjector } from './EventEmitterInjector';
Expand Down
2 changes: 1 addition & 1 deletion src/Trace/Injectors/GraphQLResolverInjector.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Test } from '@nestjs/testing';
import { OpenTelemetryModule } from '../../OpenTelemetryModule';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-base';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-node';
import { Injectable } from '@nestjs/common';
import { Constants } from '../../Constants';
import { Resolver, Query, Subscription, Mutation } from '@nestjs/graphql';
Expand Down
2 changes: 1 addition & 1 deletion src/Trace/Injectors/GuardInjector.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Test } from '@nestjs/testing';
import { OpenTelemetryModule } from '../../OpenTelemetryModule';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-base';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-node';
import { CanActivate, Controller, Get, UseGuards } from '@nestjs/common';
import * as request from 'supertest';
import { GuardInjector } from './GuardInjector';
Expand Down
2 changes: 1 addition & 1 deletion src/Trace/Injectors/PipeInjector.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Test } from '@nestjs/testing';
import { OpenTelemetryModule } from '../../OpenTelemetryModule';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-base';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-node';
import { Controller, Get, PipeTransform, UsePipes } from '@nestjs/common';
import { PipeInjector } from './PipeInjector';
import { PIPES_METADATA } from '@nestjs/common/constants';
Expand Down
2 changes: 1 addition & 1 deletion src/Trace/Injectors/SchedulerInjector.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Test } from '@nestjs/testing';
import { OpenTelemetryModule } from '../../OpenTelemetryModule';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-base';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-node';
import { Injectable } from '@nestjs/common';
import { Span } from '../Decorators/Span';
import { Cron, Interval, Timeout } from '@nestjs/schedule';
Expand Down
2 changes: 1 addition & 1 deletion src/Trace/NoopTraceExporter.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SpanExporter } from '@opentelemetry/sdk-trace-base';
import { SpanExporter } from '@opentelemetry/sdk-trace-node';

export class NoopTraceExporter implements SpanExporter {
export() {
Expand Down
2 changes: 1 addition & 1 deletion src/TracingConfigDefault.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
import { Resource } from '@opentelemetry/resources';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-base';
import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-node';
import {
CompositePropagator,
W3CTraceContextPropagator,
Expand Down

0 comments on commit cc53cbe

Please sign in to comment.