Skip to content

Commit 38c9b24

Browse files
OmkarKirpanOmkarKirpan
committed
chore: update all examples
1 parent 9087e7e commit 38c9b24

File tree

15 files changed

+79
-43
lines changed

15 files changed

+79
-43
lines changed

‎examples/basic-tracer-node/index.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
'use strict';
22

33
const opentelemetry = require('@opentelemetry/api');
4+
const { Resource } = require('@opentelemetry/resources');
5+
const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
46
const { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/tracing');
57
const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
68

7-
const provider = new BasicTracerProvider();
9+
const provider = new BasicTracerProvider({
10+
resource: new Resource({
11+
[ResourceAttributes.SERVICE_NAME]: 'basic-service',
12+
}),
13+
});
814

915
// Configure span processor to send spans to the exporter
1016
const exporter = new JaegerExporter({
11-
serviceName: 'basic-service',
1217
endpoint: 'http://localhost:14268/api/traces',
1318
});
1419
provider.addSpanProcessor(new SimpleSpanProcessor(exporter));

‎examples/collector-exporter-node/metrics.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,22 @@ const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector')
55
// const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector-grpc');
66
// const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector-proto');
77
const { MeterProvider } = require('@opentelemetry/metrics');
8+
const { Resource } = require('@opentelemetry/resources');
9+
const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
810

911
// Optional and only needed to see the internal diagnostic logging (during development)
1012
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);
1113

1214
const metricExporter = new CollectorMetricExporter({
13-
serviceName: 'basic-metric-service',
1415
// url: 'http://localhost:55681/v1/metrics',
1516
});
1617

1718
const meter = new MeterProvider({
1819
exporter: metricExporter,
1920
interval: 1000,
21+
resource: new Resource({
22+
[ResourceAttributes.SERVICE_NAME]: 'basic-metric-service',
23+
}),
2024
}).getMeter('example-exporter-collector');
2125

2226
const requestCounter = meter.createCounter('requests', {

‎examples/collector-exporter-node/tracing.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
const opentelemetry = require('@opentelemetry/api');
44
const { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/tracing');
55
const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector');
6+
import { Resource } from '@opentelemetry/resources';
7+
import { ResourceAttributes } from '@opentelemetry/semantic-conventions';
68
// const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector-grpc');
79
// const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector-proto');
810

@@ -12,13 +14,16 @@ const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector');
1214
// );
1315

1416
const exporter = new CollectorTraceExporter({
15-
serviceName: 'basic-service',
1617
// headers: {
1718
// foo: 'bar'
1819
// },
1920
});
2021

21-
const provider = new BasicTracerProvider();
22+
const provider = new BasicTracerProvider({
23+
resource: new Resource({
24+
[ResourceAttributes.SERVICE_NAME]: 'basic-service',
25+
}),
26+
});
2227
provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
2328
provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
2429
provider.register();

‎examples/grpc-js/tracer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
const opentelemetry = require('@opentelemetry/api');
44
const { registerInstrumentations } = require('@opentelemetry/instrumentation');
55
const { NodeTracerProvider } = require('@opentelemetry/node');
6+
const { Resource } = require('@opentelemetry/resources');
7+
const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
68
const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
79
const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
810
const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
911
const { GrpcInstrumentation } = require('@opentelemetry/instrumentation-grpc');
10-
const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
11-
const { Resource } = require('@opentelemetry/resources');
1212

1313
const EXPORTER = process.env.EXPORTER || '';
1414

‎examples/grpc/tracer.js

+9-7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
const opentelemetry = require('@opentelemetry/api');
44
const { registerInstrumentations } = require('@opentelemetry/instrumentation');
55
const { NodeTracerProvider } = require('@opentelemetry/node');
6+
const { Resource } = require('@opentelemetry/resources');
7+
const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
68
const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
79
const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
810
const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
@@ -11,17 +13,17 @@ const { GrpcInstrumentation } = require('@opentelemetry/instrumentation-grpc');
1113
const EXPORTER = process.env.EXPORTER || '';
1214

1315
module.exports = (serviceName) => {
14-
const provider = new NodeTracerProvider();
16+
const provider = new NodeTracerProvider({
17+
resource: new Resource({
18+
[ResourceAttributes.SERVICE_NAME]: serviceName,
19+
}),
20+
});
1521

1622
let exporter;
1723
if (EXPORTER.toLowerCase().startsWith('z')) {
18-
exporter = new ZipkinExporter({
19-
serviceName,
20-
});
24+
exporter = new ZipkinExporter();
2125
} else {
22-
exporter = new JaegerExporter({
23-
serviceName,
24-
});
26+
exporter = new JaegerExporter();
2527
}
2628

2729
provider.addSpanProcessor(new SimpleSpanProcessor(exporter));

‎examples/http/tracer.js

+9-7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
const opentelemetry = require('@opentelemetry/api');
44
const { registerInstrumentations } = require('@opentelemetry/instrumentation');
55
const { NodeTracerProvider } = require('@opentelemetry/node');
6+
const { Resource } = require('@opentelemetry/resources');
7+
const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
68
const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
79
const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
810
const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
@@ -11,17 +13,17 @@ const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
1113
const EXPORTER = process.env.EXPORTER || '';
1214

1315
module.exports = (serviceName) => {
14-
const provider = new NodeTracerProvider();
16+
const provider = new NodeTracerProvider({
17+
resource: new Resource({
18+
[ResourceAttributes.SERVICE_NAME]: serviceName,
19+
}),
20+
});
1521

1622
let exporter;
1723
if (EXPORTER.toLowerCase().startsWith('z')) {
18-
exporter = new ZipkinExporter({
19-
serviceName,
20-
});
24+
exporter = new ZipkinExporter();
2125
} else {
22-
exporter = new JaegerExporter({
23-
serviceName,
24-
});
26+
exporter = new JaegerExporter();
2527
}
2628

2729
provider.addSpanProcessor(new SimpleSpanProcessor(exporter));

‎examples/https/tracer.js

+9-7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
const opentelemetry = require('@opentelemetry/api');
44
const { registerInstrumentations } = require('@opentelemetry/instrumentation');
55
const { NodeTracerProvider } = require('@opentelemetry/node');
6+
const { Resource } = require('@opentelemetry/resources');
7+
const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
68
const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
79
const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
810
const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
@@ -13,16 +15,16 @@ process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
1315

1416
module.exports = (serviceName) => {
1517
let exporter;
16-
const provider = new NodeTracerProvider();
18+
const provider = new NodeTracerProvider({
19+
resource: new Resource({
20+
[ResourceAttributes.SERVICE_NAME]: serviceName,
21+
}),
22+
});
1723

1824
if (EXPORTER.toLowerCase().startsWith('z')) {
19-
exporter = new ZipkinExporter({
20-
serviceName,
21-
});
25+
exporter = new ZipkinExporter();
2226
} else {
23-
exporter = new JaegerExporter({
24-
serviceName,
25-
});
27+
exporter = new JaegerExporter();
2628
}
2729

2830
provider.addSpanProcessor(new SimpleSpanProcessor(exporter));

‎examples/tracer-web/examples/metrics/index.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
const { DiagConsoleLogger, DiagLogLevel, diag } = require('@opentelemetry/api');
44
const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector');
55
const { MeterProvider } = require('@opentelemetry/metrics');
6+
const { Resource } = require('@opentelemetry/resources');
7+
const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
68

79
// Optional and only needed to see the internal diagnostic logging (during development)
810
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);
911

10-
const metricExporter = new CollectorMetricExporter({
11-
serviceName: 'basic-metric-service',
12-
});
12+
const metricExporter = new CollectorMetricExporter();
1313

1414
let interval;
1515
let meter;
@@ -25,6 +25,9 @@ function startMetrics() {
2525
meter = new MeterProvider({
2626
exporter: metricExporter,
2727
interval: 1000,
28+
resource: new Resource({
29+
[ResourceAttributes.SERVICE_NAME]: 'basic-metric-service',
30+
}),
2831
}).getMeter('example-exporter-collector');
2932

3033
const requestCounter = meter.createCounter('requests', {

‎getting-started/README.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,25 @@ After you install these dependencies, initialize and register them. Modify `trac
125125

126126
const { diag, DiagConsoleLogger, DiagLogLevel } = require("@opentelemetry/api");
127127
const { NodeTracerProvider } = require("@opentelemetry/node");
128+
const { Resource } = require('@opentelemetry/resources');
129+
const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
128130
const { SimpleSpanProcessor } = require("@opentelemetry/tracing");
129131
const { ZipkinExporter } = require("@opentelemetry/exporter-zipkin");
130132
const { registerInstrumentations } = require("@opentelemetry/instrumentation");
131133
const { HttpInstrumentation } = require("@opentelemetry/instrumentation-http");
132134
const { GrpcInstrumentation } = require("@opentelemetry/instrumentation-grpc");
133135

134-
const provider = new NodeTracerProvider();
136+
const provider = new NodeTracerProvider({
137+
resource: new Resource({
138+
[ResourceAttributes.SERVICE_NAME]: "getting-started",
139+
})
140+
});
135141

136142
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ALL);
137143

138144
provider.addSpanProcessor(
139145
new SimpleSpanProcessor(
140146
new ZipkinExporter({
141-
serviceName: "getting-started",
142147
// If you are running your tracing backend on another host,
143148
// you can point to it using the `url` parameter of the
144149
// exporter config.

‎getting-started/traced-example/tracing.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,22 @@
22

33
const { NodeTracerProvider } = require("@opentelemetry/node");
44
const { SimpleSpanProcessor } = require("@opentelemetry/tracing");
5+
const { Resource } = require('@opentelemetry/resources');
6+
const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
57
const { ZipkinExporter } = require("@opentelemetry/exporter-zipkin");
68
const { registerInstrumentations } = require('@opentelemetry/instrumentation');
79
const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express');
810
const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
911

10-
const provider = new NodeTracerProvider();
12+
const provider = new NodeTracerProvider({
13+
resource: new Resource({
14+
[ResourceAttributes.SERVICE_NAME]: "getting-started",
15+
})
16+
});
1117

1218
provider.addSpanProcessor(
1319
new SimpleSpanProcessor(
1420
new ZipkinExporter({
15-
serviceName: "getting-started"
1621
// If you are running your tracing backend on another host,
1722
// you can point to it using the `url` parameter of the
1823
// exporter config.

‎getting-started/ts-example/README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,16 @@ import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
134134

135135
const provider: NodeTracerProvider = new NodeTracerProvider({
136136
logLevel: LogLevel.ERROR,
137+
resource: new Resource({
138+
[ResourceAttributes.SERVICE_NAME]: 'getting-started',
139+
}),
137140
});
138141

139142
provider.addSpanProcessor(
140143
new SimpleSpanProcessor(
141144
new ZipkinExporter({
142145
// For Jaeger, use the following line instead:
143146
// new JaegerExporter({
144-
serviceName: 'getting-started',
145147
// If you are running your tracing backend on another host,
146148
// you can point to it using the `url` parameter of the
147149
// exporter config.

‎getting-started/ts-example/traced-example/tracing.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import { NodeTracerProvider } from '@opentelemetry/node';
2+
const { Resource } = require('@opentelemetry/resources');
3+
const { ResourceAttributes } = require('@opentelemetry/semantic-conventions');
24

35
import { SimpleSpanProcessor } from '@opentelemetry/tracing';
46
import { ZipkinExporter } from '@opentelemetry/exporter-zipkin';
@@ -9,13 +11,16 @@ const { registerInstrumentations } = require('@opentelemetry/instrumentation');
911
const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express');
1012
const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
1113

12-
const provider: NodeTracerProvider = new NodeTracerProvider();
14+
const provider: NodeTracerProvider = new NodeTracerProvider({
15+
resource: new Resource({
16+
[ResourceAttributes.SERVICE_NAME]: 'getting-started',
17+
}),
18+
});
1319
provider.addSpanProcessor(
1420
new SimpleSpanProcessor(
1521
new ZipkinExporter({
1622
// For Jaeger, use the following line instead:
1723
// new JaegerExporter({
18-
serviceName: 'getting-started',
1924
// If you are running your tracing backend on another host,
2025
// you can point to it using the `url` parameter of the
2126
// exporter config.

‎packages/opentelemetry-exporter-jaeger/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ set, the value set by the option in code is authoritative.
6464
import { JaegerExporter } from '@opentelemetry/exporter-jaeger';
6565

6666
const options = {
67-
serviceName: 'my-service',
6867
tags: [], // optional
6968
// You can use the default UDPSender
7069
host: 'localhost', // optional

‎packages/opentelemetry-exporter-zipkin/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ const options = {
3030
'my-header': 'header-value',
3131
},
3232
url: 'your-zipkin-url',
33-
serviceName: 'your-application-name',
3433
// optional interceptor
3534
getExportRequestHeaders: () => {
3635
return {

‎packages/opentelemetry-sdk-node/README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ const {
4545
getNodeAutoInstrumentations,
4646
} = require("@opentelemetry/auto-instrumentations-node");
4747

48-
const jaegerExporter = new JaegerExporter({
49-
serviceName: 'my-service',
50-
});
48+
const jaegerExporter = new JaegerExporter();
5149
const prometheusExporter = new PrometheusExporter({ startServer: true });
5250

5351
const sdk = new opentelemetry.NodeSDK({

0 commit comments

Comments
 (0)