Merge branch 'main' into support-custom-baggage-header-prefix

Author: dyladan

package.json

@@ -2,8 +2,6 @@
   "name": "opentelemetry",
   "version": "0.1.0",
   "description": "OpenTelemetry is a distributed tracing and stats collection framework.",
-  "main": "build/src/index.js",
-  "types": "build/src/index.d.ts",
   "scripts": {
     "precompile": "lerna run version",
     "compile": "tsc --build",
@@ -65,7 +63,7 @@
     "lerna-changelog": "1.0.1",
     "markdownlint-cli": "0.29.0",
     "semver": "7.3.5",
-    "typedoc": "0.22.9",
+    "typedoc": "0.22.10",
     "typescript": "4.4.4",
     "update-ts-references": "2.4.1"
   },

packages/opentelemetry-sdk-trace-base/src/Span.ts

@@ -131,6 +131,10 @@ export class Span implements api.Span, ReadableSpan {
     startTime?: api.TimeInput
   ): this {
     if (this._isSpanEnded()) return this;
+    if (this._spanLimits.eventCountLimit === 0) {
+      api.diag.warn('No events allowed.');
+      return this;
+    }
     if (this.events.length >= this._spanLimits.eventCountLimit!) {
       api.diag.warn('Dropping extra events.');
       this.events.shift();

packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts

@@ -621,6 +621,28 @@ describe('Span', () => {
     assert.strictEqual(span.events[span.events.length - 1].name, 'sent149');
   });
 
+  it('should add no event', () => {
+    const tracer = new BasicTracerProvider({
+      spanLimits: {
+        eventCountLimit: 0,
+      },
+    }).getTracer('default');
+
+    const span = new Span(
+      tracer,
+      ROOT_CONTEXT,
+      name,
+      spanContext,
+      SpanKind.CLIENT
+    );
+    for (let i = 0; i < 10; i++) {
+      span.addEvent('sent' + i);
+    }
+    span.end();
+
+    assert.strictEqual(span.events.length, 0);
+  });
+
   it('should set an error status', () => {
     const span = new Span(
       tracer,

tsconfig.json

@@ -2,8 +2,8 @@
   "extends": "./tsconfig.base.json",
   "files": [],
   "typedocOptions": {
-    "packages": [
-      "experimental/packages/opentelemetry-api-metrics",
+    "entryPointStrategy": "packages",
+    "entryPoints": [
       "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc",
       "experimental/packages/opentelemetry-exporter-metrics-otlp-http",
       "experimental/packages/opentelemetry-exporter-metrics-otlp-proto",
@@ -26,7 +26,6 @@
       "packages/opentelemetry-propagator-b3",
       "packages/opentelemetry-propagator-jaeger",
       "packages/opentelemetry-resources",
-      "packages/opentelemetry-sdk-metrics-base",
       "packages/opentelemetry-sdk-trace-base",
       "packages/opentelemetry-sdk-trace-node",
       "packages/opentelemetry-sdk-trace-web",