chore: merging distributed-tracing into observability

ONBOARDING.md

@@ -25,7 +25,6 @@ This documents contains the onboarding guide for hypertrace-ui.
   - [Common](https://github.com/hypertrace/hypertrace-ui/tree/main/projects/common)
   - [Components](https://github.com/hypertrace/hypertrace-ui/tree/main/projects/components)
   - [Dashboards](https://github.com/hypertrace/hypertrace-ui/tree/main/projects/dashboards)
-  - [Distributed Tracing](https://github.com/hypertrace/hypertrace-ui/tree/main/projects/distributed-tracing)
   - [Observability](https://github.com/hypertrace/hypertrace-ui/tree/main/projects/observability)
 
 - [Hypertrace ui app](https://github.com/hypertrace/hypertrace-ui/tree/main/src)

angular.json

@@ -29,11 +29,6 @@
                 "input": "./projects/assets-library/assets",
                 "output": "./assets"
               },
-              {
-                "glob": "**/*",
-                "input": "./projects/distributed-tracing/assets",
-                "output": "./assets"
-              },
               {
                 "glob": "**/*",
                 "input": "./projects/observability/assets",
@@ -177,40 +172,6 @@
         }
       }
     },
-    "distributed-tracing": {
-      "root": "projects/distributed-tracing",
-      "sourceRoot": "projects/distributed-tracing",
-      "projectType": "library",
-      "prefix": "lib",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-angular:ng-packagr",
-          "options": {
-            "tsConfig": "projects/distributed-tracing/tsconfig.lib.json",
-            "project": "projects/distributed-tracing/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "projects/distributed-tracing/tsconfig.lib.prod.json"
-            }
-          }
-        },
-        "test": {
-          "builder": "@angular-builders/jest:run",
-          "options": {}
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "projects/distributed-tracing/tsconfig.lib.json",
-              "projects/distributed-tracing/tsconfig.spec.json"
-            ],
-            "exclude": ["**/node_modules/**"]
-          }
-        }
-      }
-    },
     "components": {
       "root": "projects/components",
       "sourceRoot": "projects/components",

jest.config.debug.js

@@ -25,7 +25,6 @@ module.exports = {
     '@hypertrace/dashboards/testing': '<rootDir>/projects/dashboards/src/test/public-api.ts',
     '@hypertrace/test-utils': '<rootDir>/projects/test-utils/src/public-api.ts',
     '@hypertrace/graphql-client': '<rootDir>/projects/graphql-client/src/public-api.ts',
-    '@hypertrace/distributed-tracing': '<rootDir>/projects/distributed-tracing/src/public-api.ts',
     '@hypertrace/observability': '<rootDir>/projects/observability/src/public-api.ts'
   }
 };

jest.config.js

@@ -50,7 +50,6 @@ module.exports = {
     '@hypertrace/dashboards/testing': '<rootDir>/projects/dashboards/src/test/public-api.ts',
     '@hypertrace/test-utils': '<rootDir>/projects/test-utils/src/public-api.ts',
     '@hypertrace/graphql-client': '<rootDir>/projects/graphql-client/src/public-api.ts',
-    '@hypertrace/distributed-tracing': '<rootDir>/projects/distributed-tracing/src/public-api.ts',
     '@hypertrace/observability': '<rootDir>/projects/observability/src/public-api.ts'
   }
 };

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

@@ -1,4 +1,4 @@
-import { MetricAggregation } from '@hypertrace/distributed-tracing';
+import { MetricAggregation } from '@hypertrace/observability';
 import { TableCellParser } from '../table-cell-parser';
 import { TableCellParserBase } from '../table-cell-parser-base';
 import { CoreTableCellParserType } from '../types/core-table-cell-parser-type';

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

@@ -9,10 +9,10 @@ import {
   TimeRangeService,
   TimeUnit
 } from '@hypertrace/common';
-import { GraphQlQueryEventService, MetadataService } from '@hypertrace/distributed-tracing';
 import { GraphQlRequestService } from '@hypertrace/graphql-client';
 import { ModelJson } from '@hypertrace/hyperdash';
 import { DashboardManagerService, LoggerService, RENDERER_API } from '@hypertrace/hyperdash-angular';
+import { GraphQlQueryEventService, MetadataService } from '@hypertrace/observability';
 import { getMockFlexLayoutProviders } from '@hypertrace/test-utils';
 import { mockProvider, Spectator } from '@ngneat/spectator/jest';
 import { EMPTY, of } from 'rxjs';

projects/observability/package.json

@@ -13,7 +13,6 @@
     "@hypertrace/common": "^0.0.0",
     "@hypertrace/components": "^0.0.0",
     "@hypertrace/dashboards": "^0.0.0",
-    "@hypertrace/distributed-tracing": "^0.0.0",
     "@hypertrace/hyperdash-angular": "^2.6.0",
     "@hypertrace/hyperdash": "^1.2.1",
     "d3-array": "^2.12.0",

projects/observability/src/pages/api-trace-detail/api-trace-detail.page.component.ts

@@ -2,8 +2,8 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { IconType } from '@hypertrace/assets-library';
 import { NavigationService, SubscriptionLifecycle } from '@hypertrace/common';
 import { ButtonRole, ButtonStyle, IconSize } from '@hypertrace/components';
-import { LogEvent } from '@hypertrace/distributed-tracing';
 import { Observable } from 'rxjs';
+import { LogEvent } from '../../shared/dashboard/widgets/waterfall/waterfall/waterfall-chart';
 import { ApiTraceDetails, ApiTraceDetailService } from './api-trace-detail.service';
 
 @Component({

projects/observability/src/pages/api-trace-detail/api-trace-detail.page.module.ts

@@ -11,7 +11,8 @@ import {
   NavigableTabModule,
   SummaryValueModule
 } from '@hypertrace/components';
-import { LogEventsTableModule, NavigableDashboardModule } from '@hypertrace/distributed-tracing';
+import { LogEventsTableModule } from '../../shared/components/log-events/log-events-table.module';
+import { NavigableDashboardModule } from '../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module';
 import { ObservabilityDashboardModule } from '../../shared/dashboard/observability-dashboard.module';
 import { ApiTraceDetailPageComponent } from './api-trace-detail.page.component';
 import { ApiTraceLogsComponent } from './logs/api-trace-logs.component';