Merge branch 'main' into feat/node-exporter-config-rewrite

open-telemetry · Sep 20, 2024 · 0423bde · 0423bde
2 parents 3c1756f + cdfefb8
commit 0423bde
Show file tree

Hide file tree

Showing 55 changed files with 1,462 additions and 545 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,12 +13,17 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
 
 ### :rocket: (Enhancement)
 
+* feat: add processors for adding session.id attribute to spans and logs [#4972](https://github.com/open-telemetry/opentelemetry-js/pull/4972)
+
 ### :bug: (Bug Fix)
 
 ### :books: (Refine Doc)
 
 ### :house: (Internal)
 
+* deps: set `@opentelemetry/api` dependency min version to 1.3.0 in `examples`, `experimental/packages`, `integration-tests` and `selenium-tests`
+  [#4992](https://github.com/open-telemetry/opentelemetry-js/pull/4992)
+
 ## 1.26.0
 
 ### :rocket: (Enhancement)

diff --git a/examples/basic-tracer-node/package.json b/examples/basic-tracer-node/package.json
@@ -24,7 +24,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.2",
+    "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/exporter-jaeger": "0.25.0",
     "@opentelemetry/resources": "0.25.0",
     "@opentelemetry/semantic-conventions": "^1.22.0",

diff --git a/examples/grpc-js/package.json b/examples/grpc-js/package.json
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.3.7",
-    "@opentelemetry/api": "^1.0.2",
+    "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/exporter-jaeger": "^1.0.1",
     "@opentelemetry/exporter-zipkin": "^1.0.1",
     "@opentelemetry/instrumentation": "^0.27.0",

diff --git a/examples/https/package.json b/examples/https/package.json
@@ -33,7 +33,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/exporter-jaeger": "1.26.0",
     "@opentelemetry/exporter-zipkin": "1.26.0",
     "@opentelemetry/instrumentation": "0.53.0",

diff --git a/examples/opentracing-shim/package.json b/examples/opentracing-shim/package.json
@@ -30,7 +30,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.2",
+    "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/exporter-jaeger": "0.25.0",
     "@opentelemetry/exporter-zipkin": "0.25.0",
     "@opentelemetry/instrumentation": "0.25.0",

diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -45,6 +45,8 @@ All notable changes to experimental packages in this project will be documented
 
 ### :house: (Internal)
 
+* refactor(exporter-prometheus): replace `MetricAttributes` and `MetricAttributeValues` with `Attributes` and `AttributeValues` [#4993](https://github.com/open-telemetry/opentelemetry-js/pull/4993)
+
 ## 0.53.0
 
 ### :boom: Breaking Change

diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json
@@ -62,7 +62,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/api-logs": "0.53.0"
   },
   "devDependencies": {

diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json
@@ -62,7 +62,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
     "@types/mocha": "10.0.7",

diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json
@@ -68,7 +68,7 @@
     "typescript": "4.4.4"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.7.1",

diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json
@@ -80,7 +80,7 @@
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "@types/webpack-env": "1.16.3",
-    "babel-loader": "8.3.0",
+    "babel-loader": "8.4.1",
     "babel-plugin-istanbul": "7.0.0",
     "codecov": "3.8.3",
     "cross-var": "1.1.0",
@@ -101,7 +101,7 @@
     "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "dependencies": {
     "@opentelemetry/api-logs": "0.53.0",

diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json
@@ -90,7 +90,7 @@
     "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "dependencies": {
     "@opentelemetry/api-logs": "0.53.0",

diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json
@@ -65,7 +65,7 @@
     "typescript": "4.4.4"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.7.1",

diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json
@@ -71,7 +71,7 @@
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "@types/webpack-env": "1.16.3",
-    "babel-loader": "8.3.0",
+    "babel-loader": "8.4.1",
     "babel-plugin-istanbul": "7.0.0",
     "codecov": "3.8.3",
     "cross-var": "1.1.0",
@@ -92,7 +92,7 @@
     "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "dependencies": {
     "@opentelemetry/core": "1.26.0",

diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json
@@ -89,7 +89,7 @@
     "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "dependencies": {
     "@opentelemetry/core": "1.26.0",

diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json
@@ -80,7 +80,7 @@
     "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "dependencies": {
     "@opentelemetry/resources": "1.26.0"

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
@@ -71,7 +71,7 @@
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "@types/webpack-env": "1.16.3",
-    "babel-loader": "8.3.0",
+    "babel-loader": "8.4.1",
     "babel-plugin-istanbul": "7.0.0",
     "codecov": "3.8.3",
     "cross-var": "1.1.0",

diff --git a/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  diag,
-  MetricAttributes,
-  MetricAttributeValue,
-} from '@opentelemetry/api';
+import { diag, Attributes, AttributeValue } from '@opentelemetry/api';
 import {
   ResourceMetrics,
   InstrumentType,
@@ -48,7 +44,7 @@ function escapeString(str: string) {
  *
  * `undefined` is converted to an empty string.
  */
-function escapeAttributeValue(str: MetricAttributeValue = '') {
+function escapeAttributeValue(str: AttributeValue = '') {
   if (typeof str !== 'string') {
     str = JSON.stringify(str);
   }
@@ -136,10 +132,10 @@ function toPrometheusType(metricData: MetricData): PrometheusDataTypeLiteral {
 
 function stringify(
   metricName: string,
-  attributes: MetricAttributes,
+  attributes: Attributes,
   value: number,
   timestamp?: number,
-  additionalAttributes?: MetricAttributes
+  additionalAttributes?: Attributes
 ) {
   let hasAttribute = false;
   let attributesStr = '';

diff --git a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts
@@ -15,7 +15,7 @@
  */
 
 import * as assert from 'assert';
-import { MetricAttributes, UpDownCounter } from '@opentelemetry/api';
+import { Attributes, UpDownCounter } from '@opentelemetry/api';
 import {
   Aggregation,
   AggregationTemporality,
@@ -610,7 +610,7 @@ describe('PrometheusSerializer', () => {
           NaN: NaN,
           null: null,
           undefined: undefined,
-        } as unknown as MetricAttributes);
+        } as unknown as Attributes);
       });
 
       assert.strictEqual(
@@ -649,7 +649,7 @@ describe('PrometheusSerializer', () => {
           backslashN: '\u005c\u006e', // \n => \\n (\u005c\u005c\u006e)
           backslashDoubleQuote: '\u005c\u0022', // \" => \\\" (\u005c\u005c\u005c\u0022)
           backslashLineFeed: '\u005c\u000a', // \↵ => \\\n (\u005c\u005c\u005c\u006e)
-        } as unknown as MetricAttributes);
+        } as unknown as Attributes);
       });
 
       assert.strictEqual(
@@ -674,7 +674,7 @@ describe('PrometheusSerializer', () => {
         // error while linting: text format parsing error in line 282: expected '=' after label name, found '-'
         counter.add(1, {
           'account-id': '123456',
-        } as unknown as MetricAttributes);
+        } as unknown as Attributes);
       });
 
       assert.strictEqual(result, 'test_total{account_id="123456"} 1\n');

diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json
@@ -65,7 +65,7 @@
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "@types/webpack-env": "1.16.3",
-    "babel-loader": "8.3.0",
+    "babel-loader": "8.4.1",
     "babel-plugin-istanbul": "7.0.0",
     "codecov": "3.8.3",
     "cross-var": "1.1.0",
@@ -86,7 +86,7 @@
     "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "dependencies": {
     "@opentelemetry/core": "1.26.0",

diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
@@ -65,7 +65,7 @@
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "@types/webpack-env": "1.16.3",
-    "babel-loader": "8.3.0",
+    "babel-loader": "8.4.1",
     "babel-plugin-istanbul": "7.0.0",
     "codecov": "3.8.3",
     "cross-var": "1.1.0",
@@ -86,7 +86,7 @@
     "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "dependencies": {
     "@opentelemetry/core": "1.26.0",

diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json
@@ -92,7 +92,7 @@
     "@types/semver": "7.5.8",
     "@types/sinon": "17.0.3",
     "@types/webpack-env": "1.16.3",
-    "babel-loader": "8.3.0",
+    "babel-loader": "8.4.1",
     "babel-plugin-istanbul": "7.0.0",
     "codecov": "3.8.3",
     "cpx2": "2.0.0",

diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json
@@ -92,7 +92,7 @@
     "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-exporter-base",
   "sideEffects": false

diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json
@@ -63,7 +63,7 @@
     "typescript": "4.4.4"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.7.1",

diff --git a/experimental/packages/propagator-aws-xray-lambda/package.json b/experimental/packages/propagator-aws-xray-lambda/package.json
@@ -51,7 +51,7 @@
     "@types/mocha": "10.0.7",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
-    "babel-loader": "8.3.0",
+    "babel-loader": "8.4.1",
     "babel-plugin-istanbul": "7.0.0",
     "codecov": "3.8.3",
     "cross-var": "1.1.0",

diff --git a/experimental/packages/sdk-events/package.json b/experimental/packages/sdk-events/package.json
@@ -76,7 +76,7 @@
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.20",
     "@types/webpack-env": "1.16.3",
-    "babel-loader": "8.3.0",
+    "babel-loader": "8.4.1",
     "babel-plugin-istanbul": "7.0.0",
     "codecov": "3.8.3",
     "cross-var": "1.1.0",

diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json
@@ -66,7 +66,7 @@
   },
   "peerDependencies": {
     "@opencensus/core": "^0.1.0",
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.3.0"
   },
   "dependencies": {
     "@opentelemetry/core": "1.26.0",

diff --git a/experimental/packages/web-common/.eslintignore b/experimental/packages/web-common/.eslintignore
@@ -0,0 +1 @@
+build
diff --git a/experimental/packages/web-common/.eslintrc.js b/experimental/packages/web-common/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+  env: {
+    mocha: true,
+    node: true,
+  },
+  ...require('../../../eslint.base.js'),
+};
diff --git a/experimental/packages/web-common/.npmignore b/experimental/packages/web-common/.npmignore
@@ -0,0 +1,4 @@
+/bin
+/coverage
+/doc
+/test