Skip to content
This repository was archived by the owner on Dec 30, 2024. It is now read-only.

Commit 5cf1fc3

Browse files
1.2.5-2023.8.17 (#242)
* fix/improvements for clickhouse queries for metrics datasources * feat/clickhouse version 23.7.1 * fix/improvements for clickhouse queries after update to 23.7.1 * fix/querybuilder for clickhouse datasource, improvements for panel data fetching, isEmpty util for arrays * fix/create session fix, possibility to leave project * fix/missing loading on dashboard update * fix/compilation fix, view configs with version * fix/build fix * Bump @nestjs/cli from 9.4.2 to 10.1.11 in /lib (#238) Bumps [@nestjs/cli](https://github.com/nestjs/nest-cli) from 9.4.2 to 10.1.11. - [Release notes](https://github.com/nestjs/nest-cli/releases) - [Changelog](https://github.com/nestjs/nest-cli/blob/master/.release-it.json) - [Commits](nestjs/nest-cli@9.4.2...10.1.11) --- updated-dependencies: - dependency-name: "@nestjs/cli" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump eslint-config-prettier from 8.8.0 to 8.9.0 in /lib (#233) Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 8.8.0 to 8.9.0. - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md) - [Commits](prettier/eslint-config-prettier@v8.8.0...v8.9.0) --- updated-dependencies: - dependency-name: eslint-config-prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump @nestjs/websockets from 9.0.5 to 9.4.3 in /lib (#200) Bumps [@nestjs/websockets](https://github.com/nestjs/nest/tree/HEAD/packages/websockets) from 9.0.5 to 9.4.3. - [Release notes](https://github.com/nestjs/nest/releases) - [Commits](https://github.com/nestjs/nest/commits/v9.4.3/packages/websockets) --- updated-dependencies: - dependency-name: "@nestjs/websockets" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump @clickhouse/client from 0.1.1 to 0.2.0 in /relay-worker (#230) Bumps [@clickhouse/client](https://github.com/ClickHouse/clickhouse-js) from 0.1.1 to 0.2.0. - [Release notes](https://github.com/ClickHouse/clickhouse-js/releases) - [Changelog](https://github.com/ClickHouse/clickhouse-js/blob/main/CHANGELOG.md) - [Commits](ClickHouse/clickhouse-js@0.1.1...0.2.0) --- updated-dependencies: - dependency-name: "@clickhouse/client" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump postcss-preset-env from 8.5.1 to 9.1.0 in /public (#236) Bumps [postcss-preset-env](https://github.com/csstools/postcss-plugins/tree/HEAD/plugin-packs/postcss-preset-env) from 8.5.1 to 9.1.0. - [Changelog](https://github.com/csstools/postcss-plugins/blob/main/plugin-packs/postcss-preset-env/CHANGELOG.md) - [Commits](https://github.com/csstools/postcss-plugins/commits/HEAD/plugin-packs/postcss-preset-env) --- updated-dependencies: - dependency-name: postcss-preset-env dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix/sdk enum extensions for java * fix/new sdk payload object structures and mapping to clickohuse db * fix/migration for spans table in clickhouse * bump/nestjs bump to v10 * feat/nestjs version, java option when select sdk * fix/multiple improvements for traces and incidents preview due to add java sdk * fix/details column in incidents table * fix/screenshots * Update README.md * Update README.md * Update README.md * fix/incidents grouping postgres query, platform visualization as iterate over dictionary fields * feat/v1.2.5-2023.8.18 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 7389352 commit 5cf1fc3

50 files changed

Lines changed: 541 additions & 436 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
-43.8 KB
Loading
-32.7 KB
Loading

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,12 @@ The full Traceo platform documentation can be found [here](https://github.com/tr
5757
# SDK
5858
To start using the Traceo platform, you need to integrate with the [Traceo SDK](https://github.com/traceo-io/traceo-node). Information about the process of implementing the SDK in your software is included in the README file of each SDK.
5959

60-
- [`@traceo-sdk/node`](https://github.com/traceo-dev/traceo-sdk/tree/develop/packages/node) - NodeJS
61-
- [`@traceo-sdk/opentelemetry-node`](https://github.com/traceo-dev/traceo-sdk/tree/develop/packages/opentelemetry-node) - Open Telemetry for NodeJS
62-
- [`@traceo-sdk/react`](https://github.com/traceo-dev/traceo-sdk/tree/develop/packages/react) - React
63-
- [`@traceo-sdk/vue`](https://github.com/traceo-dev/traceo-sdk/tree/develop/packages/vue) - Vue
60+
- [`traceo-sdk/java`](https://github.com/traceo-dev/traceo-java/blob/master/traceo-sdk/README.md) - Java
61+
- [`traceo-sdk/opentelemetry-java`](https://github.com/traceo-dev/traceo-java/blob/master/traceo-sdk-opentelemetry/README.md) - Open Telemetry for Java
62+
- [`traceo-sdk/node`](https://github.com/traceo-dev/traceo-sdk/tree/develop/packages/node) - NodeJS
63+
- [`traceo-sdk/opentelemetry-node`](https://github.com/traceo-dev/traceo-sdk/tree/develop/packages/opentelemetry-node) - Open Telemetry for NodeJS
64+
- [`traceo-sdk/react`](https://github.com/traceo-dev/traceo-sdk/tree/develop/packages/react) - React
65+
- [`traceo-sdk/vue`](https://github.com/traceo-dev/traceo-sdk/tree/develop/packages/vue) - Vue
6466

6567
Remember that for each version of the Traceo platform there may be a specific SDK version. You can monitor them in [Release](https://github.com/traceo-dev/traceo/releases).
6668

lib/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"@nestjs/serve-static": "^4.0.0",
3434
"@nestjs/swagger": "^5.2.1",
3535
"@nestjs/typeorm": "^10.0.0",
36-
"@nestjs/websockets": "9.0.5",
36+
"@nestjs/websockets": "10.1.3",
3737
"@traceo/types": "0.0.0",
3838
"@types/compression": "^1.7.2",
3939
"@types/cookie-parser": "^1.4.3",
@@ -66,13 +66,13 @@
6666
"typeorm": "^0.3.16"
6767
},
6868
"devDependencies": {
69-
"@nestjs/cli": "9.4.2",
69+
"@nestjs/cli": "10.1.11",
7070
"@nestjs/schematics": "^10.0.1",
7171
"@nestjs/testing": "^9.4.3",
7272
"@typescript-eslint/eslint-plugin": "^5.61.0",
7373
"@typescript-eslint/parser": "^5.27.1",
7474
"eslint": "^8.45.0",
75-
"eslint-config-prettier": "8.8.0",
75+
"eslint-config-prettier": "8.9.0",
7676
"eslint-plugin-import": "^2.26.0",
7777
"eslint-plugin-prettier": "^4.2.1",
7878
"eslint-plugin-unused-imports": "^2.0.0",

lib/src/api/capture/capture.controller.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import {
55
IncidentEventPayload,
66
Dictionary,
77
BrowserPerfsPayloadEvent,
8-
MetricData
8+
MetricData,
9+
TraceoMetric,
10+
TraceoSpan
911
} from "@traceo/types";
1012
import { Request } from "express";
1113
import { ApiResponse } from "../../common/types/dto/response.dto";
@@ -52,7 +54,7 @@ export class CaptureController {
5254

5355
@Post("/metrics")
5456
async handleMetrics(
55-
@Body() data: MetricData[],
57+
@Body() data: TraceoMetric[],
5658
@Headers() headers: Dictionary<string>,
5759
@Req() req: Request
5860
): Promise<ApiResponse<string> | undefined | void> {
@@ -69,7 +71,7 @@ export class CaptureController {
6971

7072
@Post("/traces")
7173
async handleTracing(
72-
@Body() body: MetricData[],
74+
@Body() body: TraceoSpan[],
7375
@Headers() headers: Dictionary<string>,
7476
@Req() req: Request
7577
): Promise<ApiResponse<string> | undefined | void> {

lib/src/api/logs/logs-query/logs-query.service.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { INTERNAL_SERVER_ERROR } from "../../../common/helpers/constants";
44
import { ClickhouseService } from "../../../common/services/clickhouse/clickhouse.service";
55
import { LogsQuery } from "../../../common/types/dto/logs.dto";
66
import { ApiResponse } from "../../../common/types/dto/response.dto";
7+
import { calculateInterval } from "../../../common/helpers/interval";
78

89
type LogsResponseType = {
910
logs: ILog[];
@@ -37,8 +38,10 @@ export class LogsQueryService {
3738

3839
public async getLogsGraphPayload(query: LogsQuery): Promise<ApiResponse<GraphResposnseType>> {
3940
try {
40-
// 2 minutes interval
41-
const INTERVAL = 60 * 2;
41+
const INTERVAL = calculateInterval({
42+
from: query.from,
43+
to: query.to
44+
})
4245
const logs = await this.clickhouseClient.loadLogsTimeSeries(query, INTERVAL);
4346

4447
// TODO: Mapping should be also in clickhouse query

lib/src/api/member/member.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { ApiResponse } from "../../common/types/dto/response.dto";
1111
import { MemberRole } from "@traceo/types";
1212
import { Project } from "../../db/entities/project.entity";
1313
import { User } from "../../db/entities/user.entity";
14-
import { RequestContext } from "src/common/middlewares/request-context/request-context.model";
14+
import { RequestContext } from "../../common/middlewares/request-context/request-context.model";
1515

1616
/**
1717
* Member is an user attached to project

lib/src/common/helpers/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export const ADMIN_EMAIL = "admin@localhost";
22
export const ADMIN_NAME = "admin";
33

4-
export const VERSION = "1.2.4-2023.8.3";
4+
export const VERSION = "1.2.5-2023.8.18";
55

66
export const SESSION_NAME = "traceo_session";
77
export const SESSION_EXPIRY_TIME = 60 * 1000 * 60 * 24; //24h

lib/src/common/middlewares/request-context/request-context.middleware.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ export class RequestContextMiddleware implements NestMiddleware<Request, Respons
1616

1717
async use(req: ExtendedRequest, res: Response, next: () => void) {
1818
const sessionID = req.cookies[SESSION_NAME];
19-
2019
if (!sessionID) {
2120
throw new UnauthorizedException();
2221
} else {

lib/src/common/services/clickhouse/clickhouse.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ export class ClickhouseService {
355355
}
356356

357357
if (query?.traceKind) {
358-
sqlQuery += `AND kind = ${query.traceKind} \n`;
358+
sqlQuery += `AND kind = '${query.traceKind.toUpperCase()}' \n`;
359359
}
360360

361361
if (query?.durationMax) {

0 commit comments

Comments
 (0)