Merge branch 'main' into feat/initialize-export

CHANGELOG.md

@@ -13,8 +13,18 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
 
 ### :rocket: (Enhancement)
 
+* feat(sdk-metrics, sdk-trace): add `mergeResourceWithDefaults` flag, which allows opting-out of resources getting merged with the default resource [#4617](/~https://github.com/open-telemetry/opentelemetry-js/pull/4617)
+  * default: `true` (no change in behavior)
+  * note: `false` will become the default behavior in the next major version in order to comply with [specification requirements](/~https://github.com/open-telemetry/opentelemetry-specification/blob/f3511a5ccda376dfd1de76dfa086fc9b35b54757/specification/resource/sdk.md?plain=1#L31-L36)
+
+* feat(sdk-trace-base): add `spanProcessors` property in `TracerConfig` interface. [#5138](/~https://github.com/open-telemetry/opentelemetry-js/pull/5138) @david-luna
+
 ### :bug: (Bug Fix)
 
+* fix(sdk-metrics): await exports in `PeriodicExportingMetricReader` when async resource attributes have not yet settled [#5119](/~https://github.com/open-telemetry/opentelemetry-js/pull/5119/) @pichlermarc
+* fix(sdk-trace-base): pass BatchSpanProcessor#forceFlush() errors on visibilitychange/pagehide to globalErrorHandler [#5143](/~https://github.com/open-telemetry/opentelemetry-js/pull/5143) @pichlermarc
+  * fixes a bug where switching browser tabs with a failing exporter would cause an unhandled error
+
 ### :books: (Refine Doc)
 
 ### :house: (Internal)

api/README.md

@@ -45,8 +45,9 @@ const { trace }  = require("@opentelemetry/api");
 const { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor }  = require("@opentelemetry/sdk-trace-base");
 
 // Create and register an SDK
-const provider = new BasicTracerProvider();
-provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
+const provider = new BasicTracerProvider({
+  spanProcessors: [new SimpleSpanProcessor(new ConsoleSpanExporter())]
+});
 trace.setGlobalTracerProvider(provider);
 
 // Acquire a tracer from the global tracer provider which will be used to trace the application

examples/basic-tracer-node/index.js

@@ -6,19 +6,20 @@ const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-convention
 const { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 
+// Configure span processor to send spans to the exporter
+const exporter = new JaegerExporter({
+  endpoint: 'http://localhost:14268/api/traces',
+});
 const provider = new BasicTracerProvider({
   resource: new Resource({
     [SEMRESATTRS_SERVICE_NAME]: 'basic-service',
   }),
+  spanProcessors: [
+    new SimpleSpanProcessor(exporter),
+    new SimpleSpanProcessor(new ConsoleSpanExporter()),
+  ]
 });
 
-// Configure span processor to send spans to the exporter
-const exporter = new JaegerExporter({
-  endpoint: 'http://localhost:14268/api/traces',
-});
-provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
-provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
-
 /**
  * Initialize the OpenTelemetry APIs to use the BasicTracerProvider bindings.
  *

examples/grpc-js/tracer.js

@@ -13,21 +13,15 @@ const { GrpcInstrumentation } = require('@opentelemetry/instrumentation-grpc');
 const EXPORTER = process.env.EXPORTER || '';
 
 module.exports = (serviceName) => {
+  const useZipkin = EXPORTER.toLowerCase().startsWith('z');
+  const exporter = useZipkin ? new ZipkinExporter() : new JaegerExporter();
   const provider = new NodeTracerProvider({
     resource: new Resource({
       [SEMRESATTRS_SERVICE_NAME]: serviceName,
     }),
+    spanProcessors: [new SimpleSpanProcessor(exporter)]
   });
 
-  let exporter;
-  if (EXPORTER.toLowerCase().startsWith('z')) {
-    exporter = new ZipkinExporter();
-  } else {
-    exporter = new JaegerExporter();
-  }
-
-  provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
-
   // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
   provider.register();
 

examples/http/tracer.js

@@ -13,21 +13,15 @@ const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
 const EXPORTER = process.env.EXPORTER || '';
 
 module.exports = (serviceName) => {
+  const useZipkin = EXPORTER.toLowerCase().startsWith('z');
+  const exporter = useZipkin ? new ZipkinExporter() : new JaegerExporter();
   const provider = new NodeTracerProvider({
     resource: new Resource({
       [SEMRESATTRS_SERVICE_NAME]: serviceName,
     }),
+    spanProcessors: [new SimpleSpanProcessor(exporter)]
   });
-
-  let exporter;
-  if (EXPORTER.toLowerCase().startsWith('z')) {
-    exporter = new ZipkinExporter();
-  } else {
-    exporter = new JaegerExporter();
-  }
-
-  provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
-
+
   // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
   provider.register();
 

examples/https/tracer.js

@@ -14,21 +14,14 @@ const EXPORTER = process.env.EXPORTER || '';
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 
 module.exports = (serviceName) => {
-  let exporter;
+  const useZipkin = EXPORTER.toLowerCase().startsWith('z');
+  const exporter = useZipkin ? new ZipkinExporter() : new JaegerExporter();
   const provider = new NodeTracerProvider({
     resource: new Resource({
       [SEMRESATTRS_SERVICE_NAME]: serviceName,
     }),
+    spanProcessors: [new SimpleSpanProcessor(exporter)]
   });
-
-  if (EXPORTER.toLowerCase().startsWith('z')) {
-    exporter = new ZipkinExporter();
-  } else {
-    exporter = new JaegerExporter();
-  }
-
-  provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
-
   // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
   provider.register();
 

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

@@ -12,17 +12,16 @@ const { SEMRESATTRS_SERVICE_NAME } = require("@opentelemetry/semantic-convention
 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
+  // exporter without delay
+  spanProcessors: [
+    new SimpleSpanProcessor(new ConsoleSpanExporter()),
+    new SimpleSpanProcessor(new OTLPTraceExporterProto()),
+  ]
 });
 
-// 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
-// exporter without delay
-provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
-provider.addSpanProcessor(
-  new SimpleSpanProcessor(new OTLPTraceExporterProto())
-);
-
 provider.register({
   contextManager: new ZoneContextManager(),
   propagator: new B3Propagator(),

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

@@ -12,14 +12,16 @@ const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-convention
 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
+  // exporter without delay
+  spanProcessors:[
+    new SimpleSpanProcessor(new ConsoleSpanExporter()),
+    new SimpleSpanProcessor(new OTLPTraceExporter()),
+  ]
 });
 
-// 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
-// exporter without delay
-provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
-provider.addSpanProcessor(new SimpleSpanProcessor(new OTLPTraceExporter()));
 provider.register({
   contextManager: new ZoneContextManager(),
   propagator: new B3Propagator(),

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

@@ -12,14 +12,16 @@ const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-convention
 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
+  // exporter without delay
+  spanProcessors: [
+    new SimpleSpanProcessor(new ConsoleSpanExporter()),
+    new SimpleSpanProcessor(new OTLPTraceExporter()),
+  ]
 });
 
-// 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
-// exporter without delay
-provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
-provider.addSpanProcessor(new SimpleSpanProcessor(new OTLPTraceExporter()));
 provider.register({
   contextManager: new ZoneContextManager(),
 });

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

@@ -13,14 +13,16 @@ const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-convention
 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
+  // exporter without delay
+  spanProcessors: [
+    new SimpleSpanProcessor(new ConsoleSpanExporter()),
+    new SimpleSpanProcessor(new OTLPTraceExporter()),
+  ]
 });
 
-// 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
-// exporter without delay
-provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
-provider.addSpanProcessor(new SimpleSpanProcessor(new OTLPTraceExporter()));
 provider.register({
   contextManager: new ZoneContextManager(),
   propagator: new B3Propagator(),

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

@@ -12,15 +12,16 @@ const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-convention
 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
+  // exporter without delay
+  spanProcessors: [
+    new SimpleSpanProcessor(new ConsoleSpanExporter()),
+    new SimpleSpanProcessor(new OTLPTraceExporter()),
+  ]
 });
 
-// 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
-// exporter without delay
-providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
-providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new OTLPTraceExporter()));
-
 providerWithZone.register({
   contextManager: new ZoneContextManager(),
   propagator: new B3Propagator(),

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

@@ -7,19 +7,23 @@ const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-convention
 const provider = new WebTracerProvider({
   resource: new Resource({
     [SEMRESATTRS_SERVICE_NAME]: 'zipkin-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
+  // exporter without delay
+  spanProcessors: [
+    new SimpleSpanProcessor(new ConsoleSpanExporter()),
+    new SimpleSpanProcessor(new ZipkinExporter({
+      // testing interceptor
+      // getExportRequestHeaders: () => {
+      //   return {
+      //     foo: 'bar',
+      //   }
+      // }
+    })),
+  ]
 });
 
-provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
-provider.addSpanProcessor(new SimpleSpanProcessor(new ZipkinExporter({
-  // testing interceptor
-  // getExportRequestHeaders: ()=> {
-  //   return {
-  //     foo: 'bar',
-  //   }
-  // }
-})));
-
 provider.register();
 
 const tracer = provider.getTracer('example-tracer-web');

examples/opentracing-shim/shim.js

@@ -11,9 +11,9 @@ const { TracerShim } = require('@opentelemetry/shim-opentracing');
 function shim(serviceName) {
   const provider = new NodeTracerProvider({
     resource: new Resource({ [SEMRESATTRS_SERVICE_NAME]: serviceName }),
+    spanProcessors: [new SimpleSpanProcessor(getExporter(serviceName))],
   });
 
-  provider.addSpanProcessor(new SimpleSpanProcessor(getExporter(serviceName)));
   // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
   provider.register();
 

examples/otlp-exporter-node/tracing.js

@@ -26,9 +26,11 @@ const provider = new BasicTracerProvider({
   resource: new Resource({
     [SEMRESATTRS_SERVICE_NAME]: 'basic-service',
   }),
+  spanProcessors: [
+    new SimpleSpanProcessor(exporter),
+    new SimpleSpanProcessor(new ConsoleSpanExporter()),
+  ]
 });
-provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
-provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
 provider.register();
 
 const tracer = trace.getTracer('example-otlp-exporter-node');

experimental/CHANGELOG.md

@@ -7,12 +7,55 @@ All notable changes to experimental packages in this project will be documented
 
 ### :boom: Breaking Change
 
+* feat(instrumentation-http)!: reduce public API surface by removing exports and making protected methods private [#5124](/~https://github.com/open-telemetry/opentelemetry-js/pull/5124) @pichlermarc
+  * (user-facing) the following exports were intended for internal use only and have been removed without replacement
+    * extractHostnameAndPort
+    * getAbsoluteUrl
+    * getIncomingRequestAttributes
+    * getIncomingRequestAttributesOnResponse
+    * getIncomingRequestMetricAttributes
+    * getIncomingRequestMetricAttributesOnResponse
+    * getOutgoingRequestAttributes
+    * getOutgoingRequestAttributesOnResponse
+    * getOutgoingRequestMetricAttributes
+    * getOutgoingRequestMetricAttributesOnResponse
+    * getRequestInfo
+    * headerCapture
+    * isCompressed
+    * isValidOptionsType
+    * parseResponseStatus
+    * satisfiesPattern
+    * setAttributesFromHttpKind
+    * setRequestContentLengthAttribute
+    * setResponseContentLengthAttribute
+    * setSpanWithError
+    * RequestSignature
+    * RequestFunction
+    * ParsedRequestOptions
+    * IgnoreMatcher
+    * Https
+    * HttpRequestArgs
+    * HttpCallbackOptional
+    * HttpCallback
+    * Http
+    * GetFunction
+    * Func
+    * Err
+
 ### :rocket: (Enhancement)
 
+* feat(sdk-node, sdk-logs): add `mergeResourceWithDefaults` flag, which allows opting-out of resources getting merged with the default resource [#4617](/~https://github.com/open-telemetry/opentelemetry-js/pull/4617)
+  * default: `true`
+  * note: `false` will become the default behavior in a future iteration in order to comply with [specification requirements](/~https://github.com/open-telemetry/opentelemetry-specification/blob/f3511a5ccda376dfd1de76dfa086fc9b35b54757/specification/resource/sdk.md?plain=1#L31-L36)
 * feat(instrumentation): re-export initialize function from import-in-the-middle [#5123](/~https://github.com/open-telemetry/opentelemetry-js/pull/5123)
 
 ### :bug: (Bug Fix)
 
+* fix(instrumentation-http): Fix the `OTEL_SEMCONV_STABILITY_OPT_IN` variable check. Using `of` instead of `in` [#5137](/~https://github.com/open-telemetry/opentelemetry-js/pull/5137)
+
+* fix(instrumentation-http): drop url.parse in favor of URL constructor [#5091](/~https://github.com/open-telemetry/opentelemetry-js/pull/5091) @pichlermarc
+  * fixes a bug where using cyrillic characters in a client request string URL would throw an exception, whereas an un-instrumented client would accept the same input without throwing an exception
+
 ### :books: (Refine Doc)
 
 ### :house: (Internal)

experimental/examples/opencensus-shim/setup.js

@@ -48,12 +48,14 @@ module.exports = function setup(serviceName) {
   const resource = new Resource({
     [SEMRESATTRS_SERVICE_NAME]: serviceName,
   });
-  const tracerProvider = new NodeTracerProvider({ resource });
-  tracerProvider.addSpanProcessor(
-    new BatchSpanProcessor(new OTLPTraceExporter(), {
-      scheduledDelayMillis: 5000,
-    })
-  );
+  const tracerProvider = new NodeTracerProvider({
+    resource,
+    spanProcessors: [
+      new BatchSpanProcessor(new OTLPTraceExporter(), {
+        scheduledDelayMillis: 5000,
+      })
+    ]
+  });
   tracerProvider.register();
 
   const meterProvider = new MeterProvider({ resource });