Merge branch 'main' into docs-add-docker-compose-to-run-prometheus-for-experiemental-example

Author: pichlermarc

CHANGELOG.md

@@ -15,6 +15,11 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :house: (Internal)
 
+* chore: type reference on zone.js [#4257](https://github.com/open-telemetry/opentelemetry-js/pull/4257) @legendecas
+* chore: no need for 'packages' in lerna.json [#4264](https://github.com/open-telemetry/opentelemetry-js/pull/4264) @trentm
+
+### :bug: (Bug Fix)
+
 ## 1.18.1
 
 ### :bug: (Bug Fix)

experimental/packages/otlp-transformer/package.json

@@ -21,6 +21,7 @@
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
     "test:browser": "karma start --single-run",
+    "test:bench": "node test/performance/benchmark/index.js | tee .benchmark-results.txt",
     "prewatch": "node ../../../scripts/version-update.js",
     "watch": "tsc --build -w tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
     "peer-api-check": "node ../../../scripts/peer-api-check.js",

experimental/packages/otlp-transformer/test/performance/benchmark/index.js

@@ -0,0 +1,61 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const Benchmark = require('benchmark');
+const { createExportTraceServiceRequest } = require('../../../build/src');
+const { BasicTracerProvider } = require('@opentelemetry/sdk-trace-base');
+
+const tracerProvider = new BasicTracerProvider();
+const tracer = tracerProvider.getTracer('test')
+
+const suite = new Benchmark.Suite();
+
+const span = createSpan();
+const spans = [];
+for (let i = 0; i < 100; i++) {
+  spans.push(createSpan());
+}
+
+suite.on('cycle', event => {
+  console.log(String(event.target));
+});
+
+suite.add('transform 1 span', function() {
+  createExportTraceServiceRequest([span]);
+});
+
+suite.add('transform 100 spans', function() {
+  createExportTraceServiceRequest(spans);
+});
+
+suite.run();
+
+function createSpan() {
+  const span = tracer.startSpan('span');
+  span.setAttribute('aaaaaaaaaaaaaaaaaaaa', 'aaaaaaaaaaaaaaaaaaaa');
+  span.setAttribute('bbbbbbbbbbbbbbbbbbbb', 'bbbbbbbbbbbbbbbbbbbb');
+  span.setAttribute('cccccccccccccccccccc', 'cccccccccccccccccccc');
+  span.setAttribute('dddddddddddddddddddd', 'dddddddddddddddddddd');
+  span.setAttribute('eeeeeeeeeeeeeeeeeeee', 'eeeeeeeeeeeeeeeeeeee');
+  span.setAttribute('ffffffffffffffffffff', 'ffffffffffffffffffff');
+  span.setAttribute('gggggggggggggggggggg', 'gggggggggggggggggggg');
+  span.setAttribute('hhhhhhhhhhhhhhhhhhhh', 'hhhhhhhhhhhhhhhhhhhh');
+  span.setAttribute('iiiiiiiiiiiiiiiiiiii', 'iiiiiiiiiiiiiiiiiiii');
+  span.setAttribute('jjjjjjjjjjjjjjjjjjjj', 'jjjjjjjjjjjjjjjjjjjj');
+  span.end();
+
+  return span;
+}

lerna.json

@@ -1,20 +1,5 @@
 {
   "version": "independent",
   "npmClient": "npm",
-  "useWorkspaces": true,
-  "// packages": "Please sync with package.json#workspaces",
-  "packages": [
-    "api",
-    "packages/*",
-    "experimental/packages/*",
-    "experimental/examples/*",
-    "experimental/backwards-compatibility/*",
-    "integration-tests/*",
-    "selenium-tests",
-    "examples/otlp-exporter-node",
-    "examples/opentelemetry-web",
-    "examples/http",
-    "examples/https",
-    "examples/esm-http-ts"
-  ]
+  "useWorkspaces": true
 }

package.json

@@ -102,7 +102,6 @@
     },
     "cacheDir": ".changelog"
   },
-  "// workspaces": "Please sync with lerna.json#packages",
   "workspaces": [
     "api",
     "packages/*",

packages/opentelemetry-context-zone-peer-dep/src/ZoneContextManager.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+/// <reference types="zone.js" />
 import { Context, ContextManager, ROOT_CONTEXT } from '@opentelemetry/api';
 import { TargetWithEvents } from './types';
 import { isListenerObject } from './util';

packages/opentelemetry-context-zone-peer-dep/tsconfig.esm.json

@@ -5,9 +5,6 @@
     "rootDir": "src",
     "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo"
   },
-  "files": [
-    "node_modules/zone.js/dist/zone.js.d.ts"
-  ],
   "include": [
     "src/**/*.ts"
   ],

packages/opentelemetry-context-zone-peer-dep/tsconfig.esnext.json

@@ -5,9 +5,6 @@
     "rootDir": "src",
     "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo"
   },
-  "files": [
-    "node_modules/zone.js/dist/zone.js.d.ts"
-  ],
   "include": [
     "src/**/*.ts"
   ],

packages/opentelemetry-context-zone-peer-dep/tsconfig.json

@@ -4,9 +4,6 @@
     "outDir": "build",
     "rootDir": "."
   },
-  "files": [
-    "node_modules/zone.js/dist/zone.js.d.ts"
-  ],
   "include": [
     "src/**/*.ts",
     "test/**/*.ts"

packages/opentelemetry-sdk-trace-base/test/performance/benchmark/BatchSpanProcessor.js

@@ -0,0 +1,64 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const Benchmark = require('benchmark');
+const { BasicTracerProvider, BatchSpanProcessor } = require('../../../build/src');
+const { ExportResultCode } = require('@opentelemetry/core');
+
+class NoopExporter  {
+  export(spans, resultCallback) {
+    setTimeout(() => resultCallback({ code: ExportResultCode.SUCCESS }), 0);
+  }
+
+  shutdown() {
+    return this.forceFlush();
+  }
+
+  forceFlush() {
+    return Promise.resolve();
+  }
+}
+
+function createSpan() {
+  const span = tracer.startSpan('span');
+  span.setAttribute('aaaaaaaaaaaaaaaaaaaa', 'aaaaaaaaaaaaaaaaaaaa');
+  span.setAttribute('bbbbbbbbbbbbbbbbbbbb', 'aaaaaaaaaaaaaaaaaaaa');
+  span.setAttribute('cccccccccccccccccccc', 'aaaaaaaaaaaaaaaaaaaa');
+  span.setAttribute('dddddddddddddddddddd', 'aaaaaaaaaaaaaaaaaaaa');
+  span.setAttribute('eeeeeeeeeeeeeeeeeeee', 'aaaaaaaaaaaaaaaaaaaa');
+  span.setAttribute('ffffffffffffffffffff', 'aaaaaaaaaaaaaaaaaaaa');
+  span.setAttribute('gggggggggggggggggggg', 'aaaaaaaaaaaaaaaaaaaa');
+  span.setAttribute('hhhhhhhhhhhhhhhhhhhh', 'aaaaaaaaaaaaaaaaaaaa');
+  span.setAttribute('iiiiiiiiiiiiiiiiiiii', 'aaaaaaaaaaaaaaaaaaaa');
+  span.setAttribute('jjjjjjjjjjjjjjjjjjjj', 'aaaaaaaaaaaaaaaaaaaa');
+  span.end();
+}
+
+const tracerProvider = new BasicTracerProvider();
+tracerProvider.addSpanProcessor(new BatchSpanProcessor(new NoopExporter()));
+const tracer = tracerProvider.getTracer('test')
+
+const suite = new Benchmark.Suite('BatchSpanProcessor');
+
+suite.on('cycle', event => {
+  console.log(String(event.target));
+});
+
+suite.add('BatchSpanProcessor process span', function() {
+  createSpan();
+});
+
+suite.run();