Merge branch 'main' into starttimebugfix

experimental/CHANGELOG.md

@@ -16,6 +16,8 @@ All notable changes to experimental packages in this project will be documented
 ### :bug: (Bug Fix)
 
 * fix(exporter-logs-otlp-http): set useHex to true [#3875](https://github.com/open-telemetry/opentelemetry-js/pull/3875) @Nico385412
+  fix(otlp-proto-exporter-base): add missing type import [#3937](https://github.com/open-telemetry/opentelemetry-js/pull/3937) @pichlermarc
+* fix(example-opencensus-shim): avoid OpenCensus auto instrumentations [#3951](https://github.com/open-telemetry/opentelemetry-js/pull/3951) @llc1123
 
 ### :books: (Refine Doc)
 

experimental/examples/opencensus-shim/package.json

@@ -30,7 +30,7 @@
     "@opentelemetry/api": "1.4.1",
     "@opentelemetry/sdk-trace-node": "1.14.0",
     "@opencensus/core": "0.1.0",
-    "@opencensus/nodejs": "0.1.0",
+    "@opencensus/nodejs-base": "0.1.0",
     "@opentelemetry/semantic-conventions": "1.14.0",
     "@opentelemetry/exporter-trace-otlp-grpc": "0.40.0",
     "@opentelemetry/resources": "1.14.0",

experimental/examples/opencensus-shim/setup.js

@@ -29,7 +29,7 @@ const {
 } = require('@opentelemetry/semantic-conventions');
 
 module.exports = function setup(serviceName) {
-  const tracing = require('@opencensus/nodejs');
+  const tracing = require('@opencensus/nodejs-base');
 
   diag.setLogger(new DiagConsoleLogger(), { logLevel: DiagLogLevel.ALL });
   const provider = new NodeTracerProvider({

experimental/packages/exporter-logs-otlp-http/tsconfig.esm.json

@@ -12,6 +12,9 @@
     {
       "path": "../../../packages/opentelemetry-core"
     },
+    {
+      "path": "../../../packages/opentelemetry-resources"
+    },
     {
       "path": "../api-logs"
     },

experimental/packages/exporter-logs-otlp-http/tsconfig.esnext.json

@@ -12,6 +12,9 @@
     {
       "path": "../../../packages/opentelemetry-core"
     },
+    {
+      "path": "../../../packages/opentelemetry-resources"
+    },
     {
       "path": "../api-logs"
     },

experimental/packages/exporter-logs-otlp-http/tsconfig.json

@@ -12,6 +12,9 @@
     {
       "path": "../../../packages/opentelemetry-core"
     },
+    {
+      "path": "../../../packages/opentelemetry-resources"
+    },
     {
       "path": "../api-logs"
     },
@@ -23,9 +26,6 @@
     },
     {
       "path": "../sdk-logs"
-    },
-    {
-      "path": "../../../packages/opentelemetry-resources"
-    },
+    }
   ]
 }

experimental/packages/opentelemetry-instrumentation-grpc/package.json

@@ -62,7 +62,7 @@
     "mocha": "10.2.0",
     "node-pre-gyp": "0.17.0",
     "nyc": "15.1.0",
-    "semver": "7.5.2",
+    "semver": "7.5.3",
     "sinon": "15.1.2",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"

experimental/packages/opentelemetry-sdk-node/package.json

@@ -74,7 +74,7 @@
     "lerna": "7.0.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",
-    "semver": "7.5.2",
+    "semver": "7.5.3",
     "sinon": "15.1.2",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

experimental/packages/otlp-proto-exporter-base/src/platform/util.ts

@@ -16,6 +16,7 @@
 
 import * as root from '../generated/root';
 import { ServiceClientType } from './types';
+import type * as protobuf from 'protobufjs';
 
 export interface ExportRequestType<T, R = T & { toJSON: () => unknown }> {
   create(properties?: T): R;

package.json

@@ -76,7 +76,7 @@
     "linkinator": "5.0.1",
     "markdownlint-cli": "0.35.0",
     "prettier": "2.8.8",
-    "semver": "7.5.2",
+    "semver": "7.5.3",
     "typedoc": "0.22.18",
     "typedoc-plugin-missing-exports": "1.0.0",
     "typedoc-plugin-resolve-crossmodule-references": "0.2.2",

selenium-tests/babel.config.js

@@ -22,12 +22,12 @@ module.exports = function (api) {
   ];
   const plugins = [
     ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
-    ['@babel/plugin-proposal-class-properties', { 'loose': true }],
-    ["@babel/plugin-proposal-private-methods", { "loose": true }],
-    ["@babel/plugin-proposal-private-property-in-object", { "loose": true }],
+    ['@babel/plugin-transform-class-properties', { 'loose': true }],
+    ["@babel/plugin-transform-private-methods", { "loose": true }],
+    ["@babel/plugin-transform-private-property-in-object", { "loose": true }],
   ];
   return {
     presets,
     plugins,
   };
-};
+};

selenium-tests/package.json

@@ -44,7 +44,7 @@
     "dotenv": "16.0.0",
     "fast-safe-stringify": "2.1.1",
     "geckodriver": "3.0.1",
-    "nightwatch": "2.0.10",
+    "nightwatch": "3.0.1",
     "selenium-server": "3.141.59",
     "terser-webpack-plugin": "4.2.3",
     "webpack": "4.46.0",

selenium-tests/pages/fetch/index.js

@@ -29,7 +29,7 @@ const getData = (url) => fetch(url, {
 
 // example of keeping track of context between async operations
 const prepareClickEvent = () => {
-  const url = 'https://httpbin.org/get';
+  const url = 'https://httpstat.us/200';
 
   const element = document.getElementById('button1');
 

selenium-tests/pages/xhr/index.js

@@ -10,7 +10,7 @@ const provider = loadOtel([
   new XMLHttpRequestInstrumentation({
     ignoreUrls: [/localhost:8090\/sockjs-node/],
     propagateTraceHeaderCorsUrls: [
-      'https://httpbin.org/get',
+      'https://httpstat.us/200',
     ],
     clearTimingResources: true,
   }),
@@ -35,7 +35,7 @@ const getData = (url) => new Promise((resolve, reject) => {
 
 // example of keeping track of context between async operations
 const prepareClickEvent = () => {
-  const url = 'https://httpbin.org/get';
+  const url = 'https://httpstat.us/200';
 
   const element = document.getElementById('button1');
 

selenium-tests/tests-helpers/constants.js

@@ -2,4 +2,4 @@ const TIMEOUT_ELEMENT_MS = 5000;
 
 module.exports = {
   TIMEOUT_ELEMENT_MS,
-};
+};

selenium-tests/webpack.common.js

@@ -11,7 +11,7 @@ module.exports = {
     filename: '[name].js',
     sourceMapFilename: '[file].map',
   },
-  target: ['web', 'es5'],
+  target: 'web',
   module: {
     rules: [
       {
@@ -35,4 +35,4 @@ module.exports = {
     ],
     extensions: ['.ts', '.js', '.jsx', '.json'],
   },
-};
+};