Skip to content

Commit 4fa7c13

Browse files
refactor(examples/opentelemetry-web): use new exported string constants for semconv (#4764)
* refactor(examples/opentelemetry-web): use new exported string constants for semconv * added changelog entry * deleted changelog extra line --------- Co-authored-by: Marc Pichler <[email protected]>
1 parent 812c774 commit 4fa7c13

File tree

7 files changed

+45
-6
lines changed

7 files changed

+45
-6
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
1616

1717
### :books: (Refine Doc)
1818

19+
* refactor(examples): added usage of @opentelemetry/semantic-conventions and @opentelemetry/resources to the examples in examples/opentelemetry-web for maintaining consistency across all examples. [#4764](https://github.com/open-telemetry/opentelemetry-js/pull/4764) @Zen-cronic
20+
1921
### :house: (Internal)
2022

2123
* refactor(context-zone-peer-dep): use explicit exports [#4785](https://github.com/open-telemetry/opentelemetry-js/pull/4787) @pichlermarc

examples/opentelemetry-web/examples/fetch-proto/index.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ const { ZoneContextManager } = require("@opentelemetry/context-zone");
66
const { B3Propagator } = require("@opentelemetry/propagator-b3");
77
const { registerInstrumentations } = require("@opentelemetry/instrumentation");
88
const { OTLPTraceExporter: OTLPTraceExporterProto } = require("@opentelemetry/exporter-trace-otlp-proto");
9+
const { Resource } = require("@opentelemetry/resources");
10+
const { SEMRESATTRS_SERVICE_NAME } = require("@opentelemetry/semantic-conventions");
911

10-
const provider = new WebTracerProvider();
12+
const provider = new WebTracerProvider({
13+
resource: new Resource({
14+
[SEMRESATTRS_SERVICE_NAME]: 'fetch-proto-web-service'
15+
})
16+
});
1117

1218
// Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests
1319
// to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the

examples/opentelemetry-web/examples/fetch/index.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ const { FetchInstrumentation } = require( '@opentelemetry/instrumentation-fetch'
66
const { ZoneContextManager } = require( '@opentelemetry/context-zone');
77
const { B3Propagator } = require( '@opentelemetry/propagator-b3');
88
const { registerInstrumentations } = require( '@opentelemetry/instrumentation');
9+
const { Resource } = require('@opentelemetry/resources');
10+
const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
911

10-
const provider = new WebTracerProvider();
12+
const provider = new WebTracerProvider({
13+
resource: new Resource({
14+
[SEMRESATTRS_SERVICE_NAME]: 'fetch-web-service'
15+
})
16+
});
1117

1218
// Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests
1319
// to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the

examples/opentelemetry-web/examples/fetchXhr/index.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ const { FetchInstrumentation } = require('@opentelemetry/instrumentation-fetch')
66
const { XMLHttpRequestInstrumentation } = require('@opentelemetry/instrumentation-xml-http-request');
77
const { ZoneContextManager } = require('@opentelemetry/context-zone');
88
const { registerInstrumentations } = require('@opentelemetry/instrumentation');
9+
const { Resource } = require('@opentelemetry/resources');
10+
const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
911

10-
const provider = new WebTracerProvider();
12+
const provider = new WebTracerProvider({
13+
resource: new Resource({
14+
[SEMRESATTRS_SERVICE_NAME]: 'fetch-xhr-web-service'
15+
})
16+
});
1117

1218
// Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests
1319
// to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the

examples/opentelemetry-web/examples/fetchXhrB3/index.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,14 @@ const { XMLHttpRequestInstrumentation } = require( '@opentelemetry/instrumentati
77
const { ZoneContextManager } = require( '@opentelemetry/context-zone');
88
const { B3Propagator } = require( '@opentelemetry/propagator-b3');
99
const { registerInstrumentations } = require( '@opentelemetry/instrumentation');
10+
const { Resource } = require('@opentelemetry/resources');
11+
const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
1012

11-
const provider = new WebTracerProvider();
13+
const provider = new WebTracerProvider({
14+
resource: new Resource({
15+
[SEMRESATTRS_SERVICE_NAME]: 'fetch-xhr-b3-web-service'
16+
})
17+
});
1218

1319
// Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests
1420
// to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the

examples/opentelemetry-web/examples/xml-http-request/index.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ const { ZoneContextManager } = require( '@opentelemetry/context-zone');
66
const { OTLPTraceExporter } = require( '@opentelemetry/exporter-trace-otlp-http');
77
const { B3Propagator } = require( '@opentelemetry/propagator-b3');
88
const { registerInstrumentations } = require( '@opentelemetry/instrumentation');
9+
const { Resource } = require('@opentelemetry/resources');
10+
const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
911

10-
const providerWithZone = new WebTracerProvider();
12+
const providerWithZone = new WebTracerProvider({
13+
resource: new Resource({
14+
[SEMRESATTRS_SERVICE_NAME]: 'xml-http-web-service'
15+
})
16+
});
1117

1218
// Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests
1319
// to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the

examples/opentelemetry-web/examples/zipkin/index.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
const { ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
22
const { WebTracerProvider } = require('@opentelemetry/sdk-trace-web');
33
const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
4+
const { Resource } = require('@opentelemetry/resources');
5+
const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
6+
7+
const provider = new WebTracerProvider({
8+
resource: new Resource({
9+
[SEMRESATTRS_SERVICE_NAME]: 'zipkin-web-service'
10+
})
11+
});
412

5-
const provider = new WebTracerProvider();
613
provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
714
provider.addSpanProcessor(new SimpleSpanProcessor(new ZipkinExporter({
815
// testing interceptor

0 commit comments

Comments
 (0)