Merge branch 'open-telemetry:main' into main

Author: shalini-saloni

assets/js/tracing.js

@@ -7,7 +7,7 @@ import { getWebAutoInstrumentations } from '@opentelemetry/auto-instrumentations
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
 import { Resource } from '@opentelemetry/resources';
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
+import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
 import { ZoneContextManager } from '@opentelemetry/context-zone-peer-dep';
 
 const collectorOptions = {
@@ -16,21 +16,23 @@ const collectorOptions = {
 const exporter = new OTLPTraceExporter(collectorOptions);
 
 const resources = new Resource({
-  [SemanticResourceAttributes.SERVICE_NAME]: 'opentelemetry.io',
+  [ATTR_SERVICE_NAME]: 'opentelemetry.io',
   'browser.language': navigator.language,
 });
 
 const provider = new WebTracerProvider({
   resource: resources,
+  spanProcessors: [
+    new SimpleSpanProcessor(exporter),
+    new SimpleSpanProcessor(new ConsoleSpanExporter()),
+  ],
 });
 
 registerInstrumentations({
   instrumentations: [getWebAutoInstrumentations({})],
   tracerProvider: provider,
 });
 
-provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
-provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
 provider.register({
   contextManger: new ZoneContextManager(),
 });

content/en/docs/demo/services/frontend.md

@@ -178,10 +178,9 @@ const FrontendTracer = async () => {
     resource: new Resource({
       [SEMRESATTRS_SERVICE_NAME]: process.env.NEXT_PUBLIC_OTEL_SERVICE_NAME,
     }),
+    spanProcessors: [new SimpleSpanProcessor(new OTLPTraceExporter())],
   });
 
-  provider.addSpanProcessor(new SimpleSpanProcessor(new OTLPTraceExporter()));
-
   const contextManager = new ZoneContextManager();
 
   provider.register({

content/en/docs/languages/js/exporters.md

@@ -355,7 +355,7 @@ import * as opentelemetry from '@opentelemetry/sdk-node';
 import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node';
 
 const sdk = new NodeSDK({
-  spanProcessor: new SimpleSpanProcessor(exporter),
+  spanProcessors: [new SimpleSpanProcessor(exporter)],
   instrumentations: [getNodeAutoInstrumentations()],
 });
 sdk.start();
@@ -371,7 +371,7 @@ const {
 } = require('@opentelemetry/auto-instrumentations-node');
 
 const sdk = new opentelemetry.NodeSDK({
-  spanProcessor: new SimpleSpanProcessor(exporter)
+  spanProcessors: [new SimpleSpanProcessor(exporter)],
   instrumentations: [getNodeAutoInstrumentations()],
 });
 sdk.start();

content/en/docs/languages/js/instrumentation.md

@@ -367,12 +367,13 @@ const resource = Resource.default().merge(
   }),
 );
 
+const exporter = new ConsoleSpanExporter();
+const processor = new BatchSpanProcessor(exporter);
+
 const provider = new WebTracerProvider({
   resource: resource,
+  spanProcessors: [processor],
 });
-const exporter = new ConsoleSpanExporter();
-const processor = new BatchSpanProcessor(exporter);
-provider.addSpanProcessor(processor);
 
 provider.register();
 ```
@@ -399,12 +400,13 @@ const resource = Resource.default().merge(
   }),
 );
 
+const exporter = new ConsoleSpanExporter();
+const processor = new BatchSpanProcessor(exporter);
+
 const provider = new WebTracerProvider({
   resource: resource,
+  spanProcessors: [processor],
 });
-const exporter = new ConsoleSpanExporter();
-const processor = new BatchSpanProcessor(exporter);
-provider.addSpanProcessor(processor);
 
 provider.register();
 ```
@@ -1125,17 +1127,29 @@ Initializing tracing is similar to how you'd do it with Node.js or the Web SDK.
 
 ```ts
 import opentelemetry from '@opentelemetry/api';
+import {
+  CompositePropagator,
+  W3CTraceContextPropagator,
+  W3CBaggagePropagator,
+} from '@opentelemetry/core';
 import {
   BasicTracerProvider,
   BatchSpanProcessor,
   ConsoleSpanExporter,
 } from '@opentelemetry/sdk-trace-base';
 
-const provider = new BasicTracerProvider();
+opentelemetry.trace.setGlobalTracerProvider(
+  new BasicTracerProvider({
+    // Configure span processor to send spans to the exporter
+    spanProcessors: [new BatchSpanProcessor(new ConsoleSpanExporter())],
+  }),
+);
 
-// Configure span processor to send spans to the exporter
-provider.addSpanProcessor(new BatchSpanProcessor(new ConsoleSpanExporter()));
-provider.register();
+opentelemetry.propagation.setGlobalPropagator(
+  new CompositePropagator({
+    propagators: [new W3CTraceContextPropagator(), new W3CBaggagePropagator()],
+  }),
+);
 
 // This is what we'll access in all instrumentation code
 const tracer = opentelemetry.trace.getTracer('example-basic-tracer-node');
@@ -1145,17 +1159,29 @@ const tracer = opentelemetry.trace.getTracer('example-basic-tracer-node');
 
 ```js
 const opentelemetry = require('@opentelemetry/api');
+const {
+  CompositePropagator,
+  W3CTraceContextPropagator,
+  W3CBaggagePropagator,
+} = require('@opentelemetry/core');
 const {
   BasicTracerProvider,
   ConsoleSpanExporter,
   BatchSpanProcessor,
 } = require('@opentelemetry/sdk-trace-base');
 
-const provider = new BasicTracerProvider();
+opentelemetry.trace.setGlobalTracerProvider(
+  new BasicTracerProvider({
+    // Configure span processor to send spans to the exporter
+    spanProcessors: [new BatchSpanProcessor(new ConsoleSpanExporter())],
+  }),
+);
 
-// Configure span processor to send spans to the exporter
-provider.addSpanProcessor(new BatchSpanProcessor(new ConsoleSpanExporter()));
-provider.register();
+opentelemetry.propagation.setGlobalPropagator(
+  new CompositePropagator({
+    propagators: [new W3CTraceContextPropagator(), new W3CBaggagePropagator()],
+  }),
+);
 
 // This is what we'll access in all instrumentation code
 const tracer = opentelemetry.trace.getTracer('example-basic-tracer-node');

content/en/docs/languages/js/serverless.md

@@ -64,17 +64,15 @@ const {
 
 api.diag.setLogger(new api.DiagConsoleLogger(), api.DiagLogLevel.ALL);
 
-const provider = new NodeTracerProvider();
-const collectorOptions = {
-  url: '<backend_url>',
-};
-
 const spanProcessor = new BatchSpanProcessor(
-  new OTLPTraceExporter(collectorOptions),
+  new OTLPTraceExporter({
+    url: '<backend_url>',
+  }),
 );
 
-provider.addSpanProcessor(spanProcessor);
-provider.register();
+const provider = new NodeTracerProvider({
+  spanProcessors: [spanProcessor],
+});
 
 registerInstrumentations({
   instrumentations: [
@@ -241,24 +239,21 @@ const {
   getNodeAutoInstrumentations,
 } = require('@opentelemetry/auto-instrumentations-node');
 
-const providerConfig = {
-  resource: new Resource({
-    [SEMRESATTRS_SERVICE_NAME]: '<your function name>',
-  }),
-};
-
 api.diag.setLogger(new api.DiagConsoleLogger(), api.DiagLogLevel.ALL);
 
-const provider = new NodeTracerProvider(providerConfig);
 const collectorOptions = {
   url: '<address for your backend>',
 };
 
-const spanProcessor = new BatchSpanProcessor(
-  new OTLPTraceExporter(collectorOptions),
-);
+const provider = new NodeTracerProvider({
+  resource: resourceFromAttributes({
+    [SEMRESATTRS_SERVICE_NAME]: '<your function name>',
+  }),
+  spanProcessors: [
+    new BatchSpanProcessor(new OTLPTraceExporter(collectorOptions)),
+  ],
+});
 
-provider.addSpanProcessor(spanProcessor);
 provider.register();
 
 registerInstrumentations({
@@ -274,15 +269,15 @@ Add the following to your `package.json`:
 {
   "dependencies": {
     "@google-cloud/functions-framework": "^3.0.0",
-    "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/auto-instrumentations-node": "^0.35.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.34.0",
-    "@opentelemetry/instrumentation": "^0.34.0",
-    "@opentelemetry/sdk-node": "^0.34.0",
-    "@opentelemetry/sdk-trace-base": "^1.8.0",
-    "@opentelemetry/sdk-trace-node": "^1.8.0",
-    "@opentelemetry/resources": "^1.8.0",
-    "@opentelemetry/semantic-conventions": "^1.8.0"
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.56.1",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.57.2",
+    "@opentelemetry/instrumentation": "^0.57.2",
+    "@opentelemetry/sdk-node": "^0.57.2",
+    "@opentelemetry/sdk-trace-base": "^1.30.1",
+    "@opentelemetry/sdk-trace-node": "^1.30.1",
+    "@opentelemetry/resources": "^1.30.1",
+    "@opentelemetry/semantic-conventions": "^1.30.0"
   }
 }
 ```