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

fix: bump otel #763

Merged
merged 9 commits into from
Jan 8, 2025
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
22 changes: 11 additions & 11 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@
"@grafana/faro-web-tracing": "^1.12.2",
"@grpc/grpc-js": "^1.9.0",
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/core": "^1.26.0",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.53.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/instrumentation-express": "^0.41.1",
"@opentelemetry/instrumentation-http": "^0.53.0",
"@opentelemetry/instrumentation-pg": "^0.43.0",
"@opentelemetry/instrumentation-winston": "^0.39.0",
"@opentelemetry/resources": "^1.26.0",
"@opentelemetry/sdk-node": "^0.53.0",
"@opentelemetry/sdk-trace-node": "^1.26.0",
"@opentelemetry/semantic-conventions": "^1.27.0",
"@opentelemetry/core": "^1.30.0",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.57.0",
"@opentelemetry/instrumentation": "^0.57.0",
"@opentelemetry/instrumentation-express": "^0.47.0",
"@opentelemetry/instrumentation-http": "^0.57.0",
"@opentelemetry/instrumentation-pg": "^0.50.0",
"@opentelemetry/instrumentation-winston": "^0.44.0",
"@opentelemetry/resources": "^1.30.0",
"@opentelemetry/sdk-node": "^0.57.0",
"@opentelemetry/sdk-trace-node": "^1.30.0",
"@opentelemetry/semantic-conventions": "^1.28.0",
"@reduxjs/toolkit": "^2.3.0",
"bcrypt": "^5.1.0",
"body-parser": "^1.20.1",
Expand Down
2 changes: 1 addition & 1 deletion experimental/transport-otlp-http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@
"access": "public"
},
"dependencies": {
"@opentelemetry/semantic-conventions": "^1.27.0"
"@opentelemetry/semantic-conventions": "^1.28.0"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IAnyValue, IKeyValue } from '@opentelemetry/otlp-transformer';
import type { IAnyValue, IKeyValue } from '@opentelemetry/otlp-transformer/build/src/common/internal-types';

import { isArray, isBoolean, isInt, isNumber, isObject, isString } from '@grafana/faro-core';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IKeyValue } from '@opentelemetry/otlp-transformer';
import type { IKeyValue } from '@opentelemetry/otlp-transformer/build/src/common/internal-types';
import {
ATTR_EXCEPTION_MESSAGE,
ATTR_EXCEPTION_TYPE,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { IKeyValue, IResource, IResourceSpans } from '@opentelemetry/otlp-transformer';
import type { IKeyValue, IResource } from '@opentelemetry/otlp-transformer/build/src/common/internal-types';
import type { IResourceSpans } from '@opentelemetry/otlp-transformer/build/src/trace/internal-types';

import type { APIEvent, Meta, TraceEvent, TransportItem } from '@grafana/faro-core';

Expand Down
5 changes: 4 additions & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@
},
"dependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/otlp-transformer": "^0.53.0"
"@opentelemetry/otlp-transformer": "^0.57.0"
},
"devDependencies": {
"@types/node": "^22.10.2"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/api/traces/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { ContextAPI as OTELContextAPI, TraceAPI as OTELTraceAPI } from '@opentelemetry/api';
import type { IResourceSpans } from '@opentelemetry/otlp-transformer';
import type { IResourceSpans } from '@opentelemetry/otlp-transformer/build/src/trace/internal-types';

// TODO: Revert temporary patching
// in latest OpenTelemetry packages protobuf type "instrumentationLibrary" has been renamed to "scope"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/transports/utils.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IResourceSpans } from '@opentelemetry/otlp-transformer';
import type { IResourceSpans } from '@opentelemetry/otlp-transformer/build/src/trace/internal-types';

import {
EventEvent,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/transports/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IResourceSpans } from '@opentelemetry/otlp-transformer';
import type { IResourceSpans } from '@opentelemetry/otlp-transformer/build/src/trace/internal-types';

import type { EventEvent, ExceptionEvent, LogEvent, MeasurementEvent, TraceEvent } from '..';

Expand Down
1 change: 1 addition & 0 deletions packages/web-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"web-vitals": "^4.0.1"
},
"devDependencies": {
"@types/node": "^22.10.2",
"@types/ua-parser-js": "^0.7.36",
"user-agent-data-types": "^0.4.2"
},
Expand Down
1 change: 1 addition & 0 deletions packages/web-tracing/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ module.exports = {
...jestBaseConfig,
roots: ['packages/web-tracing/src'],
testEnvironment: 'jsdom',
setupFiles: ['<rootDir>/packages/web-tracing/setup.jest.ts'],
};
20 changes: 10 additions & 10 deletions packages/web-tracing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@
"dependencies": {
"@grafana/faro-web-sdk": "^1.12.2",
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/context-zone": "1.26.0",
"@opentelemetry/core": "^1.26.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.53.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/instrumentation-fetch": "^0.53.0",
"@opentelemetry/instrumentation-xml-http-request": "^0.53.0",
"@opentelemetry/otlp-transformer": "^0.53.0",
"@opentelemetry/resources": "^1.26.0",
"@opentelemetry/sdk-trace-web": "^1.26.0",
"@opentelemetry/semantic-conventions": "^1.27.0"
"@opentelemetry/context-zone": "1.30.0",
"@opentelemetry/core": "^1.30.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.57.0",
"@opentelemetry/instrumentation": "^0.57.0",
"@opentelemetry/instrumentation-fetch": "^0.57.0",
"@opentelemetry/instrumentation-xml-http-request": "^0.57.0",
"@opentelemetry/otlp-transformer": "^0.57.0",
"@opentelemetry/resources": "^1.30.0",
"@opentelemetry/sdk-trace-web": "^1.30.0",
"@opentelemetry/semantic-conventions": "^1.28.0"
},
"publishConfig": {
"access": "public"
Expand Down
3 changes: 3 additions & 0 deletions packages/web-tracing/setup.jest.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { TextDecoder, TextEncoder } from 'node:util';

Object.assign(global, { TextEncoder, TextDecoder });
2 changes: 1 addition & 1 deletion packages/web-tracing/src/faroTraceExporter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ExportResultCode } from '@opentelemetry/core';
import type { ExportResult } from '@opentelemetry/core';
import { createExportTraceServiceRequest } from '@opentelemetry/otlp-transformer';
import { createExportTraceServiceRequest } from '@opentelemetry/otlp-transformer/build/src/trace/internal';
import type { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-web';

import { sendFaroEvents } from './faroTraceExporter.utils';
Expand Down
2 changes: 1 addition & 1 deletion packages/web-tracing/src/faroTraceExporter.utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { SpanContext } from '@opentelemetry/api';
import { ESpanKind, IResourceSpans } from '@opentelemetry/otlp-transformer';
import { ESpanKind, type IResourceSpans } from '@opentelemetry/otlp-transformer/build/src/trace/internal-types';

import { faro, unknownString } from '@grafana/faro-core';
import type { EventAttributes as FaroEventAttributes } from '@grafana/faro-web-sdk';
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"skipLibCheck": true,
"sourceMap": true,
"strict": true,
"types": ["jest"]
"types": ["jest", "node"]
},
"ts-node": {
"esm": true
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.base.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"extends": "./tsconfig.base.cjs.json",
"compilerOptions": {
"isolatedModules": false,
"types": ["jest"]
"types": ["jest", "node"]
}
}
Loading
Loading