Merge branch 'main' into web-sdk

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -45,14 +45,14 @@ body:
  const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node');
  const { ConsoleSpanExporter } = require('@opentelemetry/sdk-trace-base');
  const { Resource } = require('@opentelemetry/resources');
- const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
+ const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
 
  // configure the SDK to export telemetry data to the console
  // enable all auto-instrumentations from the meta package
  const traceExporter = new ConsoleSpanExporter();
  const sdk = new opentelemetry.NodeSDK({
  resource: new Resource({
- [SemanticResourceAttributes.SERVICE_NAME]: 'my-service',
+ [SEMRESATTRS_SERVICE_NAME]: 'my-service',
  }),
  traceExporter,
  instrumentations: [getNodeAutoInstrumentations()]

CHANGELOG.md

@@ -18,6 +18,17 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :house: (Internal)
 
+## 1.25.1
+
+### :books: (Refine Doc)
+
+* 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:/open-telemetry/opentelemetry-js/pull/4764) @Zen-cronic
+
+### :house: (Internal)
+
+* refactor(context-zone-peer-dep): use explicit exports [#4785](https:/open-telemetry/opentelemetry-js/pull/4787) @pichlermarc
+* refactor(context-async-hooks): use explicit exports [#4785](https:/open-telemetry/opentelemetry-js/pull/4786) @pichlermarc
+
 ## 1.25.0
 
 ### :rocket: (Enhancement)

README.md

@@ -69,14 +69,14 @@ const opentelemetry = require('@opentelemetry/sdk-node');
 const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node');
 const { ConsoleSpanExporter } = require('@opentelemetry/sdk-trace-base');
 const { Resource } = require('@opentelemetry/resources');
-const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
 
 // configure the SDK to export telemetry data to the console
 // enable all auto-instrumentations from the meta package
 const traceExporter = new ConsoleSpanExporter();
 const sdk = new opentelemetry.NodeSDK({
  resource: new Resource({
- [SemanticResourceAttributes.SERVICE_NAME]: 'my-service',
+ [SEMRESATTRS_SERVICE_NAME]: 'my-service',
  }),
  traceExporter,
  instrumentations: [getNodeAutoInstrumentations()]

examples/esm-http-ts/package.json

@@ -1,7 +1,7 @@
 {
  "name": "esm-http-ts",
  "private": true,
- "version": "0.52.0",
+ "version": "0.52.1",
  "description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript",
  "main": "build/index.js",
  "type": "module",
@@ -32,12 +32,12 @@
  "homepage": "https:/open-telemetry/opentelemetry-js/tree/main/examples/",
  "dependencies": {
  "@opentelemetry/api": "1.9.0",
- "@opentelemetry/exporter-trace-otlp-proto": "0.52.0",
- "@opentelemetry/instrumentation": "0.52.0",
- "@opentelemetry/instrumentation-http": "0.52.0",
- "@opentelemetry/resources": "1.25.0",
- "@opentelemetry/sdk-trace-base": "1.25.0",
- "@opentelemetry/sdk-trace-node": "1.25.0",
- "@opentelemetry/semantic-conventions": "1.25.0"
+ "@opentelemetry/exporter-trace-otlp-proto": "0.52.1",
+ "@opentelemetry/instrumentation": "0.52.1",
+ "@opentelemetry/instrumentation-http": "0.52.1",
+ "@opentelemetry/resources": "1.25.1",
+ "@opentelemetry/sdk-trace-base": "1.25.1",
+ "@opentelemetry/sdk-trace-node": "1.25.1",
+ "@opentelemetry/semantic-conventions": "1.25.1"
  }
 }

examples/http/package.json

@@ -1,7 +1,7 @@
 {
  "name": "http-example",
  "private": true,
- "version": "0.52.0",
+ "version": "0.52.1",
  "description": "Example of HTTP integration with OpenTelemetry",
  "main": "index.js",
  "scripts": {
@@ -30,14 +30,14 @@
  },
  "dependencies": {
  "@opentelemetry/api": "^1.3.0",
- "@opentelemetry/exporter-jaeger": "1.25.0",
- "@opentelemetry/exporter-zipkin": "1.25.0",
- "@opentelemetry/instrumentation": "0.52.0",
- "@opentelemetry/instrumentation-http": "0.52.0",
- "@opentelemetry/resources": "1.25.0",
- "@opentelemetry/sdk-trace-base": "1.25.0",
- "@opentelemetry/sdk-trace-node": "1.25.0",
- "@opentelemetry/semantic-conventions": "1.25.0"
+ "@opentelemetry/exporter-jaeger": "1.25.1",
+ "@opentelemetry/exporter-zipkin": "1.25.1",
+ "@opentelemetry/instrumentation": "0.52.1",
+ "@opentelemetry/instrumentation-http": "0.52.1",
+ "@opentelemetry/resources": "1.25.1",
+ "@opentelemetry/sdk-trace-base": "1.25.1",
+ "@opentelemetry/sdk-trace-node": "1.25.1",
+ "@opentelemetry/semantic-conventions": "1.25.1"
  },
  "homepage": "https:/open-telemetry/opentelemetry-js/tree/main/examples/http",
  "devDependencies": {

examples/https/package.json

@@ -1,7 +1,7 @@
 {
  "name": "https-example",
  "private": true,
- "version": "0.52.0",
+ "version": "0.52.1",
  "description": "Example of HTTPs integration with OpenTelemetry",
  "main": "build/src/index.js",
  "types": "build/src/index.d.ts",
@@ -34,14 +34,14 @@
  },
  "dependencies": {
  "@opentelemetry/api": "^1.0.0",
- "@opentelemetry/exporter-jaeger": "1.25.0",
- "@opentelemetry/exporter-zipkin": "1.25.0",
- "@opentelemetry/instrumentation": "0.52.0",
- "@opentelemetry/instrumentation-http": "0.52.0",
- "@opentelemetry/resources": "1.25.0",
- "@opentelemetry/sdk-trace-base": "1.25.0",
- "@opentelemetry/sdk-trace-node": "1.25.0",
- "@opentelemetry/semantic-conventions": "1.25.0"
+ "@opentelemetry/exporter-jaeger": "1.25.1",
+ "@opentelemetry/exporter-zipkin": "1.25.1",
+ "@opentelemetry/instrumentation": "0.52.1",
+ "@opentelemetry/instrumentation-http": "0.52.1",
+ "@opentelemetry/resources": "1.25.1",
+ "@opentelemetry/sdk-trace-base": "1.25.1",
+ "@opentelemetry/sdk-trace-node": "1.25.1",
+ "@opentelemetry/semantic-conventions": "1.25.1"
  },
  "homepage": "https:/open-telemetry/opentelemetry-js/tree/main/examples/https",
  "devDependencies": {

examples/https/server-cert.pem

@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDozCCAougAwIBAgIUZdBdHwmbcYbMUvOesYRyYlg11JMwDQYJKoZIhvcNAQEL
+MIIDozCCAougAwIBAgIUNmVva8tI/hqzZAB7FZzPmNr/Q0owDQYJKoZIhvcNAQEL
 BQAwYTELMAkGA1UEBhMCQ0wxCzAJBgNVBAgMAlJNMRowGAYDVQQHDBFPcGVuVGVs
 ZW1ldHJ5VGVzdDENMAsGA1UECgwEUm9vdDENMAsGA1UECwwEVGVzdDELMAkGA1UE
-AwwCY2EwHhcNMjEwNjA4MDgxNTE2WhcNMzEwNjA2MDgxNTE2WjBhMQswCQYDVQQG
+AwwCY2EwHhcNMjQwNjA4MTkxODUyWhcNMzQwNjA2MTkxODUyWjBhMQswCQYDVQQG
 EwJDTDELMAkGA1UECAwCUk0xGjAYBgNVBAcMEU9wZW5UZWxlbWV0cnlUZXN0MQ0w
 CwYDVQQKDARSb290MQ0wCwYDVQQLDARUZXN0MQswCQYDVQQDDAJjYTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALw9Shaqp1O1zgYK8z5pnvuHK3o9cUNT
-+EJz5KLADn11HSgfj5S96s6lDP9mUy8oDXdk9zSH8QsPp/maVh0AM1WrPDDTBJT5
-vdPyUezzn4wvBrJSG/mmy/p4QU1srmE0ueuhgot97GZa9qu+gOqGei3YTjrbx14H
-jyvexx+QhqrpUg46qAm67pJHC5jN6LmufoIvepyvQCEbKN+n2B2tAn9on1wo7UmB
-igTEiWxk1Gn70IJuyTEbpHoLFviQ5kvTYXM/2KHMOXjZM9fQxtbseNUmj8VK3+tS
-5jBdIROZxKxh3r9rV7SBHrblTWB3CZ/NsJblZuzMazLWkYS1/JZud9ECAwEAAaNT
-MFEwHQYDVR0OBBYEFP6+DMoQBCg7tOYrSUpWKQrbfJ5yMB8GA1UdIwQYMBaAFP6+
-DMoQBCg7tOYrSUpWKQrbfJ5yMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
-BQADggEBAGbkwraWuKnhcE8GrLCO0qLq5GaF+WvxqVzgPvG3G6bQJuEnS6LT65nR
-ICU82vCQBikW6lDfpsiwcVqOmgefUmjI99Aw5S1dkYy2J+WZrU/EgX445JLGJMpB
-Bh0QajFT6gdQiuURqTmxAhNj4VrUqtrNapP8vFKerR7nTrORG0ELEcvzVYCLNvDm
-OYWvLEMZifNWKY6hRdhZXho5hfu7/YPUhZUpcSxkTUsDnG3gzkTyX1TzeWe7wlJr
-dtNIk50lUCR6TlSpTaVB+6uhVjaLZpZwBAT5H0dWQXm0Ww5AYsEAT9Uzh9fZYu4m
-iMhztKH3PWjDB+jSzcOv9FXeYWgprWk=
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM80Psz6Kc4/x1Qx4OmYuacrCDL4JNY+
+SWzEm1kb25/E1+TrxYC8XluJtXwi9JRC7ovR8UIbZNVgWwPHlSXrTQsVe2sISr4K
+oRg87vmcRYzsOval+ZViFelUo9t5sYeiX0xBuMP1ENfEL+gtu2QrkmgDhy/XdRpm
+qpcrtJxXaIXedy82y7Av5da7jJyJ+9oaTq0Am0qyZjpzTs3jKEh1roWoc3pd6T4d
+asNHLeKrsq3bTasEH/Lo9k4t+2n1j5C+L5gWhPcCv8yzhGsrSiqxn+P9m/USXY/w
+HH9AyV7Dk4Jh8BjUOlYaqOLIEow7hwdxVBk1BO6Jmpxv8KI3qQjtLWsCAwEAAaNT
+MFEwHQYDVR0OBBYEFOueTx80MsHFiBvP0RO99CpVdj0ZMB8GA1UdIwQYMBaAFOue
+Tx80MsHFiBvP0RO99CpVdj0ZMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+BQADggEBAJYqqU3wCDX+YZDZ4zd8k725MSfKk1omCxDzDzjuNAjqD/vuSE0YfdFB
+bTWMiBGsCqa6FgWwyT2oMPnJKShScZReFEZcM2s+/odfwUTwF4lD/UvZf6PdDhJ5
+kxqhoej2ZT8NY+m+rddmg5MaurIcIfOhOxRjarmhs2lrg5qmGKznauettsmA1ZpR
+d2ZZA10WstCKN7jHOUqUmSB/2oC/NZno09yXqgbNwIEwBgsUDNaYkGzIzsKD+mOy
+NTxLo/PJ5venVgboomDkWJqOOm+HtqfD64rczWyTS/ZdQhuFlk+aCYAwOhYZZH9Z
+IEkKcW8xN5+q8Bi9nsst5F1cuw84LD4=
 -----END CERTIFICATE-----

examples/https/server-key.pem

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC8PUoWqqdTtc4G
-CvM+aZ77hyt6PXFDU/hCc+SiwA59dR0oH4+UverOpQz/ZlMvKA13ZPc0h/ELD6f5
-mlYdADNVqzww0wSU+b3T8lHs85+MLwayUhv5psv6eEFNbK5hNLnroYKLfexmWvar
-voDqhnot2E4628deB48r3scfkIaq6VIOOqgJuu6SRwuYzei5rn6CL3qcr0AhGyjf
-p9gdrQJ/aJ9cKO1JgYoExIlsZNRp+9CCbskxG6R6Cxb4kOZL02FzP9ihzDl42TPX
-0MbW7HjVJo/FSt/rUuYwXSETmcSsYd6/a1e0gR625U1gdwmfzbCW5WbszGsy1pGE
-tfyWbnfRAgMBAAECggEAP1YT7qp+4ICkkI3wqEhbkOA7Ncckq/W964YZINWkSnw0
-UkLESdTZA6yvQeQJCy3b0hdrwgYXiZQ7/ZT7coiVvTZ/ayIlQYcCYyT+gc67GSzd
-gPR1qzt/GIiL2GRADD70a58NUKgO+aWTp9fSgpa612AXemBmpXG/r5Amya0UUr7Y
-KdSpBuOgomZMqEm2mYDdI4LRw2xbWoWTVvCndhypbXTJ2D8/QhbNfliWTG9MBy90
-UAQpaQGNwHzmCgwBJ03QJuE+OXjX80XcOOIYh6l68wkDeSfqaYx95OQZ3oOr6QT8
-TLYv08M9Grrrj5rPttpycBoxVbtLxkhE0Rt0q9K4HQKBgQD0EuR35CNTIIx/gikO
-CxdbSroPW9r92+IXCWcbbtRbVruHBpXzsMeHse4uqhtYmFNbgfgh12dC6OX7NzJx
-3Ds4NW8DvcZ3mVq8iEiOZnX5ydeeYMetlDWhXx2/0be5vqmrUkkWdfXsFUCyS8Lw
-vGRc9BiNqFePg2HsoVd2tezrwwKBgQDFb/eef/nOM1Eq5h+u+0Pyyg07iRuxxNup
-YXY9hwNJyF+NUoIWx2Jfyh+dQfMC18g/4hN4Hwfm/nC85SkPheKJnXYgMWMXp2Y7
-PBgdZGCX/546xiS5VGAoRuLd8oO2AlDfgU4tw6U0WZguJ6hMXlePlKz/uAJ237FB
-gcPyGNeY2wKBgQDOD4038zInolk75YYHxzFm78X55ZETtipBTLzyGjXLD4SvUM4U
-uXEbjQsL9q2ztJbbsPTujU8u3DYeS9GY81hD8kjRnc0LeDt05JJtNu/vfYs+uXKb
-h39nyEfzhHlapi/U5lmyTtDbCm5emTvxxvvsxmBcaH3UOhXYk7amEJ3/xQKBgA+s
-svj3agqv0krYmD1ZH2zgE6rdWMCFQ3cwEKYT2PP7n3Jl0YQjcjDuqBHhEXzxSqmf
-tjH8LLFvE947R0Y/N9v7D0zA/v/6v0gGnld/B5gpqBM8dd/szfGEpzA9t600g90q
-s904Qh5k2osXhOoDN2pjwFRQ9Ikhez4bIkZPKJavAoGAV2YPXyw5rrAZtCtybqsO
-B+15Lh+KC+vs0rBBhb0MUpXQPgQ6SX8ozpLHtqlsUpNfHwOk5K958jMrM9Rx4dhS
-Z6WuTa+9QpmXzYTnCDBbEU06+YB1QR2QfU4BlAAu1RtUbbt84/7OAoNh2IqOO4XJ
-THlhj8odimsk4R1B0RipBis=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDPND7M+inOP8dU
+MeDpmLmnKwgy+CTWPklsxJtZG9ufxNfk68WAvF5bibV8IvSUQu6L0fFCG2TVYFsD
+x5Ul600LFXtrCEq+CqEYPO75nEWM7Dr2pfmVYhXpVKPbebGHol9MQbjD9RDXxC/o
+LbtkK5JoA4cv13UaZqqXK7ScV2iF3ncvNsuwL+XWu4ycifvaGk6tAJtKsmY6c07N
+4yhIda6FqHN6Xek+HWrDRy3iq7Kt202rBB/y6PZOLftp9Y+Qvi+YFoT3Ar/Ms4Rr
+K0oqsZ/j/Zv1El2P8Bx/QMlew5OCYfAY1DpWGqjiyBKMO4cHcVQZNQTuiZqcb/Ci
+N6kI7S1rAgMBAAECggEAA4u31WckhwCFZzXxTN4Ns0QjwEeJzdbEB+X3aJd28y15
+qlO0jgbrMHLTVbv9ZnocvezKTaDNYW9kL1TfgwYbS+jCs2qxaL4i0pjcWA4qDIbQ
+XX8qnblPea42nZ9f/9ux+MqZIFVVw/N6BGWf8s9iEoCY9CMiQGDoY2zeitxeEAhe
+KGZHozaTUVAClrwMqKYlablWjX8zcoi6bKffUwz/MwecI2iVW72y9/xIGTlwhdZW
+8kDlkBOea3QV5yafcJQ1VsHrvUX3rf4C5uknCenwKbC3Au4+kBdQjv+bUk6aMR38
+OdnMCaUcnuT/UzbbtOSgJ+sVcGW9Jqo0DfS5CNPhuQKBgQD2EtOhjkUErc8KUhPW
+Pt8FNBAuoKsk4mRHpFsY2OjGYA50oiCtiphqfTzkQLbNhVtq83AHNUNWUKBjnMUd
+nAOIIvhpiEI7O+RuOafBtcFBIrUo2Ey5dwfvLJrpb7pEnYj8DNFVPQ/aBxP+mD4b
+RrHRY8DZdVHU9TDMDK7ObpKScwKBgQDXkASnc7O/D0iFxev004sqdTrGo3cBCJUH
+h/c68BrUvPw5u6fFulq5Wt6OOaFoWQmUSVyrhZD3vfrZ1Jocid3wn9uuu9vOazcz
+M3EOF1rz5bgjwb/vk6CyGh1MfmeVCRnuQ3mBIXQ0xwS4QY71Vvw3099fhbtbMHez
+5gyQv1ojKQKBgHkXBqGHmxsUVL/lZ/GT+rdayWPImK+L4IEItfNiOhn0huiKJ75+
+Z0Zv3pkL52j3aOcWaFiDs2E0R9j8+lr5vRsu6kM0VDNF48ECCjVetXzSEYfJ+OeD
+VZoyvwCEhIrjYtd1j0V8yOInfYVZcaaGgVZi2jGoc95x0dN3okXfT61VAoGAVrCA
+bqdFPizzSXkTL15ztRt4C7JphWziIik37+fnom5uMPmauxX6rlgw8JmUo9ZK1+u4
+7PHGHxuz6i5p29hF/SMMwfSirRzJEjo52STjWvqjVx3wBnUkRvvhlIWxOmpylzNj
+hd7iUOdIqqES0O+udvUp+8xYUI/pU9vMadnKciECgYB3cJ+7EPNgJgdpQ9Pslex8
+6iHdQH9DIyIb/KqQVe7em5NZXwANCAOQ6KqzhszM/eH7NoSeN7C9Z9uHHIHDfz4m
+QO896l7rM1k1R/USaUK4By/O/t/V/aIGjOnPsXxEGrEPDXXBtzUAEs5yAa+Ne1m7
+BiP9MuDgBTVkV1iJx37eqg==
 -----END PRIVATE KEY-----

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

@@ -6,8 +6,14 @@ const { ZoneContextManager } = require("@opentelemetry/context-zone");
 const { B3Propagator } = require("@opentelemetry/propagator-b3");
 const { registerInstrumentations } = require("@opentelemetry/instrumentation");
 const { OTLPTraceExporter: OTLPTraceExporterProto } = require("@opentelemetry/exporter-trace-otlp-proto");
+const { Resource } = require("@opentelemetry/resources");
+const { SEMRESATTRS_SERVICE_NAME } = require("@opentelemetry/semantic-conventions");
 
-const provider = new WebTracerProvider();
+const provider = new WebTracerProvider({
+ resource: new Resource({
+ [SEMRESATTRS_SERVICE_NAME]: 'fetch-proto-web-service'
+ })
+});
 
 // Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests
 // to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the

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

@@ -6,8 +6,14 @@ const { FetchInstrumentation } = require( '@opentelemetry/instrumentation-fetch'
 const { ZoneContextManager } = require( '@opentelemetry/context-zone');
 const { B3Propagator } = require( '@opentelemetry/propagator-b3');
 const { registerInstrumentations } = require( '@opentelemetry/instrumentation');
+const { Resource } = require('@opentelemetry/resources');
+const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
 
-const provider = new WebTracerProvider();
+const provider = new WebTracerProvider({
+ resource: new Resource({
+ [SEMRESATTRS_SERVICE_NAME]: 'fetch-web-service'
+ })
+});
 
 // Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests
 // to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the

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

@@ -6,8 +6,14 @@ const { FetchInstrumentation } = require('@opentelemetry/instrumentation-fetch')
 const { XMLHttpRequestInstrumentation } = require('@opentelemetry/instrumentation-xml-http-request');
 const { ZoneContextManager } = require('@opentelemetry/context-zone');
 const { registerInstrumentations } = require('@opentelemetry/instrumentation');
+const { Resource } = require('@opentelemetry/resources');
+const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
 
-const provider = new WebTracerProvider();
+const provider = new WebTracerProvider({
+ resource: new Resource({
+ [SEMRESATTRS_SERVICE_NAME]: 'fetch-xhr-web-service'
+ })
+});
 
 // Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests
 // to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the

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

@@ -7,8 +7,14 @@ const { XMLHttpRequestInstrumentation } = require( '@opentelemetry/instrumentati
 const { ZoneContextManager } = require( '@opentelemetry/context-zone');
 const { B3Propagator } = require( '@opentelemetry/propagator-b3');
 const { registerInstrumentations } = require( '@opentelemetry/instrumentation');
+const { Resource } = require('@opentelemetry/resources');
+const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
 
-const provider = new WebTracerProvider();
+const provider = new WebTracerProvider({
+ resource: new Resource({
+ [SEMRESATTRS_SERVICE_NAME]: 'fetch-xhr-b3-web-service'
+ })
+});
 
 // Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests
 // to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the

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

@@ -6,8 +6,14 @@ const { ZoneContextManager } = require( '@opentelemetry/context-zone');
 const { OTLPTraceExporter } = require( '@opentelemetry/exporter-trace-otlp-http');
 const { B3Propagator } = require( '@opentelemetry/propagator-b3');
 const { registerInstrumentations } = require( '@opentelemetry/instrumentation');
+const { Resource } = require('@opentelemetry/resources');
+const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
 
-const providerWithZone = new WebTracerProvider();
+const providerWithZone = new WebTracerProvider({
+ resource: new Resource({
+ [SEMRESATTRS_SERVICE_NAME]: 'xml-http-web-service'
+ })
+});
 
 // Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests
 // to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the

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

@@ -1,8 +1,15 @@
 const { ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
 const { WebTracerProvider } = require('@opentelemetry/sdk-trace-web');
 const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
+const { Resource } = require('@opentelemetry/resources');
+const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
+
+const provider = new WebTracerProvider({
+ resource: new Resource({
+ [SEMRESATTRS_SERVICE_NAME]: 'zipkin-web-service'
+ })
+});
 
-const provider = new WebTracerProvider();
 provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
 provider.addSpanProcessor(new SimpleSpanProcessor(new ZipkinExporter({
  // testing interceptor

examples/opentelemetry-web/package.json

@@ -1,7 +1,7 @@
 {
  "name": "web-opentelemetry-example",
  "private": true,
- "version": "0.52.0",
+ "version": "0.52.1",
  "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
  "main": "index.js",
  "scripts": {
@@ -45,20 +45,20 @@
  },
  "dependencies": {
  "@opentelemetry/api": "^1.3.0",
- "@opentelemetry/context-zone": "1.25.0",
- "@opentelemetry/core": "1.25.0",
- "@opentelemetry/exporter-metrics-otlp-http": "0.52.0",
- "@opentelemetry/exporter-trace-otlp-http": "0.52.0",
- "@opentelemetry/exporter-trace-otlp-proto": "0.52.0",
- "@opentelemetry/exporter-zipkin": "1.25.0",
- "@opentelemetry/instrumentation": "0.52.0",
- "@opentelemetry/instrumentation-fetch": "0.52.0",
- "@opentelemetry/instrumentation-xml-http-request": "0.52.0",
- "@opentelemetry/propagator-b3": "1.25.0",
- "@opentelemetry/sdk-metrics": "1.25.0",
- "@opentelemetry/sdk-trace-base": "1.25.0",
- "@opentelemetry/sdk-trace-web": "1.25.0",
- "@opentelemetry/semantic-conventions": "1.25.0"
+ "@opentelemetry/context-zone": "1.25.1",
+ "@opentelemetry/core": "1.25.1",
+ "@opentelemetry/exporter-metrics-otlp-http": "0.52.1",
+ "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
+ "@opentelemetry/exporter-trace-otlp-proto": "0.52.1",
+ "@opentelemetry/exporter-zipkin": "1.25.1",
+ "@opentelemetry/instrumentation": "0.52.1",
+ "@opentelemetry/instrumentation-fetch": "0.52.1",
+ "@opentelemetry/instrumentation-xml-http-request": "0.52.1",
+ "@opentelemetry/propagator-b3": "1.25.1",
+ "@opentelemetry/sdk-metrics": "1.25.1",
+ "@opentelemetry/sdk-trace-base": "1.25.1",
+ "@opentelemetry/sdk-trace-web": "1.25.1",
+ "@opentelemetry/semantic-conventions": "1.25.1"
  },
  "homepage": "https:/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
 }