Skip to content

Commit 1f175de

Browse files
chore: merging distributed-tracing into observability (#1090)
1 parent c5cedd3 commit 1f175de

File tree

403 files changed

+565
-740
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+565
-740
lines changed

ONBOARDING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ This documents contains the onboarding guide for hypertrace-ui.
2525
- [Common](https://github.com/hypertrace/hypertrace-ui/tree/main/projects/common)
2626
- [Components](https://github.com/hypertrace/hypertrace-ui/tree/main/projects/components)
2727
- [Dashboards](https://github.com/hypertrace/hypertrace-ui/tree/main/projects/dashboards)
28-
- [Distributed Tracing](https://github.com/hypertrace/hypertrace-ui/tree/main/projects/distributed-tracing)
2928
- [Observability](https://github.com/hypertrace/hypertrace-ui/tree/main/projects/observability)
3029

3130
- [Hypertrace ui app](https://github.com/hypertrace/hypertrace-ui/tree/main/src)

angular.json

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@
2929
"input": "./projects/assets-library/assets",
3030
"output": "./assets"
3131
},
32-
{
33-
"glob": "**/*",
34-
"input": "./projects/distributed-tracing/assets",
35-
"output": "./assets"
36-
},
3732
{
3833
"glob": "**/*",
3934
"input": "./projects/observability/assets",
@@ -177,40 +172,6 @@
177172
}
178173
}
179174
},
180-
"distributed-tracing": {
181-
"root": "projects/distributed-tracing",
182-
"sourceRoot": "projects/distributed-tracing",
183-
"projectType": "library",
184-
"prefix": "lib",
185-
"architect": {
186-
"build": {
187-
"builder": "@angular-devkit/build-angular:ng-packagr",
188-
"options": {
189-
"tsConfig": "projects/distributed-tracing/tsconfig.lib.json",
190-
"project": "projects/distributed-tracing/ng-package.json"
191-
},
192-
"configurations": {
193-
"production": {
194-
"tsConfig": "projects/distributed-tracing/tsconfig.lib.prod.json"
195-
}
196-
}
197-
},
198-
"test": {
199-
"builder": "@angular-builders/jest:run",
200-
"options": {}
201-
},
202-
"lint": {
203-
"builder": "@angular-devkit/build-angular:tslint",
204-
"options": {
205-
"tsConfig": [
206-
"projects/distributed-tracing/tsconfig.lib.json",
207-
"projects/distributed-tracing/tsconfig.spec.json"
208-
],
209-
"exclude": ["**/node_modules/**"]
210-
}
211-
}
212-
}
213-
},
214175
"components": {
215176
"root": "projects/components",
216177
"sourceRoot": "projects/components",

jest.config.debug.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ module.exports = {
2525
'@hypertrace/dashboards/testing': '<rootDir>/projects/dashboards/src/test/public-api.ts',
2626
'@hypertrace/test-utils': '<rootDir>/projects/test-utils/src/public-api.ts',
2727
'@hypertrace/graphql-client': '<rootDir>/projects/graphql-client/src/public-api.ts',
28-
'@hypertrace/distributed-tracing': '<rootDir>/projects/distributed-tracing/src/public-api.ts',
2928
'@hypertrace/observability': '<rootDir>/projects/observability/src/public-api.ts'
3029
}
3130
};

jest.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ module.exports = {
5050
'@hypertrace/dashboards/testing': '<rootDir>/projects/dashboards/src/test/public-api.ts',
5151
'@hypertrace/test-utils': '<rootDir>/projects/test-utils/src/public-api.ts',
5252
'@hypertrace/graphql-client': '<rootDir>/projects/graphql-client/src/public-api.ts',
53-
'@hypertrace/distributed-tracing': '<rootDir>/projects/distributed-tracing/src/public-api.ts',
5453
'@hypertrace/observability': '<rootDir>/projects/observability/src/public-api.ts'
5554
}
5655
};

projects/components/src/table/cells/data-parsers/table-cell-string-parser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { MetricAggregation } from '@hypertrace/distributed-tracing';
1+
import { MetricAggregation } from '@hypertrace/observability';
22
import { TableCellParser } from '../table-cell-parser';
33
import { TableCellParserBase } from '../table-cell-parser-base';
44
import { CoreTableCellParserType } from '../types/core-table-cell-parser-type';

projects/dashboards/src/test/dashboard-verification.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import {
99
TimeRangeService,
1010
TimeUnit
1111
} from '@hypertrace/common';
12-
import { GraphQlQueryEventService, MetadataService } from '@hypertrace/distributed-tracing';
1312
import { GraphQlRequestService } from '@hypertrace/graphql-client';
1413
import { ModelJson } from '@hypertrace/hyperdash';
1514
import { DashboardManagerService, LoggerService, RENDERER_API } from '@hypertrace/hyperdash-angular';
15+
import { GraphQlQueryEventService, MetadataService } from '@hypertrace/observability';
1616
import { getMockFlexLayoutProviders } from '@hypertrace/test-utils';
1717
import { mockProvider, Spectator } from '@ngneat/spectator/jest';
1818
import { EMPTY, of } from 'rxjs';

projects/distributed-tracing/README.md

Lines changed: 0 additions & 25 deletions
This file was deleted.

projects/distributed-tracing/jest.config.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

projects/distributed-tracing/ng-package.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

projects/distributed-tracing/package.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)