chore: Update all deprecations in tracer.ts

Jaeger accepts OTLP now, so the OtlpTraceExporter just works
open-telemetry · Dec 1, 2023 · aaab655 · aaab655
1 parent ed34f5c
commit aaab655
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/plugins/node/opentelemetry-instrumentation-express/examples/package.json b/plugins/node/opentelemetry-instrumentation-express/examples/package.json
@@ -31,6 +31,7 @@
   "dependencies": {
     "@opentelemetry/api": "^1.7.0",
     "@opentelemetry/exporter-jaeger": "^1.18.1",
+    "@opentelemetry/exporter-trace-otlp-proto": "^0.45.1",
     "@opentelemetry/exporter-zipkin": "^1.18.1",
     "@opentelemetry/instrumentation": "^0.45.1",
     "@opentelemetry/instrumentation-express": "^0.33.3",

diff --git a/plugins/node/opentelemetry-instrumentation-express/examples/src/tracer.ts b/plugins/node/opentelemetry-instrumentation-express/examples/src/tracer.ts
@@ -1,24 +1,22 @@
 'use strict';
 
-import { Sampler, SpanKind } from "@opentelemetry/api";
+import { SpanKind, Attributes } from "@opentelemetry/api";
 
 const opentelemetry = require('@opentelemetry/api');
 
 // Not functionally required but gives some insight what happens behind the scenes
 const { diag, DiagConsoleLogger, DiagLogLevel } = opentelemetry;
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
 
-import { AlwaysOnSampler } from '@opentelemetry/core';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
-import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
-import { JaegerExporter } from '@opentelemetry/exporter-jaeger';
+import { Sampler, AlwaysOnSampler, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
+import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
 import { ZipkinExporter } from '@opentelemetry/exporter-zipkin';
 import { Resource } from '@opentelemetry/resources';
 import { SemanticAttributes, SemanticResourceAttributes as ResourceAttributesSC } from '@opentelemetry/semantic-conventions';
-import { SpanAttributes } from "@opentelemetry/api/build/src/trace/attributes";
 
-const Exporter = (process.env.EXPORTER || '').toLowerCase().startsWith('z') ? ZipkinExporter : JaegerExporter;
+const Exporter = (process.env.EXPORTER || '').toLowerCase().startsWith('z') ? ZipkinExporter : OTLPTraceExporter;
 import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
 const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
 
@@ -50,7 +48,7 @@ export const setupTracing = (serviceName: string) => {
   return opentelemetry.trace.getTracer(serviceName);
 };
 
-type FilterFunction = (spanName: string, spanKind: SpanKind, attributes: SpanAttributes) => boolean;
+type FilterFunction = (spanName: string, spanKind: SpanKind, attributes: Attributes) => boolean;
 
 function filterSampler(filterFn: FilterFunction, parent: Sampler): Sampler {
   return {
@@ -66,6 +64,6 @@ function filterSampler(filterFn: FilterFunction, parent: Sampler): Sampler {
   }
 }
 
-function ignoreHealthCheck(spanName: string, spanKind: SpanKind, attributes: SpanAttributes) {
+function ignoreHealthCheck(spanName: string, spanKind: SpanKind, attributes: Attributes) {
   return spanKind !== opentelemetry.SpanKind.SERVER || attributes[SemanticAttributes.HTTP_ROUTE] !== "/health";
 }