Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update otel to 1.23 / contrib whatever & rest of the deps #750

Merged
merged 6 commits into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19,853 changes: 3,741 additions & 16,112 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions packages/session-recorder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
"dependencies": {
"@babel/runtime": "~7.22.6",
"@opentelemetry/api": "^1.8.0",
"@opentelemetry/core": "^1.22.0",
"@opentelemetry/resources": "^1.22.0",
"@opentelemetry/core": "^1.23.0",
"@opentelemetry/resources": "^1.23.0",
"fflate": "^0.8.0",
"protobufjs": "~7.2.4",
"protobufjs": "~7.2.6",
"rrweb": "^1.1.3",
"type-fest": "^4.0.0"
},
Expand Down
24 changes: 12 additions & 12 deletions packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"compile:tsc": "tsc --build tsconfig.cjs.json tsconfig.esm.json",
"test:unit:watch": "karma start",
"test:unit:ci": "nyc karma start --single-run --no-auto-watch --browsers ChromeHeadless",
"test:unit:ci-node": "env TS_NODE_TRANSPILE_ONLY=true nyc mocha",
"test:unit:ci-node": "env TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=tsconfig.cjs.json nyc mocha",
"test:integration:local": "npm-run-all -s compile test:integration:local:headlessChrome:_execute",
"test:integration:local:firefox": "npm-run-all -s compile test:integration:local:firefox:_execute",
"test:integration:local:chrome": "npm-run-all -s compile test:integration:local:chrome:_execute",
Expand Down Expand Up @@ -48,17 +48,17 @@
"dependencies": {
"@babel/runtime": "^7.22.6",
"@opentelemetry/api": "^1.8.0",
"@opentelemetry/core": "^1.22.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.49.1",
"@opentelemetry/exporter-zipkin": "^1.22.0",
"@opentelemetry/instrumentation": "^0.49.1",
"@opentelemetry/instrumentation-document-load": "^0.36.0",
"@opentelemetry/instrumentation-fetch": "^0.49.1",
"@opentelemetry/instrumentation-xml-http-request": "^0.49.1",
"@opentelemetry/resources": "^1.22.0",
"@opentelemetry/sdk-trace-base": "^1.22.0",
"@opentelemetry/sdk-trace-web": "^1.22.0",
"@opentelemetry/semantic-conventions": "^1.22.0",
"@opentelemetry/core": "^1.23.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.50.0",
"@opentelemetry/exporter-zipkin": "^1.23.0",
"@opentelemetry/instrumentation": "^0.50.0",
"@opentelemetry/instrumentation-document-load": "^0.37.0",
"@opentelemetry/instrumentation-fetch": "^0.50.0",
"@opentelemetry/instrumentation-xml-http-request": "^0.50.0",
"@opentelemetry/resources": "^1.23.0",
"@opentelemetry/sdk-trace-base": "^1.23.0",
"@opentelemetry/sdk-trace-web": "^1.23.0",
"@opentelemetry/semantic-conventions": "^1.23.0",
"shimmer": "^1.2.1",
"web-vitals": "^3.5.2"
},
Expand Down
5 changes: 2 additions & 3 deletions packages/web/src/exporters/zipkin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import {
defaultStatusErrorTagName,
} from '@opentelemetry/exporter-zipkin/build/src/transform.js';
import { ExportResult, ExportResultCode } from '@opentelemetry/core';
import { SpanKind } from '@opentelemetry/api';
import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base';
import { limitLen } from '../utils';
import { NOOP_ATTRIBUTES_TRANSFORMER, NATIVE_XHR_SENDER, NATIVE_BEACON_SENDER, SplunkExporterConfig } from './common';
Expand Down Expand Up @@ -52,7 +51,7 @@ export interface ZipkinSpan {
name: string;
parentId?: string;
id: string;
kind?: SpanKind;
kind?: 'CLIENT' | 'SERVER' | 'CONSUMER' | 'PRODUCER';
timestamp: number;
duration: number;
debug?: boolean;
Expand Down Expand Up @@ -93,7 +92,7 @@ export class SplunkZipkinExporter implements SpanExporter {
if (document.hidden && this._beaconSender && zJson.length <= 64000) {
this._beaconSender(this.beaconUrl, zJson);
} else {
this._xhrSender(this.beaconUrl, zJson, {
this._xhrSender!(this.beaconUrl, zJson, {
Accept: '*/*',
'Content-Type': 'text/plain;charset=UTF-8',
});
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/webvitals.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ limitations under the License.
*/

import { TracerProvider, Tracer } from '@opentelemetry/api';
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore TS1479 in commonjs
import { onCLS, onLCP, onFID, onINP, Metric } from 'web-vitals';
const reported = {};

Expand Down
4 changes: 3 additions & 1 deletion packages/web/tsconfig.base.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"compilerOptions": {
"forceConsistentCasingInFileNames": true,
"moduleResolution": "node",
"module": "ESNext",
"moduleResolution": "Bundler",
"esModuleInterop": false,
"noEmitOnError": true,
"pretty": true,
"resolveJsonModule": true,
Expand Down
1 change: 1 addition & 0 deletions packages/web/tsconfig.cjs.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"compilerOptions": {
"declaration": true,
"module": "CommonJS",
"moduleResolution": "Node10",
"outDir": "./dist/cjs",
"rootDir": "src",
"sourceMap": true
Expand Down
3 changes: 2 additions & 1 deletion packages/web/tsconfig.esm.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"compilerOptions": {
"declaration": true,
"module": "ES6",
"module": "ESNext",
"moduleResolution": "bundler",
"outDir": "./dist/esm",
"rootDir": "src",
"sourceMap": true
Expand Down
Loading