diff --git a/ONBOARDING.md b/ONBOARDING.md index c44fd7a2d..c5fda812b 100644 --- a/ONBOARDING.md +++ b/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) diff --git a/angular.json b/angular.json index cd7ef0259..bbb106c08 100644 --- a/angular.json +++ b/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", diff --git a/jest.config.debug.js b/jest.config.debug.js index d61172afd..ef57db07e 100644 --- a/jest.config.debug.js +++ b/jest.config.debug.js @@ -25,7 +25,6 @@ module.exports = { '@hypertrace/dashboards/testing': '/projects/dashboards/src/test/public-api.ts', '@hypertrace/test-utils': '/projects/test-utils/src/public-api.ts', '@hypertrace/graphql-client': '/projects/graphql-client/src/public-api.ts', - '@hypertrace/distributed-tracing': '/projects/distributed-tracing/src/public-api.ts', '@hypertrace/observability': '/projects/observability/src/public-api.ts' } }; diff --git a/jest.config.js b/jest.config.js index 8a17fbe50..1b6b44ec3 100644 --- a/jest.config.js +++ b/jest.config.js @@ -50,7 +50,6 @@ module.exports = { '@hypertrace/dashboards/testing': '/projects/dashboards/src/test/public-api.ts', '@hypertrace/test-utils': '/projects/test-utils/src/public-api.ts', '@hypertrace/graphql-client': '/projects/graphql-client/src/public-api.ts', - '@hypertrace/distributed-tracing': '/projects/distributed-tracing/src/public-api.ts', '@hypertrace/observability': '/projects/observability/src/public-api.ts' } }; diff --git a/projects/components/src/table/cells/data-parsers/table-cell-string-parser.ts b/projects/components/src/table/cells/data-parsers/table-cell-string-parser.ts index 5e9670b0b..a3e3e3f9c 100644 --- a/projects/components/src/table/cells/data-parsers/table-cell-string-parser.ts +++ b/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'; diff --git a/projects/dashboards/src/test/dashboard-verification.ts b/projects/dashboards/src/test/dashboard-verification.ts index 03a8fc7ab..b70d3bf5a 100644 --- a/projects/dashboards/src/test/dashboard-verification.ts +++ b/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'; diff --git a/projects/distributed-tracing/README.md b/projects/distributed-tracing/README.md deleted file mode 100644 index 0b4b273a8..000000000 --- a/projects/distributed-tracing/README.md +++ /dev/null @@ -1,25 +0,0 @@ -# GraphqlHandlers - -This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.1.0. - -## Code scaffolding - -Run `ng generate component component-name --project graphql` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project graphql`. - -> Note: Don't forget to add `--project graphql` or else it will be added to the default project in your `angular.json` file. - -## Build - -Run `ng build graphql` to build the project. The build artifacts will be stored in the `dist/` directory. - -## Publishing - -After building your library with `ng build graphql`, go to the dist folder `cd dist/graphql` and run `npm publish`. - -## Running unit tests - -Run `ng test graphql` to execute the unit tests via [Karma](https://karma-runner.github.io). - -## Further help - -To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). diff --git a/projects/distributed-tracing/jest.config.js b/projects/distributed-tracing/jest.config.js deleted file mode 100644 index f47a9ea87..000000000 --- a/projects/distributed-tracing/jest.config.js +++ /dev/null @@ -1,29 +0,0 @@ -module.exports = { - rootDir: '../../', - collectCoverage: true, - collectCoverageFrom: [ - 'projects/distributed-tracing/src/**/*.ts', - '!**/*.module.ts', - '!**/public_api.ts', - '!projects/distributed-tracing/src/test/**' - ], - coverageDirectory: 'coverage/distributed-tracing', - reporters: [ - 'default', - [ - 'jest-junit', - { - outputDirectory: 'test-results/distributed-tracing' - } - ], - [ - 'jest-html-reporter', - { - outputPath: 'test-results/distributed-tracing/test-report.html' - } - ] - ], - testMatch: ['/projects/distributed-tracing/**/+(*.)+(spec|test).ts'], - modulePathIgnorePatterns: ['BOGUS'], // Need to reset from app project, but empty is merged - watchPathIgnorePatterns: ['test-results'] -}; diff --git a/projects/distributed-tracing/ng-package.json b/projects/distributed-tracing/ng-package.json deleted file mode 100644 index bd241bcbd..000000000 --- a/projects/distributed-tracing/ng-package.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/distributed-tracing", - "assets": ["assets"], - "lib": { - "entryFile": "src/public-api.ts" - } -} diff --git a/projects/distributed-tracing/package.json b/projects/distributed-tracing/package.json deleted file mode 100644 index 3b563aa3d..000000000 --- a/projects/distributed-tracing/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "@hypertrace/distributed-tracing", - "version": "0.0.1", - "peerDependencies": { - "@angular/common": "^12.2.1", - "@angular/core": "^12.2.1", - "@angular/material": "^12.2.1", - "@angular/cdk": "^12.2.1", - "@angular/forms": "^12.2.1", - "rxjs": "~6.6.7", - "lodash-es": "^4.17.21", - "@angular/router": "^12.2.1", - "@hypertrace/graphql-client": "^0.0.0", - "@hypertrace/common": "^0.0.0", - "@hypertrace/components": "^0.0.0", - "@hypertrace/dashboard": "^0.0.0", - "@hypertrace/hyperdash-angular": "^2.6.0", - "@hypertrace/hyperdash": "^1.2.1" - }, - "devDependencies": { - "@hypertrace/test-utils": "^0.0.0" - }, - "dependencies": { - "tslib": "^2.3.1" - } -} diff --git a/projects/distributed-tracing/src/public-api.ts b/projects/distributed-tracing/src/public-api.ts deleted file mode 100644 index e900e2bda..000000000 --- a/projects/distributed-tracing/src/public-api.ts +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Public API Surface of Distributed Tracing - */ - -// Attribute -export * from './shared/graphql/model/schema/enriched-attribute'; - -// Pages -export * from './pages/trace-detail/trace-detail.page.module'; -export * from './pages/trace-detail/logs/trace-logs.component'; -export * from './pages/trace-detail/sequence/trace-sequence.component'; -export * from './pages/spans/span-list.page.module'; - -// Builders -export * from './shared/graphql/request/builders/argument/graphql-argument-builder'; -export * from './shared/graphql/request/builders/selections/graphql-selection-builder'; -export * from './shared/graphql/request/builders/specification/specification-builder'; -export * from './shared/graphql/request/builders/specification/trace/trace-status/trace-status-specification-builder'; - -// Dashboard Graphql -export * from './shared/dashboard/data/graphql/filter/graphql-filter-data-source.model'; -export * from './shared/dashboard/data/graphql/filter/graphql-filter-data-source.model'; -export * from './shared/dashboard/data/graphql/graphql-data-source.model'; -export * from './shared/dashboard/data/graphql/graphql-query-event.service'; -export * from './shared/dashboard/data/graphql/graphql-data-source.module'; -export * from './shared/dashboard/data/graphql/graphql-table-control-options-data-source.model'; -export * from './shared/dashboard/data/graphql/specifiers/attribute-specification.model'; -export * from './shared/dashboard/data/graphql/specifiers/specification.model'; -export * from './shared/dashboard/data/graphql/specifiers/trace-status-specification.model'; -export * from './shared/dashboard/data/graphql/table/table-data-source.model'; -export * from './shared/dashboard/dashboard-wrapper/application-aware-dashboard.component'; -export * from './shared/dashboard/dashboard-wrapper/navigable-dashboard.component'; -export * from './shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; -export * from './shared/dashboard/tracing-dashboard.module'; -export * from './shared/dashboard/widgets/table/table-widget.model'; -export * from './shared/dashboard/widgets/table/table-widget-control.model'; -export * from './shared/dashboard/widgets/table/table-widget-view-toggle.model'; - -// Filter -export * from './shared/services/filter-builder/graphql-filter-builder.service'; - -// Handlers -export * from './shared/graphql/request/handlers/traces/export-spans-graphql-query-handler.service'; -export * from './shared/graphql/request/handlers/traces/trace-graphql-query-handler.service'; -export * from './shared/graphql/request/handlers/traces/traces-graphql-query-handler.service'; -export * from './shared/graphql/request/handlers/spans/span-graphql-query-handler.service'; -export * from './shared/graphql/request/handlers/spans/spans-graphql-query-handler.service'; - -// Icon Types -export * from './shared/icons/tracing-icon-type'; -export * from './shared/icons/tracing-icon-library.module'; - -// Interaction Handler - Deprecated -export { InteractionHandler } from './shared/dashboard/interaction/interaction-handler'; - -// Log Events Table -export * from './shared/components/log-events/log-events-table.component'; -export * from './shared/components/log-events/log-events-table.module'; - -// Metadata -export * from './shared/services/metadata/metadata.service'; -export * from './shared/services/metadata/metadata.service.module'; -export * from './shared/graphql/model/metadata/attribute-metadata'; - -export * from './shared/graphql/model/metrics/metric-aggregation'; -export * from './shared/graphql/model/metrics/metric-health'; - -// Navigation -export * from './shared/services/navigation/tracing-navigation.service'; - -// Schema -export * from './shared/graphql/model/schema/filter/field/graphql-field-filter'; -export * from './shared/graphql/model/schema/filter/id/graphql-id-filter'; - -export * from './shared/graphql/model/schema/filter/graphql-filter'; -export * from './shared/graphql/model/schema/filter/global-graphql-filter.service'; -export { - GraphQlMetricAggregationType, - convertToGraphQlMetricAggregationType -} from './shared/graphql/model/schema/metrics/graphql-metric-aggregation-type'; -export * from './shared/graphql/model/schema/sort/graphql-sort-argument'; -export * from './shared/graphql/model/schema/sort/graphql-sort-direction'; -export * from './shared/graphql/model/schema/sort/graphql-sort-without-direction'; -export * from './shared/graphql/model/schema/sort/graphql-sort-by-specification'; -export * from './shared/graphql/model/schema/timerange/graphql-time-range'; -export * from './shared/graphql/model/schema/specifier/specification'; -export * from './shared/graphql/model/schema/span'; -export * from './shared/graphql/model/schema/trace'; - -// Services -export * from './pages/trace-detail/trace-detail.service'; -export * from './shared/services/log-events/log-events.service'; - -// Span Detail -export { SpanData } from './shared/components/span-detail/span-data'; -export { SpanTitle } from './shared/components/span-detail/span-title'; -export * from './shared/components/span-detail/span-detail.component'; -export * from './shared/components/span-detail/span-detail.module'; -export { SpanDetailLayoutStyle } from './shared/components/span-detail/span-detail-layout-style'; - -// Specifications -export * from './shared/graphql/model/specifications/composite-specification'; -export * from './shared/graphql/model/specifications/metric-specification'; -export * from './shared/graphql/model/specifications/trace-status-specification'; - -// Table -export { SpecificationBackedTableColumnDef } from './shared/dashboard/widgets/table/table-widget-column.model'; -export * from './shared/components/table/tracing-table-cell-renderer.module'; -export * from './shared/components/table/tracing-table-cell-type'; - -// Waterfall -export { WaterfallData } from './shared/dashboard/widgets/waterfall/waterfall/waterfall-chart'; -export { TraceWaterfallDataSourceModel } from './shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model'; -export { traceSequenceDashboard } from './pages/trace-detail/sequence/trace-sequence.dashboard'; -export { TraceDetailPageComponent } from './pages/trace-detail/trace-detail.page.component'; -export { LogEvent } from './shared/dashboard/widgets/waterfall/waterfall/waterfall-chart'; - -// Datasources -export * from './shared/dashboard/widgets/trace-detail/data/trace-detail-data-source.model'; -export * from './shared/dashboard/widgets/span-detail/data/span-detail-data-source.model'; -export * from './shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model'; - -// Detail Sheet -export * from './shared/dashboard/interaction/detail-sheet/detail-sheet-interaction.module'; -export * from './shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.service'; diff --git a/projects/distributed-tracing/tsconfig.lib.json b/projects/distributed-tracing/tsconfig.lib.json deleted file mode 100644 index b373e9692..000000000 --- a/projects/distributed-tracing/tsconfig.lib.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": "../../", - "declaration": true, - "inlineSources": true, - "types": [], - "paths": { - "@hypertrace/assets-library": ["projects/assets-library/src/public-api.ts"], - "@hypertrace/common": ["projects/common/src/public-api.ts"], - "@hypertrace/components": ["projects/components/src/public-api.ts"], - "@hypertrace/dashboards": ["projects/dashboards/src/public-api.ts"], - "@hypertrace/graphql-client": ["projects/graphql-client/src/public-api.ts"], - "@hypertrace/test-utils": ["projects/test-utils/src/public-api.ts"], - "@hypertrace/dashboards/testing": ["projects/dashboards/src/test/public-api.ts"] - } - }, - "angularCompilerOptions": { - "skipTemplateCodegen": true, - "strictMetadataEmit": true, - "enableResourceInlining": true - }, - "exclude": ["**/*.test.ts", "**/*.spec.ts"] -} diff --git a/projects/distributed-tracing/tsconfig.lib.prod.json b/projects/distributed-tracing/tsconfig.lib.prod.json deleted file mode 100644 index cbae79422..000000000 --- a/projects/distributed-tracing/tsconfig.lib.prod.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "./tsconfig.lib.json", - "angularCompilerOptions": { - "enableIvy": false - } -} diff --git a/projects/distributed-tracing/tsconfig.spec.json b/projects/distributed-tracing/tsconfig.spec.json deleted file mode 100644 index bf9ea2742..000000000 --- a/projects/distributed-tracing/tsconfig.spec.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "../../out-tsc/spec", - "types": ["jest", "webpack-env"] - }, - "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"] -} diff --git a/projects/distributed-tracing/tslint.json b/projects/distributed-tracing/tslint.json deleted file mode 100644 index 0946f2096..000000000 --- a/projects/distributed-tracing/tslint.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../tslint.json" -} diff --git a/projects/distributed-tracing/assets/icons/entry-span.svg b/projects/observability/assets/icons/entry-span.svg similarity index 100% rename from projects/distributed-tracing/assets/icons/entry-span.svg rename to projects/observability/assets/icons/entry-span.svg diff --git a/projects/distributed-tracing/assets/icons/exit-span.svg b/projects/observability/assets/icons/exit-span.svg similarity index 100% rename from projects/distributed-tracing/assets/icons/exit-span.svg rename to projects/observability/assets/icons/exit-span.svg diff --git a/projects/distributed-tracing/assets/icons/internal-span.svg b/projects/observability/assets/icons/internal-span.svg similarity index 100% rename from projects/distributed-tracing/assets/icons/internal-span.svg rename to projects/observability/assets/icons/internal-span.svg diff --git a/projects/distributed-tracing/assets/icons/open-tracing.svg b/projects/observability/assets/icons/open-tracing.svg similarity index 100% rename from projects/distributed-tracing/assets/icons/open-tracing.svg rename to projects/observability/assets/icons/open-tracing.svg diff --git a/projects/observability/package.json b/projects/observability/package.json index 06d2f0f5d..dc2cc45e7 100644 --- a/projects/observability/package.json +++ b/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", diff --git a/projects/observability/src/pages/api-trace-detail/api-trace-detail.page.component.ts b/projects/observability/src/pages/api-trace-detail/api-trace-detail.page.component.ts index 7ad23db4f..632ddfa27 100644 --- a/projects/observability/src/pages/api-trace-detail/api-trace-detail.page.component.ts +++ b/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({ diff --git a/projects/observability/src/pages/api-trace-detail/api-trace-detail.page.module.ts b/projects/observability/src/pages/api-trace-detail/api-trace-detail.page.module.ts index 3959947cd..04fa251ce 100644 --- a/projects/observability/src/pages/api-trace-detail/api-trace-detail.page.module.ts +++ b/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'; diff --git a/projects/observability/src/pages/api-trace-detail/api-trace-detail.service.test.ts b/projects/observability/src/pages/api-trace-detail/api-trace-detail.service.test.ts index 02623c3e0..f46085af0 100644 --- a/projects/observability/src/pages/api-trace-detail/api-trace-detail.service.test.ts +++ b/projects/observability/src/pages/api-trace-detail/api-trace-detail.service.test.ts @@ -7,18 +7,15 @@ import { TimeRangeService, TimeUnit } from '@hypertrace/common'; -import { - AttributeMetadataType, - MetadataService, - traceIdKey, - traceTypeKey, - TRACE_GQL_REQUEST -} from '@hypertrace/distributed-tracing'; import { GraphQlRequestService } from '@hypertrace/graphql-client'; import { runFakeRxjs } from '@hypertrace/test-utils'; import { createServiceFactory, mockProvider } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; +import { AttributeMetadataType } from '../../shared/graphql/model/metadata/attribute-metadata'; import { ObservabilityTraceType } from '../../shared/graphql/model/schema/observability-traces'; +import { traceIdKey, traceTypeKey } from '../../shared/graphql/model/schema/trace'; +import { TRACE_GQL_REQUEST } from '../../shared/graphql/request/handlers/traces/trace-graphql-query-handler.service'; +import { MetadataService } from '../../shared/services/metadata/metadata.service'; import { ApiTraceDetailService } from './api-trace-detail.service'; describe('Api TraceDetailService', () => { diff --git a/projects/observability/src/pages/api-trace-detail/api-trace-detail.service.ts b/projects/observability/src/pages/api-trace-detail/api-trace-detail.service.ts index fc5e24c5c..52b668de6 100644 --- a/projects/observability/src/pages/api-trace-detail/api-trace-detail.service.ts +++ b/projects/observability/src/pages/api-trace-detail/api-trace-detail.service.ts @@ -1,23 +1,20 @@ import { Injectable, OnDestroy } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { DateCoercer, DateFormatMode, DateFormatter, ReplayObservable } from '@hypertrace/common'; -import { - AttributeMetadata, - LogEvent, - LogEventsService, - MetadataService, - SpecificationBuilder, - Trace, - TraceGraphQlQueryHandlerService, - traceIdKey, - TraceType, - traceTypeKey, - TRACE_GQL_REQUEST -} from '@hypertrace/distributed-tracing'; import { GraphQlRequestService } from '@hypertrace/graphql-client'; import { Observable, Subject } from 'rxjs'; import { map, shareReplay, switchMap, takeUntil } from 'rxjs/operators'; +import { LogEvent } from '../../shared/dashboard/widgets/waterfall/waterfall/waterfall-chart'; +import { AttributeMetadata } from '../../shared/graphql/model/metadata/attribute-metadata'; import { ObservabilityTraceType } from '../../shared/graphql/model/schema/observability-traces'; +import { Trace, traceIdKey, TraceType, traceTypeKey } from '../../shared/graphql/model/schema/trace'; +import { SpecificationBuilder } from '../../shared/graphql/request/builders/specification/specification-builder'; +import { + TraceGraphQlQueryHandlerService, + TRACE_GQL_REQUEST +} from '../../shared/graphql/request/handlers/traces/trace-graphql-query-handler.service'; +import { LogEventsService } from '../../shared/services/log-events/log-events.service'; +import { MetadataService } from '../../shared/services/metadata/metadata.service'; @Injectable() export class ApiTraceDetailService implements OnDestroy { diff --git a/projects/observability/src/pages/api-trace-detail/logs/api-trace-logs.component.ts b/projects/observability/src/pages/api-trace-detail/logs/api-trace-logs.component.ts index 1baf2d1b0..f22ab6cac 100644 --- a/projects/observability/src/pages/api-trace-detail/logs/api-trace-logs.component.ts +++ b/projects/observability/src/pages/api-trace-detail/logs/api-trace-logs.component.ts @@ -1,6 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { LogEvent, LogEventsTableViewType } from '@hypertrace/distributed-tracing'; import { Observable } from 'rxjs'; +import { LogEventsTableViewType } from '../../../shared/components/log-events/log-events-table.component'; +import { LogEvent } from '../../../shared/dashboard/widgets/waterfall/waterfall/waterfall-chart'; import { ApiTraceDetailService } from './../api-trace-detail.service'; @Component({ diff --git a/projects/observability/src/pages/api-trace-detail/sequence/api-trace-sequence.dashboard.ts b/projects/observability/src/pages/api-trace-detail/sequence/api-trace-sequence.dashboard.ts index 0b127c5c5..eae73bb1f 100644 --- a/projects/observability/src/pages/api-trace-detail/sequence/api-trace-sequence.dashboard.ts +++ b/projects/observability/src/pages/api-trace-detail/sequence/api-trace-sequence.dashboard.ts @@ -1,4 +1,4 @@ -import { DashboardDefaultConfiguration } from '@hypertrace/distributed-tracing'; +import { DashboardDefaultConfiguration } from '../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; export const apiTraceSequenceDashboard: DashboardDefaultConfiguration = { location: 'API_TRACE_SEQUENCE', diff --git a/projects/observability/src/pages/apis/api-detail/api-detail-breadcrumb.resolver.ts b/projects/observability/src/pages/apis/api-detail/api-detail-breadcrumb.resolver.ts index 213bd50ac..2af9fde7e 100644 --- a/projects/observability/src/pages/apis/api-detail/api-detail-breadcrumb.resolver.ts +++ b/projects/observability/src/pages/apis/api-detail/api-detail-breadcrumb.resolver.ts @@ -2,12 +2,13 @@ import { Inject, Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; import { Breadcrumb, NavigationService, TimeRangeService } from '@hypertrace/common'; import { BreadcrumbsService } from '@hypertrace/components'; -import { GraphQlTimeRange, SpecificationBuilder } from '@hypertrace/distributed-tracing'; import { GraphQlRequestCacheability, GraphQlRequestService } from '@hypertrace/graphql-client'; import { Observable } from 'rxjs'; import { map, switchMap, take } from 'rxjs/operators'; import { EntityMetadata, EntityMetadataMap, ENTITY_METADATA } from '../../../shared/constants/entity-metadata'; import { Entity, ObservabilityEntityType } from '../../../shared/graphql/model/schema/entity'; +import { GraphQlTimeRange } from '../../../shared/graphql/model/schema/timerange/graphql-time-range'; +import { SpecificationBuilder } from '../../../shared/graphql/request/builders/specification/specification-builder'; import { EntityGraphQlQueryHandlerService, ENTITY_GQL_REQUEST diff --git a/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.component.test.ts b/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.component.test.ts index e846f4ab6..10c87b3a5 100644 --- a/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.component.test.ts +++ b/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.component.test.ts @@ -1,8 +1,8 @@ import { IconLibraryTestingModule } from '@hypertrace/assets-library'; import { mockDashboardProviders } from '@hypertrace/dashboards/testing'; -import { NavigableDashboardComponent } from '@hypertrace/distributed-tracing'; import { createComponentFactory, mockProvider } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; +import { NavigableDashboardComponent } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.component'; import { ObservabilityEntityType } from '../../../../shared/graphql/model/schema/entity'; import { GraphQlEntityFilter } from '../../../../shared/graphql/model/schema/filter/entity/graphql-entity-filter'; import { EntitiesGraphqlQueryBuilderService } from '../../../../shared/graphql/request/handlers/entities/query/entities-graphql-query-builder.service'; diff --git a/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.component.ts b/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.component.ts index 5f1fd6c15..34a48cc95 100644 --- a/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.component.ts +++ b/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ReplayObservable } from '@hypertrace/common'; -import { NavigableDashboardFilterConfig } from '@hypertrace/distributed-tracing'; import { map } from 'rxjs/operators'; +import { NavigableDashboardFilterConfig } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.component'; import { ApiDetailService } from '../api-detail.service'; import { apiMetricsDashboard } from './api-metrics.dashboard'; diff --git a/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.dashboard.ts b/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.dashboard.ts index 1177c21fa..0a9470ee4 100644 --- a/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.dashboard.ts +++ b/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.dashboard.ts @@ -1,6 +1,7 @@ -import { DashboardDefaultConfiguration, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { LegendPosition } from '../../../../shared/components/legend/legend.component'; import { RED_COLOR_PALETTE } from '../../../../shared/constants/color-palette'; +import { DashboardDefaultConfiguration } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; +import { MetricAggregationType } from '../../../../shared/graphql/model/metrics/metric-aggregation'; export const apiMetricsDashboard: DashboardDefaultConfiguration = { location: 'API_METRICS', diff --git a/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.module.ts b/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.module.ts index b2374c883..7866c017a 100644 --- a/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.module.ts +++ b/projects/observability/src/pages/apis/api-detail/metrics/api-metrics.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FilterBarModule, LoadAsyncModule } from '@hypertrace/components'; -import { NavigableDashboardModule } from '@hypertrace/distributed-tracing'; +import { NavigableDashboardModule } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; import { ObservabilityDashboardModule } from '../../../../shared/dashboard/observability-dashboard.module'; import { ApiMetricsComponent } from './api-metrics.component'; import { apiMetricsDashboard } from './api-metrics.dashboard'; diff --git a/projects/observability/src/pages/apis/api-detail/overview/api-overview.component.ts b/projects/observability/src/pages/apis/api-detail/overview/api-overview.component.ts index 30d29e6eb..fd898b616 100644 --- a/projects/observability/src/pages/apis/api-detail/overview/api-overview.component.ts +++ b/projects/observability/src/pages/apis/api-detail/overview/api-overview.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ReplayObservable } from '@hypertrace/common'; -import { NavigableDashboardFilterConfig } from '@hypertrace/distributed-tracing'; import { map } from 'rxjs/operators'; +import { NavigableDashboardFilterConfig } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.component'; import { ApiDetailService } from '../api-detail.service'; import { apiOverviewDashboard } from './api-overview.dashboard'; diff --git a/projects/observability/src/pages/apis/api-detail/overview/api-overview.dashboard.ts b/projects/observability/src/pages/apis/api-detail/overview/api-overview.dashboard.ts index 14e8d755e..45a638748 100644 --- a/projects/observability/src/pages/apis/api-detail/overview/api-overview.dashboard.ts +++ b/projects/observability/src/pages/apis/api-detail/overview/api-overview.dashboard.ts @@ -1,6 +1,6 @@ import { Color } from '@hypertrace/common'; -import { DashboardDefaultConfiguration, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { LegendPosition } from '../../../../shared/components/legend/legend.component'; +import { DashboardDefaultConfiguration } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; import { defaultPrimaryEdgeMetricCategories, defaultSecondaryEdgeMetricCategories @@ -9,6 +9,7 @@ import { defaultPrimaryNodeMetricCategories, defaultSecondaryNodeMetricCategories } from '../../../../shared/dashboard/widgets/topology/metric/node-metric-category'; +import { MetricAggregationType } from '../../../../shared/graphql/model/metrics/metric-aggregation'; // tslint:disable: max-file-line-count export const apiOverviewDashboard: DashboardDefaultConfiguration = { diff --git a/projects/observability/src/pages/apis/api-detail/overview/api-overview.module.ts b/projects/observability/src/pages/apis/api-detail/overview/api-overview.module.ts index a05548bf1..eb9e18443 100644 --- a/projects/observability/src/pages/apis/api-detail/overview/api-overview.module.ts +++ b/projects/observability/src/pages/apis/api-detail/overview/api-overview.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { LoadAsyncModule } from '@hypertrace/components'; -import { NavigableDashboardModule } from '@hypertrace/distributed-tracing'; +import { NavigableDashboardModule } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; import { ObservabilityDashboardModule } from '../../../../shared/dashboard/observability-dashboard.module'; import { ApiOverviewComponent } from './api-overview.component'; import { apiOverviewDashboard } from './api-overview.dashboard'; diff --git a/projects/observability/src/pages/apis/api-detail/traces/api-trace-list.component.ts b/projects/observability/src/pages/apis/api-detail/traces/api-trace-list.component.ts index 1f9764916..0d249bc33 100644 --- a/projects/observability/src/pages/apis/api-detail/traces/api-trace-list.component.ts +++ b/projects/observability/src/pages/apis/api-detail/traces/api-trace-list.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ReplayObservable } from '@hypertrace/common'; -import { NavigableDashboardFilterConfig } from '@hypertrace/distributed-tracing'; import { map } from 'rxjs/operators'; +import { NavigableDashboardFilterConfig } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.component'; import { ObservabilityTraceType } from '../../../../shared/graphql/model/schema/observability-traces'; import { ApiDetailService } from '../api-detail.service'; import { apiTraceListDashboard } from './api-trace-list.dashboard'; diff --git a/projects/observability/src/pages/apis/api-detail/traces/api-trace-list.dashboard.ts b/projects/observability/src/pages/apis/api-detail/traces/api-trace-list.dashboard.ts index fd5d43fa0..1007d7ec8 100644 --- a/projects/observability/src/pages/apis/api-detail/traces/api-trace-list.dashboard.ts +++ b/projects/observability/src/pages/apis/api-detail/traces/api-trace-list.dashboard.ts @@ -1,6 +1,6 @@ import { CoreTableCellRendererType, TableMode, TableSortDirection, TableStyle } from '@hypertrace/components'; -import { TracingTableCellType } from '@hypertrace/distributed-tracing'; import { ObservabilityTableCellType } from '../../../../shared/components/table/observability-table-cell-type'; +import { TracingTableCellType } from '../../../../shared/components/table/tracing-table-cell-type'; import { ObservabilityTraceType } from '../../../../shared/graphql/model/schema/observability-traces'; export const apiTraceListDashboard = { diff --git a/projects/observability/src/pages/apis/api-detail/traces/api-trace-list.module.ts b/projects/observability/src/pages/apis/api-detail/traces/api-trace-list.module.ts index 6f6393988..af86767c2 100644 --- a/projects/observability/src/pages/apis/api-detail/traces/api-trace-list.module.ts +++ b/projects/observability/src/pages/apis/api-detail/traces/api-trace-list.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { LoadAsyncModule } from '@hypertrace/components'; -import { NavigableDashboardModule } from '@hypertrace/distributed-tracing'; +import { NavigableDashboardModule } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; import { ObservabilityDashboardModule } from '../../../../shared/dashboard/observability-dashboard.module'; import { ApiTraceListComponent } from './api-trace-list.component'; import { apiTraceListDashboard } from './api-trace-list.dashboard'; diff --git a/projects/observability/src/pages/apis/backend-detail/backend-detail-breadcrumb.resolver.ts b/projects/observability/src/pages/apis/backend-detail/backend-detail-breadcrumb.resolver.ts index 4251d59a0..3cb657540 100644 --- a/projects/observability/src/pages/apis/backend-detail/backend-detail-breadcrumb.resolver.ts +++ b/projects/observability/src/pages/apis/backend-detail/backend-detail-breadcrumb.resolver.ts @@ -7,10 +7,11 @@ import { ENTITY_GQL_REQUEST } from '../../../shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service'; -import { GraphQlTimeRange, SpecificationBuilder } from '@hypertrace/distributed-tracing'; import { GraphQlRequestService } from '@hypertrace/graphql-client'; import { Observable } from 'rxjs'; import { map, switchMap, take } from 'rxjs/operators'; +import { GraphQlTimeRange } from '../../../shared/graphql/model/schema/timerange/graphql-time-range'; +import { SpecificationBuilder } from '../../../shared/graphql/request/builders/specification/specification-builder'; import { EntityIconLookupService } from '../../../shared/services/entity/entity-icon-lookup.service'; import { BackendEntity } from './backend-detail.service'; diff --git a/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.component.test.ts b/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.component.test.ts index 745246d61..42dbefdd3 100644 --- a/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.component.test.ts +++ b/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.component.test.ts @@ -1,8 +1,8 @@ import { IconLibraryTestingModule } from '@hypertrace/assets-library'; import { mockDashboardProviders } from '@hypertrace/dashboards/testing'; -import { NavigableDashboardComponent } from '@hypertrace/distributed-tracing'; import { createComponentFactory, mockProvider } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; +import { NavigableDashboardComponent } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.component'; import { ObservabilityEntityType } from '../../../../shared/graphql/model/schema/entity'; import { GraphQlEntityFilter } from '../../../../shared/graphql/model/schema/filter/entity/graphql-entity-filter'; import { EntitiesGraphqlQueryBuilderService } from '../../../../shared/graphql/request/handlers/entities/query/entities-graphql-query-builder.service'; diff --git a/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.component.ts b/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.component.ts index f6a0a038e..6a9a8c158 100644 --- a/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.component.ts +++ b/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ReplayObservable } from '@hypertrace/common'; -import { NavigableDashboardFilterConfig } from '@hypertrace/distributed-tracing'; import { map } from 'rxjs/operators'; +import { NavigableDashboardFilterConfig } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.component'; import { BackendDetailService } from '../backend-detail.service'; import { backendMetricsDashboard } from './backend-metrics.dashboard'; diff --git a/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.dashboard.ts b/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.dashboard.ts index 2f7ecfdc4..00bbc7987 100644 --- a/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.dashboard.ts +++ b/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.dashboard.ts @@ -1,6 +1,7 @@ -import { DashboardDefaultConfiguration, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { LegendPosition } from '../../../../shared/components/legend/legend.component'; import { RED_COLOR_PALETTE } from '../../../../shared/constants/color-palette'; +import { DashboardDefaultConfiguration } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; +import { MetricAggregationType } from '../../../../shared/graphql/model/metrics/metric-aggregation'; export const backendMetricsDashboard: DashboardDefaultConfiguration = { location: 'BACKEND_METRICS', diff --git a/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.module.ts b/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.module.ts index bacbc3cb3..047d1b531 100644 --- a/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.module.ts +++ b/projects/observability/src/pages/apis/backend-detail/metrics/backend-metrics.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { LoadAsyncModule } from '@hypertrace/components'; -import { NavigableDashboardModule } from '@hypertrace/distributed-tracing'; +import { NavigableDashboardModule } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; import { ObservabilityDashboardModule } from '../../../../shared/dashboard/observability-dashboard.module'; import { BackendMetricsComponent } from './backend-metrics.component'; import { backendMetricsDashboard } from './backend-metrics.dashboard'; diff --git a/projects/observability/src/pages/apis/backend-detail/overview/backend-overview.component.ts b/projects/observability/src/pages/apis/backend-detail/overview/backend-overview.component.ts index d4ce900d6..7a90af881 100644 --- a/projects/observability/src/pages/apis/backend-detail/overview/backend-overview.component.ts +++ b/projects/observability/src/pages/apis/backend-detail/overview/backend-overview.component.ts @@ -1,10 +1,11 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { Color, SubscriptionLifecycle } from '@hypertrace/common'; import { CoreTableCellRendererType, TableStyle } from '@hypertrace/components'; -import { MetricAggregationType, TracingTableCellType } from '@hypertrace/distributed-tracing'; import { Dashboard, ModelJson } from '@hypertrace/hyperdash'; import { LegendPosition } from '../../../../shared/components/legend/legend.component'; import { ObservabilityTableCellType } from '../../../../shared/components/table/observability-table-cell-type'; +import { TracingTableCellType } from '../../../../shared/components/table/tracing-table-cell-type'; +import { MetricAggregationType } from '../../../../shared/graphql/model/metrics/metric-aggregation'; import { BackendDetailService } from '../backend-detail.service'; @Component({ diff --git a/projects/observability/src/pages/apis/backend-detail/traces/backend-trace-list.component.ts b/projects/observability/src/pages/apis/backend-detail/traces/backend-trace-list.component.ts index ce117a09f..7cc7f74c3 100644 --- a/projects/observability/src/pages/apis/backend-detail/traces/backend-trace-list.component.ts +++ b/projects/observability/src/pages/apis/backend-detail/traces/backend-trace-list.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ReplayObservable } from '@hypertrace/common'; -import { NavigableDashboardFilterConfig } from '@hypertrace/distributed-tracing'; import { map } from 'rxjs/operators'; +import { NavigableDashboardFilterConfig } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.component'; import { ObservabilityTraceType } from '../../../../shared/graphql/model/schema/observability-traces'; import { BackendDetailService } from '../backend-detail.service'; import { backendTraceListDashboard } from './backend-trace-list.dashboard'; diff --git a/projects/observability/src/pages/apis/backend-detail/traces/backend-trace-list.dashboard.ts b/projects/observability/src/pages/apis/backend-detail/traces/backend-trace-list.dashboard.ts index ea6d7c7f0..bbd5c9212 100644 --- a/projects/observability/src/pages/apis/backend-detail/traces/backend-trace-list.dashboard.ts +++ b/projects/observability/src/pages/apis/backend-detail/traces/backend-trace-list.dashboard.ts @@ -1,5 +1,5 @@ import { CoreTableCellRendererType, TableMode, TableSortDirection, TableStyle } from '@hypertrace/components'; -import { TracingTableCellType } from '@hypertrace/distributed-tracing'; +import { TracingTableCellType } from '../../../../shared/components/table/tracing-table-cell-type'; import { ObservabilityTraceType } from '../../../../shared/graphql/model/schema/observability-traces'; export const backendTraceListDashboard = { diff --git a/projects/observability/src/pages/apis/backend-detail/traces/backend-trace-list.module.ts b/projects/observability/src/pages/apis/backend-detail/traces/backend-trace-list.module.ts index 8f2bdcb5d..8b8d60b11 100644 --- a/projects/observability/src/pages/apis/backend-detail/traces/backend-trace-list.module.ts +++ b/projects/observability/src/pages/apis/backend-detail/traces/backend-trace-list.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { LoadAsyncModule } from '@hypertrace/components'; -import { NavigableDashboardModule } from '@hypertrace/distributed-tracing'; +import { NavigableDashboardModule } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; import { ObservabilityDashboardModule } from '../../../../shared/dashboard/observability-dashboard.module'; import { BackendTraceListComponent } from './backend-trace-list.component'; import { backendTraceListDashboard } from './backend-trace-list.dashboard'; diff --git a/projects/observability/src/pages/apis/backends/backend-list.component.ts b/projects/observability/src/pages/apis/backends/backend-list.component.ts index c587c9c82..ffa7eee2f 100644 --- a/projects/observability/src/pages/apis/backends/backend-list.component.ts +++ b/projects/observability/src/pages/apis/backends/backend-list.component.ts @@ -1,8 +1,8 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { CoreTableCellRendererType, TableSortDirection, TableStyle } from '@hypertrace/components'; -import { TracingTableCellType } from '@hypertrace/distributed-tracing'; import { ModelJson } from '@hypertrace/hyperdash'; import { ObservabilityTableCellType } from '../../../shared/components/table/observability-table-cell-type'; +import { TracingTableCellType } from '../../../shared/components/table/tracing-table-cell-type'; import { ObservabilityEntityType } from '../../../shared/graphql/model/schema/entity'; @Component({ diff --git a/projects/observability/src/pages/apis/endpoints/endpoint-list.dashboard.ts b/projects/observability/src/pages/apis/endpoints/endpoint-list.dashboard.ts index 80df7bc97..9c4069b1e 100644 --- a/projects/observability/src/pages/apis/endpoints/endpoint-list.dashboard.ts +++ b/projects/observability/src/pages/apis/endpoints/endpoint-list.dashboard.ts @@ -1,10 +1,8 @@ import { CoreTableCellRendererType, TableMode, TableSortDirection, TableStyle } from '@hypertrace/components'; -import { - DashboardDefaultConfiguration, - MetricAggregationType, - TracingTableCellType -} from '@hypertrace/distributed-tracing'; import { ObservabilityTableCellType } from '../../../shared/components/table/observability-table-cell-type'; +import { TracingTableCellType } from '../../../shared/components/table/tracing-table-cell-type'; +import { DashboardDefaultConfiguration } from '../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; +import { MetricAggregationType } from '../../../shared/graphql/model/metrics/metric-aggregation'; import { ObservabilityEntityType } from '../../../shared/graphql/model/schema/entity'; export const endpointListDashboard: DashboardDefaultConfiguration = { diff --git a/projects/observability/src/pages/apis/endpoints/endpoint-list.module.ts b/projects/observability/src/pages/apis/endpoints/endpoint-list.module.ts index 14622e718..1675fef5c 100644 --- a/projects/observability/src/pages/apis/endpoints/endpoint-list.module.ts +++ b/projects/observability/src/pages/apis/endpoints/endpoint-list.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { PageHeaderModule } from '@hypertrace/components'; -import { NavigableDashboardModule } from '@hypertrace/distributed-tracing'; +import { NavigableDashboardModule } from '../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; import { ObservabilityDashboardModule } from '../../../shared/dashboard/observability-dashboard.module'; import { EndpointListComponent } from './endpoint-list.component'; import { endpointListDashboard } from './endpoint-list.dashboard'; diff --git a/projects/observability/src/pages/apis/service-detail/apis/service-apis-list.dashboard.ts b/projects/observability/src/pages/apis/service-detail/apis/service-apis-list.dashboard.ts index cd5fede26..bd66786b0 100644 --- a/projects/observability/src/pages/apis/service-detail/apis/service-apis-list.dashboard.ts +++ b/projects/observability/src/pages/apis/service-detail/apis/service-apis-list.dashboard.ts @@ -1,6 +1,7 @@ import { CoreTableCellRendererType, TableSortDirection, TableStyle } from '@hypertrace/components'; -import { DashboardDefaultConfiguration, TracingTableCellType } from '@hypertrace/distributed-tracing'; import { ObservabilityTableCellType } from '../../../../shared/components/table/observability-table-cell-type'; +import { TracingTableCellType } from '../../../../shared/components/table/tracing-table-cell-type'; +import { DashboardDefaultConfiguration } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; import { ObservabilityEntityType } from '../../../../shared/graphql/model/schema/entity'; export const serviceApisListDashboard: DashboardDefaultConfiguration = { diff --git a/projects/observability/src/pages/apis/service-detail/apis/service-apis-list.module.ts b/projects/observability/src/pages/apis/service-detail/apis/service-apis-list.module.ts index 7b4be16a3..39d1793b9 100644 --- a/projects/observability/src/pages/apis/service-detail/apis/service-apis-list.module.ts +++ b/projects/observability/src/pages/apis/service-detail/apis/service-apis-list.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FilterBarModule } from '@hypertrace/components'; -import { NavigableDashboardModule } from '@hypertrace/distributed-tracing'; +import { NavigableDashboardModule } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; import { ObservabilityDashboardModule } from '../../../../shared/dashboard/observability-dashboard.module'; import { ServiceApisListComponent } from './service-apis-list.component'; import { serviceApisListDashboard } from './service-apis-list.dashboard'; diff --git a/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.component.test.ts b/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.component.test.ts index 0f13b643f..7917753b0 100644 --- a/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.component.test.ts +++ b/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.component.test.ts @@ -1,8 +1,8 @@ import { IconLibraryTestingModule } from '@hypertrace/assets-library'; import { mockDashboardProviders } from '@hypertrace/dashboards/testing'; -import { NavigableDashboardComponent } from '@hypertrace/distributed-tracing'; import { createComponentFactory, mockProvider } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; +import { NavigableDashboardComponent } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.component'; import { ObservabilityEntityType } from '../../../../shared/graphql/model/schema/entity'; import { GraphQlEntityFilter } from '../../../../shared/graphql/model/schema/filter/entity/graphql-entity-filter'; import { EntitiesGraphqlQueryBuilderService } from '../../../../shared/graphql/request/handlers/entities/query/entities-graphql-query-builder.service'; diff --git a/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.component.ts b/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.component.ts index 5d59ac7bd..b9dd31cfc 100644 --- a/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.component.ts +++ b/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ReplayObservable } from '@hypertrace/common'; -import { NavigableDashboardFilterConfig } from '@hypertrace/distributed-tracing'; import { map } from 'rxjs/operators'; +import { NavigableDashboardFilterConfig } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.component'; import { ServiceDetailService } from '../service-detail.service'; import { serviceMetricsDashboard } from './service-metrics.dashboard'; diff --git a/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.dashboard.ts b/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.dashboard.ts index 2fa57f559..d4ded84dd 100644 --- a/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.dashboard.ts +++ b/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.dashboard.ts @@ -1,6 +1,7 @@ -import { DashboardDefaultConfiguration, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { LegendPosition } from '../../../../shared/components/legend/legend.component'; import { RED_COLOR_PALETTE } from '../../../../shared/constants/color-palette'; +import { DashboardDefaultConfiguration } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; +import { MetricAggregationType } from '../../../../shared/graphql/model/metrics/metric-aggregation'; export const serviceMetricsDashboard: DashboardDefaultConfiguration = { location: 'SERVICE_METRICS', diff --git a/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.module.ts b/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.module.ts index 76630163f..e4f714474 100644 --- a/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.module.ts +++ b/projects/observability/src/pages/apis/service-detail/metrics/service-metrics.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FilterBarModule, LoadAsyncModule } from '@hypertrace/components'; -import { NavigableDashboardModule } from '@hypertrace/distributed-tracing'; +import { NavigableDashboardModule } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; import { ObservabilityDashboardModule } from '../../../../shared/dashboard/observability-dashboard.module'; import { ServiceMetricsComponent } from './service-metrics.component'; import { serviceMetricsDashboard } from './service-metrics.dashboard'; diff --git a/projects/observability/src/pages/apis/service-detail/overview/service-overview.component.ts b/projects/observability/src/pages/apis/service-detail/overview/service-overview.component.ts index e99fe42fe..613d573fc 100644 --- a/projects/observability/src/pages/apis/service-detail/overview/service-overview.component.ts +++ b/projects/observability/src/pages/apis/service-detail/overview/service-overview.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ReplayObservable } from '@hypertrace/common'; -import { NavigableDashboardFilterConfig } from '@hypertrace/distributed-tracing'; import { map } from 'rxjs/operators'; +import { NavigableDashboardFilterConfig } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.component'; import { ServiceDetailService } from '../service-detail.service'; import { serviceOverviewDashboard } from './service-overview.dashboard'; diff --git a/projects/observability/src/pages/apis/service-detail/overview/service-overview.dashboard.ts b/projects/observability/src/pages/apis/service-detail/overview/service-overview.dashboard.ts index c3cae70ce..316a9379a 100644 --- a/projects/observability/src/pages/apis/service-detail/overview/service-overview.dashboard.ts +++ b/projects/observability/src/pages/apis/service-detail/overview/service-overview.dashboard.ts @@ -1,6 +1,6 @@ import { Color } from '@hypertrace/common'; -import { DashboardDefaultConfiguration, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { LegendPosition } from '../../../../shared/components/legend/legend.component'; +import { DashboardDefaultConfiguration } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; import { defaultPrimaryEdgeMetricCategories, defaultSecondaryEdgeMetricCategories @@ -9,6 +9,7 @@ import { defaultPrimaryNodeMetricCategories, defaultSecondaryNodeMetricCategories } from '../../../../shared/dashboard/widgets/topology/metric/node-metric-category'; +import { MetricAggregationType } from '../../../../shared/graphql/model/metrics/metric-aggregation'; import { ObservabilityEntityType } from '../../../../shared/graphql/model/schema/entity'; // tslint:disable: max-file-line-count diff --git a/projects/observability/src/pages/apis/service-detail/overview/service-overview.module.ts b/projects/observability/src/pages/apis/service-detail/overview/service-overview.module.ts index ce5a3b238..670fb99b9 100644 --- a/projects/observability/src/pages/apis/service-detail/overview/service-overview.module.ts +++ b/projects/observability/src/pages/apis/service-detail/overview/service-overview.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { LoadAsyncModule } from '@hypertrace/components'; -import { NavigableDashboardModule } from '@hypertrace/distributed-tracing'; +import { NavigableDashboardModule } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; import { ObservabilityDashboardModule } from '../../../../shared/dashboard/observability-dashboard.module'; import { ServiceOverviewComponent } from './service-overview.component'; import { serviceOverviewDashboard } from './service-overview.dashboard'; diff --git a/projects/observability/src/pages/apis/service-detail/service-detail-breadcrumb.resolver.ts b/projects/observability/src/pages/apis/service-detail/service-detail-breadcrumb.resolver.ts index 4c6e651d4..eb5c0d848 100644 --- a/projects/observability/src/pages/apis/service-detail/service-detail-breadcrumb.resolver.ts +++ b/projects/observability/src/pages/apis/service-detail/service-detail-breadcrumb.resolver.ts @@ -1,11 +1,12 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; import { Breadcrumb, TimeRangeService } from '@hypertrace/common'; -import { GraphQlTimeRange, SpecificationBuilder } from '@hypertrace/distributed-tracing'; import { GraphQlRequestCacheability, GraphQlRequestService } from '@hypertrace/graphql-client'; import { Observable } from 'rxjs'; import { map, switchMap, take } from 'rxjs/operators'; import { ObservabilityEntityType } from '../../../shared/graphql/model/schema/entity'; +import { GraphQlTimeRange } from '../../../shared/graphql/model/schema/timerange/graphql-time-range'; +import { SpecificationBuilder } from '../../../shared/graphql/request/builders/specification/specification-builder'; import { EntityGraphQlQueryHandlerService, ENTITY_GQL_REQUEST diff --git a/projects/observability/src/pages/apis/service-detail/traces/service-trace-list.component.ts b/projects/observability/src/pages/apis/service-detail/traces/service-trace-list.component.ts index 49ce078c8..01204b1b4 100644 --- a/projects/observability/src/pages/apis/service-detail/traces/service-trace-list.component.ts +++ b/projects/observability/src/pages/apis/service-detail/traces/service-trace-list.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ReplayObservable } from '@hypertrace/common'; -import { NavigableDashboardFilterConfig } from '@hypertrace/distributed-tracing'; import { map } from 'rxjs/operators'; +import { NavigableDashboardFilterConfig } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.component'; import { ObservabilityTraceType } from '../../../../shared/graphql/model/schema/observability-traces'; import { ServiceDetailService } from '../service-detail.service'; import { serviceTraceListDashboard } from './service-trace-list.dashboard'; diff --git a/projects/observability/src/pages/apis/service-detail/traces/service-trace-list.dashboard.ts b/projects/observability/src/pages/apis/service-detail/traces/service-trace-list.dashboard.ts index 86a7a2f7a..449648e19 100644 --- a/projects/observability/src/pages/apis/service-detail/traces/service-trace-list.dashboard.ts +++ b/projects/observability/src/pages/apis/service-detail/traces/service-trace-list.dashboard.ts @@ -1,6 +1,6 @@ import { CoreTableCellRendererType, TableMode, TableSortDirection, TableStyle } from '@hypertrace/components'; -import { TracingTableCellType } from '@hypertrace/distributed-tracing'; import { ObservabilityTableCellType } from '../../../../shared/components/table/observability-table-cell-type'; +import { TracingTableCellType } from '../../../../shared/components/table/tracing-table-cell-type'; import { ObservabilityTraceType } from '../../../../shared/graphql/model/schema/observability-traces'; export const serviceTraceListDashboard = { diff --git a/projects/observability/src/pages/apis/service-detail/traces/service-trace-list.module.ts b/projects/observability/src/pages/apis/service-detail/traces/service-trace-list.module.ts index e5e4728a1..939eae270 100644 --- a/projects/observability/src/pages/apis/service-detail/traces/service-trace-list.module.ts +++ b/projects/observability/src/pages/apis/service-detail/traces/service-trace-list.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { LoadAsyncModule } from '@hypertrace/components'; -import { NavigableDashboardModule } from '@hypertrace/distributed-tracing'; +import { NavigableDashboardModule } from '../../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; import { ObservabilityDashboardModule } from '../../../../shared/dashboard/observability-dashboard.module'; import { ServiceTraceListComponent } from './service-trace-list.component'; import { serviceTraceListDashboard } from './service-trace-list.dashboard'; diff --git a/projects/observability/src/pages/apis/services/service-list.dashboard.ts b/projects/observability/src/pages/apis/services/service-list.dashboard.ts index 9839fd346..9335d33c9 100644 --- a/projects/observability/src/pages/apis/services/service-list.dashboard.ts +++ b/projects/observability/src/pages/apis/services/service-list.dashboard.ts @@ -1,6 +1,7 @@ import { CoreTableCellRendererType, TableMode, TableSortDirection, TableStyle } from '@hypertrace/components'; -import { DashboardDefaultConfiguration, TracingTableCellType } from '@hypertrace/distributed-tracing'; import { ObservabilityTableCellType } from '../../../shared/components/table/observability-table-cell-type'; +import { TracingTableCellType } from '../../../shared/components/table/tracing-table-cell-type'; +import { DashboardDefaultConfiguration } from '../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; export const serviceListDashboard: DashboardDefaultConfiguration = { location: 'SERVICE_LIST', diff --git a/projects/observability/src/pages/apis/services/service-list.module.ts b/projects/observability/src/pages/apis/services/service-list.module.ts index f3fff7a1f..b17a63845 100644 --- a/projects/observability/src/pages/apis/services/service-list.module.ts +++ b/projects/observability/src/pages/apis/services/service-list.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { PageHeaderModule } from '@hypertrace/components'; -import { NavigableDashboardModule } from '@hypertrace/distributed-tracing'; +import { NavigableDashboardModule } from '../../../shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; import { ObservabilityDashboardModule } from '../../../shared/dashboard/observability-dashboard.module'; import { ServiceListComponent } from './service-list.component'; import { serviceListDashboard } from './service-list.dashboard'; diff --git a/projects/observability/src/pages/apis/topology/application-flow.component.ts b/projects/observability/src/pages/apis/topology/application-flow.component.ts index 938ec8bd8..9b5b7f344 100644 --- a/projects/observability/src/pages/apis/topology/application-flow.component.ts +++ b/projects/observability/src/pages/apis/topology/application-flow.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { MetricAggregationType } from '@hypertrace/distributed-tracing'; import { ModelJson } from '@hypertrace/hyperdash'; +import { MetricAggregationType } from '../../../shared/graphql/model/metrics/metric-aggregation'; import { defaultPrimaryEdgeMetricCategories, defaultSecondaryEdgeMetricCategories diff --git a/projects/observability/src/pages/explorer/explorer-dashboard-builder.test.ts b/projects/observability/src/pages/explorer/explorer-dashboard-builder.test.ts index 54d57d3af..f3edcb978 100644 --- a/projects/observability/src/pages/explorer/explorer-dashboard-builder.test.ts +++ b/projects/observability/src/pages/explorer/explorer-dashboard-builder.test.ts @@ -1,13 +1,4 @@ import { FilterBuilderLookupService, TableMode, TableStyle } from '@hypertrace/components'; -import { - AttributeMetadataType, - GraphQlFieldFilter, - GraphQlFilterDataSourceModel, - GraphQlOperatorType, - MetadataService, - MetricAggregationType, - TRACES_GQL_REQUEST -} from '@hypertrace/distributed-tracing'; import { Dashboard } from '@hypertrace/hyperdash'; import { recordObservable, runFakeRxjs } from '@hypertrace/test-utils'; import { capitalize } from 'lodash-es'; @@ -17,8 +8,15 @@ import { CartesianSeriesVisualizationType } from '../../shared/components/cartes import { ExploreVisualizationRequest } from '../../shared/components/explore-query-editor/explore-visualization-builder'; import { LegendPosition } from '../../shared/components/legend/legend.component'; import { ExplorerVisualizationCartesianDataSourceModel } from '../../shared/dashboard/data/graphql/explorer-visualization/explorer-visualization-cartesian-data-source.model'; +import { GraphQlFilterDataSourceModel } from '../../shared/dashboard/data/graphql/filter/graphql-filter-data-source.model'; +import { AttributeMetadataType } from '../../shared/graphql/model/metadata/attribute-metadata'; +import { MetricAggregationType } from '../../shared/graphql/model/metrics/metric-aggregation'; +import { GraphQlFieldFilter } from '../../shared/graphql/model/schema/filter/field/graphql-field-filter'; +import { GraphQlOperatorType } from '../../shared/graphql/model/schema/filter/graphql-filter'; import { ObservabilityTraceType } from '../../shared/graphql/model/schema/observability-traces'; import { ExploreSpecificationBuilder } from '../../shared/graphql/request/builders/specification/explore/explore-specification-builder'; +import { TRACES_GQL_REQUEST } from '../../shared/graphql/request/handlers/traces/traces-graphql-query-handler.service'; +import { MetadataService } from '../../shared/services/metadata/metadata.service'; import { ExplorerDashboardBuilder } from './explorer-dashboard-builder'; describe('Explorer dashboard builder', () => { diff --git a/projects/observability/src/pages/explorer/explorer-dashboard-builder.ts b/projects/observability/src/pages/explorer/explorer-dashboard-builder.ts index e9a0ea6f6..cb44e232d 100644 --- a/projects/observability/src/pages/explorer/explorer-dashboard-builder.ts +++ b/projects/observability/src/pages/explorer/explorer-dashboard-builder.ts @@ -7,24 +7,24 @@ import { TableSortDirection, TableStyle } from '@hypertrace/components'; -import { - AttributeMetadata, - AttributeMetadataType, - GraphQlFilter, - GraphQlFilterDataSourceModel, - MetadataService, - SPAN_SCOPE, - toFilterAttributeType, - TracingTableCellType -} from '@hypertrace/distributed-tracing'; import { Dashboard, ModelJson } from '@hypertrace/hyperdash'; import { Observable, of, ReplaySubject, Subject } from 'rxjs'; import { distinctUntilChanged, map, switchMap } from 'rxjs/operators'; import { ExploreVisualizationRequest } from '../../shared/components/explore-query-editor/explore-visualization-builder'; import { LegendPosition } from '../../shared/components/legend/legend.component'; import { ObservabilityTableCellType } from '../../shared/components/table/observability-table-cell-type'; +import { TracingTableCellType } from '../../shared/components/table/tracing-table-cell-type'; import { ExplorerVisualizationCartesianDataSourceModel } from '../../shared/dashboard/data/graphql/explorer-visualization/explorer-visualization-cartesian-data-source.model'; +import { GraphQlFilterDataSourceModel } from '../../shared/dashboard/data/graphql/filter/graphql-filter-data-source.model'; +import { + AttributeMetadata, + AttributeMetadataType, + toFilterAttributeType +} from '../../shared/graphql/model/metadata/attribute-metadata'; +import { GraphQlFilter } from '../../shared/graphql/model/schema/filter/graphql-filter'; import { ObservabilityTraceType } from '../../shared/graphql/model/schema/observability-traces'; +import { SPAN_SCOPE } from '../../shared/graphql/model/schema/span'; +import { MetadataService } from '../../shared/services/metadata/metadata.service'; // tslint:disable: max-file-line-count export class ExplorerDashboardBuilder { diff --git a/projects/observability/src/pages/explorer/explorer-service.test.ts b/projects/observability/src/pages/explorer/explorer-service.test.ts index 2b113a7ee..de4b41a23 100644 --- a/projects/observability/src/pages/explorer/explorer-service.test.ts +++ b/projects/observability/src/pages/explorer/explorer-service.test.ts @@ -1,9 +1,10 @@ import { NavigationParamsType } from '@hypertrace/common'; import { FilterBuilderLookupService, FilterOperator, toUrlFilterOperator } from '@hypertrace/components'; -import { AttributeMetadata, AttributeMetadataType, MetadataService } from '@hypertrace/distributed-tracing'; import { runFakeRxjs } from '@hypertrace/test-utils'; import { createServiceFactory, mockProvider } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; +import { AttributeMetadata, AttributeMetadataType } from '../../shared/graphql/model/metadata/attribute-metadata'; +import { MetadataService } from '../../shared/services/metadata/metadata.service'; import { ExplorerService } from './explorer-service'; import { ScopeQueryParam } from './explorer.component'; diff --git a/projects/observability/src/pages/explorer/explorer-service.ts b/projects/observability/src/pages/explorer/explorer-service.ts index df9c8e05f..004444d05 100644 --- a/projects/observability/src/pages/explorer/explorer-service.ts +++ b/projects/observability/src/pages/explorer/explorer-service.ts @@ -1,10 +1,12 @@ import { Injectable } from '@angular/core'; import { forkJoinSafeEmpty, NavigationParams, NavigationParamsType } from '@hypertrace/common'; import { Filter, FilterBuilderLookupService } from '@hypertrace/components'; -import { MetadataService, SPAN_SCOPE, toFilterAttributeType } from '@hypertrace/distributed-tracing'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { toFilterAttributeType } from '../../shared/graphql/model/metadata/attribute-metadata'; import { ObservabilityTraceType } from '../../shared/graphql/model/schema/observability-traces'; +import { SPAN_SCOPE } from '../../shared/graphql/model/schema/span'; +import { MetadataService } from '../../shared/services/metadata/metadata.service'; import { ScopeQueryParam } from './explorer.component'; @Injectable({ providedIn: 'root' }) diff --git a/projects/observability/src/pages/explorer/explorer.component.test.ts b/projects/observability/src/pages/explorer/explorer.component.test.ts index 9e558a241..1cd0db703 100644 --- a/projects/observability/src/pages/explorer/explorer.component.test.ts +++ b/projects/observability/src/pages/explorer/explorer.component.test.ts @@ -18,15 +18,6 @@ import { FilterBuilderLookupService, FilterOperator } from '@hypertrace/components'; -import { - GraphQlFieldFilter, - GraphQlOperatorType, - MetadataService, - MetricAggregationType, - SPANS_GQL_REQUEST, - SPAN_SCOPE, - TRACES_GQL_REQUEST -} from '@hypertrace/distributed-tracing'; import { GraphQlRequestService } from '@hypertrace/graphql-client'; import { getMockFlexLayoutProviders, patchRouterNavigateForTest } from '@hypertrace/test-utils'; import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest'; @@ -34,10 +25,17 @@ import { EMPTY, NEVER, of } from 'rxjs'; import { startWith } from 'rxjs/operators'; import { CartesianSeriesVisualizationType } from '../../shared/components/cartesian/chart'; import { ExploreQueryEditorComponent } from '../../shared/components/explore-query-editor/explore-query-editor.component'; +import { MetricAggregationType } from '../../shared/graphql/model/metrics/metric-aggregation'; +import { GraphQlFieldFilter } from '../../shared/graphql/model/schema/filter/field/graphql-field-filter'; +import { GraphQlOperatorType } from '../../shared/graphql/model/schema/filter/graphql-filter'; import { ObservabilityTraceType } from '../../shared/graphql/model/schema/observability-traces'; +import { SPAN_SCOPE } from '../../shared/graphql/model/schema/span'; import { ExploreSpecificationBuilder } from '../../shared/graphql/request/builders/specification/explore/explore-specification-builder'; import { EntitiesGraphqlQueryBuilderService } from '../../shared/graphql/request/handlers/entities/query/entities-graphql-query-builder.service'; import { EXPLORE_GQL_REQUEST } from '../../shared/graphql/request/handlers/explore/explore-query'; +import { SPANS_GQL_REQUEST } from '../../shared/graphql/request/handlers/spans/spans-graphql-query-handler.service'; +import { TRACES_GQL_REQUEST } from '../../shared/graphql/request/handlers/traces/traces-graphql-query-handler.service'; +import { MetadataService } from '../../shared/services/metadata/metadata.service'; import { ExplorerDashboardBuilder } from './explorer-dashboard-builder'; import { ExplorerComponent } from './explorer.component'; import { ExplorerModule } from './explorer.module'; diff --git a/projects/observability/src/pages/explorer/explorer.component.ts b/projects/observability/src/pages/explorer/explorer.component.ts index 754ab03a0..97ba4012c 100644 --- a/projects/observability/src/pages/explorer/explorer.component.ts +++ b/projects/observability/src/pages/explorer/explorer.component.ts @@ -2,11 +2,13 @@ import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NavigationService } from '@hypertrace/common'; import { Filter, ToggleItem } from '@hypertrace/components'; -import { AttributeMetadata, MetadataService, SPAN_SCOPE } from '@hypertrace/distributed-tracing'; import { Observable, of } from 'rxjs'; import { map, tap } from 'rxjs/operators'; import { ExploreVisualizationRequest } from '../../shared/components/explore-query-editor/explore-visualization-builder'; +import { AttributeMetadata } from '../../shared/graphql/model/metadata/attribute-metadata'; import { ObservabilityTraceType } from '../../shared/graphql/model/schema/observability-traces'; +import { SPAN_SCOPE } from '../../shared/graphql/model/schema/span'; +import { MetadataService } from '../../shared/services/metadata/metadata.service'; import { ExplorerDashboardBuilder, ExplorerDashboardBuilderFactory, diff --git a/projects/distributed-tracing/src/pages/spans/span-list.page.component.test.ts b/projects/observability/src/pages/spans/span-list.page.component.test.ts similarity index 100% rename from projects/distributed-tracing/src/pages/spans/span-list.page.component.test.ts rename to projects/observability/src/pages/spans/span-list.page.component.test.ts diff --git a/projects/distributed-tracing/src/pages/spans/span-list.page.component.ts b/projects/observability/src/pages/spans/span-list.page.component.ts similarity index 100% rename from projects/distributed-tracing/src/pages/spans/span-list.page.component.ts rename to projects/observability/src/pages/spans/span-list.page.component.ts diff --git a/projects/distributed-tracing/src/pages/spans/span-list.page.dashboard.ts b/projects/observability/src/pages/spans/span-list.page.dashboard.ts similarity index 100% rename from projects/distributed-tracing/src/pages/spans/span-list.page.dashboard.ts rename to projects/observability/src/pages/spans/span-list.page.dashboard.ts diff --git a/projects/distributed-tracing/src/pages/spans/span-list.page.module.ts b/projects/observability/src/pages/spans/span-list.page.module.ts similarity index 100% rename from projects/distributed-tracing/src/pages/spans/span-list.page.module.ts rename to projects/observability/src/pages/spans/span-list.page.module.ts diff --git a/projects/distributed-tracing/src/pages/trace-detail/logs/trace-logs.component.ts b/projects/observability/src/pages/trace-detail/logs/trace-logs.component.ts similarity index 100% rename from projects/distributed-tracing/src/pages/trace-detail/logs/trace-logs.component.ts rename to projects/observability/src/pages/trace-detail/logs/trace-logs.component.ts diff --git a/projects/distributed-tracing/src/pages/trace-detail/sequence/trace-sequence.component.ts b/projects/observability/src/pages/trace-detail/sequence/trace-sequence.component.ts similarity index 100% rename from projects/distributed-tracing/src/pages/trace-detail/sequence/trace-sequence.component.ts rename to projects/observability/src/pages/trace-detail/sequence/trace-sequence.component.ts diff --git a/projects/distributed-tracing/src/pages/trace-detail/sequence/trace-sequence.dashboard.ts b/projects/observability/src/pages/trace-detail/sequence/trace-sequence.dashboard.ts similarity index 100% rename from projects/distributed-tracing/src/pages/trace-detail/sequence/trace-sequence.dashboard.ts rename to projects/observability/src/pages/trace-detail/sequence/trace-sequence.dashboard.ts diff --git a/projects/distributed-tracing/src/pages/trace-detail/trace-detail.page.component.scss b/projects/observability/src/pages/trace-detail/trace-detail.page.component.scss similarity index 100% rename from projects/distributed-tracing/src/pages/trace-detail/trace-detail.page.component.scss rename to projects/observability/src/pages/trace-detail/trace-detail.page.component.scss diff --git a/projects/distributed-tracing/src/pages/trace-detail/trace-detail.page.component.ts b/projects/observability/src/pages/trace-detail/trace-detail.page.component.ts similarity index 100% rename from projects/distributed-tracing/src/pages/trace-detail/trace-detail.page.component.ts rename to projects/observability/src/pages/trace-detail/trace-detail.page.component.ts diff --git a/projects/distributed-tracing/src/pages/trace-detail/trace-detail.page.module.ts b/projects/observability/src/pages/trace-detail/trace-detail.page.module.ts similarity index 100% rename from projects/distributed-tracing/src/pages/trace-detail/trace-detail.page.module.ts rename to projects/observability/src/pages/trace-detail/trace-detail.page.module.ts diff --git a/projects/distributed-tracing/src/pages/trace-detail/trace-detail.service.test.ts b/projects/observability/src/pages/trace-detail/trace-detail.service.test.ts similarity index 100% rename from projects/distributed-tracing/src/pages/trace-detail/trace-detail.service.test.ts rename to projects/observability/src/pages/trace-detail/trace-detail.service.test.ts diff --git a/projects/distributed-tracing/src/pages/trace-detail/trace-detail.service.ts b/projects/observability/src/pages/trace-detail/trace-detail.service.ts similarity index 100% rename from projects/distributed-tracing/src/pages/trace-detail/trace-detail.service.ts rename to projects/observability/src/pages/trace-detail/trace-detail.service.ts diff --git a/projects/observability/src/public-api.ts b/projects/observability/src/public-api.ts index 7a7908208..e4e9d0bae 100644 --- a/projects/observability/src/public-api.ts +++ b/projects/observability/src/public-api.ts @@ -2,6 +2,132 @@ * Public API Surface of observability */ +/* Tracing */ + +// Attribute +export * from './shared/graphql/model/schema/enriched-attribute'; + +// Pages +export * from './pages/trace-detail/trace-detail.page.module'; +export * from './pages/trace-detail/logs/trace-logs.component'; +export * from './pages/trace-detail/sequence/trace-sequence.component'; +export * from './pages/spans/span-list.page.module'; + +// Builders +export * from './shared/graphql/request/builders/argument/graphql-argument-builder'; +export * from './shared/graphql/request/builders/selections/graphql-selection-builder'; +export * from './shared/graphql/request/builders/specification/specification-builder'; +export * from './shared/graphql/request/builders/specification/trace/trace-status/trace-status-specification-builder'; + +// Dashboard Graphql +export * from './shared/dashboard/data/graphql/filter/graphql-filter-data-source.model'; +export * from './shared/dashboard/data/graphql/filter/graphql-filter-data-source.model'; +export * from './shared/dashboard/data/graphql/graphql-data-source.model'; +export * from './shared/dashboard/data/graphql/graphql-query-event.service'; +export * from './shared/dashboard/data/graphql/graphql-data-source.module'; +export * from './shared/dashboard/data/graphql/graphql-table-control-options-data-source.model'; +export * from './shared/dashboard/data/graphql/specifiers/attribute-specification.model'; +export * from './shared/dashboard/data/graphql/specifiers/specification.model'; +export * from './shared/dashboard/data/graphql/specifiers/trace-status-specification.model'; +export * from './shared/dashboard/data/graphql/table/table-data-source.model'; +export * from './shared/dashboard/dashboard-wrapper/application-aware-dashboard.component'; +export * from './shared/dashboard/dashboard-wrapper/navigable-dashboard.component'; +export * from './shared/dashboard/dashboard-wrapper/navigable-dashboard.module'; +export * from './shared/dashboard/tracing-dashboard.module'; +export * from './shared/dashboard/widgets/table/table-widget.model'; +export * from './shared/dashboard/widgets/table/table-widget-control.model'; +export * from './shared/dashboard/widgets/table/table-widget-view-toggle.model'; + +// Filter +export * from './shared/services/filter-builder/graphql-filter-builder.service'; + +// Handlers +export * from './shared/graphql/request/handlers/traces/export-spans-graphql-query-handler.service'; +export * from './shared/graphql/request/handlers/traces/trace-graphql-query-handler.service'; +export * from './shared/graphql/request/handlers/traces/traces-graphql-query-handler.service'; +export * from './shared/graphql/request/handlers/spans/span-graphql-query-handler.service'; +export * from './shared/graphql/request/handlers/spans/spans-graphql-query-handler.service'; + +// Icon Types +export * from './shared/icons/tracing-icon-type'; +export * from './shared/icons/tracing-icon-library.module'; + +// Interaction Handler - Deprecated +export { InteractionHandler } from './shared/dashboard/interaction/interaction-handler'; + +// Log Events Table +export * from './shared/components/log-events/log-events-table.component'; +export * from './shared/components/log-events/log-events-table.module'; + +// Metadata +export * from './shared/services/metadata/metadata.service'; +export * from './shared/services/metadata/metadata.service.module'; +export * from './shared/graphql/model/metadata/attribute-metadata'; + +export * from './shared/graphql/model/metrics/metric-aggregation'; +export * from './shared/graphql/model/metrics/metric-health'; + +// Navigation +export * from './shared/services/navigation/tracing-navigation.service'; + +// Schema +export * from './shared/graphql/model/schema/filter/field/graphql-field-filter'; +export * from './shared/graphql/model/schema/filter/id/graphql-id-filter'; + +export * from './shared/graphql/model/schema/filter/graphql-filter'; +export * from './shared/graphql/model/schema/filter/global-graphql-filter.service'; +export { + GraphQlMetricAggregationType, + convertToGraphQlMetricAggregationType +} from './shared/graphql/model/schema/metrics/graphql-metric-aggregation-type'; +export * from './shared/graphql/model/schema/sort/graphql-sort-argument'; +export * from './shared/graphql/model/schema/sort/graphql-sort-direction'; +export * from './shared/graphql/model/schema/sort/graphql-sort-without-direction'; +export * from './shared/graphql/model/schema/sort/graphql-sort-by-specification'; +export * from './shared/graphql/model/schema/timerange/graphql-time-range'; +export * from './shared/graphql/model/schema/specifier/specification'; +export * from './shared/graphql/model/schema/span'; +export * from './shared/graphql/model/schema/trace'; + +// Services +export * from './pages/trace-detail/trace-detail.service'; +export * from './shared/services/log-events/log-events.service'; + +// Span Detail +export { SpanData } from './shared/components/span-detail/span-data'; +export { SpanTitle } from './shared/components/span-detail/span-title'; +export * from './shared/components/span-detail/span-detail.component'; +export * from './shared/components/span-detail/span-detail.module'; +export { SpanDetailLayoutStyle } from './shared/components/span-detail/span-detail-layout-style'; + +// Specifications +export * from './shared/graphql/model/specifications/composite-specification'; +export * from './shared/graphql/model/specifications/metric-specification'; +export * from './shared/graphql/model/specifications/trace-status-specification'; + +// Table +export { SpecificationBackedTableColumnDef } from './shared/dashboard/widgets/table/table-widget-column.model'; +export * from './shared/components/table/tracing-table-cell-renderer.module'; +export * from './shared/components/table/tracing-table-cell-type'; + +// Waterfall +export { WaterfallData } from './shared/dashboard/widgets/waterfall/waterfall/waterfall-chart'; +export { TraceWaterfallDataSourceModel } from './shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model'; +export { traceSequenceDashboard } from './pages/trace-detail/sequence/trace-sequence.dashboard'; +export { TraceDetailPageComponent } from './pages/trace-detail/trace-detail.page.component'; +export { LogEvent } from './shared/dashboard/widgets/waterfall/waterfall/waterfall-chart'; + +// Datasources +export * from './shared/dashboard/widgets/trace-detail/data/trace-detail-data-source.model'; +export * from './shared/dashboard/widgets/span-detail/data/span-detail-data-source.model'; +export * from './shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model'; + +// Detail Sheet +export * from './shared/dashboard/interaction/detail-sheet/detail-sheet-interaction.module'; +export * from './shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.service'; + +/* Observability */ + // Schema export * from './shared/graphql/model/schema/entity'; diff --git a/projects/observability/src/shared/components/bar-gauge/bar-gauge.component.test.ts b/projects/observability/src/shared/components/bar-gauge/bar-gauge.component.test.ts index 936c6cb29..8b98f13be 100644 --- a/projects/observability/src/shared/components/bar-gauge/bar-gauge.component.test.ts +++ b/projects/observability/src/shared/components/bar-gauge/bar-gauge.component.test.ts @@ -1,9 +1,9 @@ import { fakeAsync } from '@angular/core/testing'; import { ColorService, DomElementMeasurerService, FormattingModule } from '@hypertrace/common'; import { LoadAsyncModule } from '@hypertrace/components'; -import { BarGaugeComponent } from '@hypertrace/observability'; import { createHostFactory, mockProvider, Spectator } from '@ngneat/spectator/jest'; import { MockProvider } from 'ng-mocks'; +import { BarGaugeComponent } from './bar-gauge.component'; describe('Bar Gauge component', () => { let spectator: Spectator; diff --git a/projects/observability/src/shared/components/explore-query-editor/explore-query-editor.component.test.ts b/projects/observability/src/shared/components/explore-query-editor/explore-query-editor.component.test.ts index 5e1cd0f55..b02c58a69 100644 --- a/projects/observability/src/shared/components/explore-query-editor/explore-query-editor.component.test.ts +++ b/projects/observability/src/shared/components/explore-query-editor/explore-query-editor.component.test.ts @@ -9,10 +9,11 @@ import { TimeRangeService, TimeUnit } from '@hypertrace/common'; -import { AttributeMetadata, AttributeMetadataType, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { GraphQlRequestService } from '@hypertrace/graphql-client'; import { createHostFactory, mockProvider } from '@ngneat/spectator/jest'; import { EMPTY, of } from 'rxjs'; +import { AttributeMetadata, AttributeMetadataType } from '../../graphql/model/metadata/attribute-metadata'; +import { MetricAggregationType } from '../../graphql/model/metrics/metric-aggregation'; import { ObservabilityTraceType } from '../../graphql/model/schema/observability-traces'; import { ExploreQueryEditorComponent } from './explore-query-editor.component'; import { ExploreQueryEditorModule } from './explore-query-editor.module'; diff --git a/projects/observability/src/shared/components/explore-query-editor/explore-visualization-builder.test.ts b/projects/observability/src/shared/components/explore-query-editor/explore-visualization-builder.test.ts index f106aef3a..993505a08 100644 --- a/projects/observability/src/shared/components/explore-query-editor/explore-visualization-builder.test.ts +++ b/projects/observability/src/shared/components/explore-query-editor/explore-visualization-builder.test.ts @@ -1,12 +1,13 @@ import { fakeAsync, tick } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { FixedTimeRange, IntervalDurationService, TimeDuration, TimeRangeService, TimeUnit } from '@hypertrace/common'; -import { MetadataService, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { patchRouterNavigateForTest, recordObservable, runFakeRxjs } from '@hypertrace/test-utils'; import { createServiceFactory, mockProvider, SpectatorService } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; +import { MetricAggregationType } from '../../graphql/model/metrics/metric-aggregation'; import { ObservabilityTraceType } from '../../graphql/model/schema/observability-traces'; import { ExploreSpecificationBuilder } from '../../graphql/request/builders/specification/explore/explore-specification-builder'; +import { MetadataService } from '../../services/metadata/metadata.service'; import { CartesianSeriesVisualizationType } from '../cartesian/chart'; import { ExploreVisualizationBuilder, ExploreVisualizationRequest } from './explore-visualization-builder'; diff --git a/projects/observability/src/shared/components/explore-query-editor/explore-visualization-builder.ts b/projects/observability/src/shared/components/explore-query-editor/explore-visualization-builder.ts index 7c894a2c5..72629145e 100644 --- a/projects/observability/src/shared/components/explore-query-editor/explore-visualization-builder.ts +++ b/projects/observability/src/shared/components/explore-query-editor/explore-visualization-builder.ts @@ -1,28 +1,30 @@ import { Injectable, OnDestroy } from '@angular/core'; import { forkJoinSafeEmpty, IntervalDurationService, TimeDuration } from '@hypertrace/common'; import { Filter } from '@hypertrace/components'; -import { - AttributeMetadata, - GraphQlFilterBuilderService, - GraphQlSpansRequest, - GraphQlTracesRequest, - MetadataService, - MetricAggregationType, - SPANS_GQL_REQUEST, - SPAN_SCOPE, - Specification, - SpecificationBuilder, - TRACES_GQL_REQUEST, - TraceType -} from '@hypertrace/distributed-tracing'; import { uniqBy } from 'lodash-es'; import { BehaviorSubject, Observable, of, Subject } from 'rxjs'; import { defaultIfEmpty, map, takeUntil } from 'rxjs/operators'; +import { AttributeMetadata } from '../../graphql/model/metadata/attribute-metadata'; +import { MetricAggregationType } from '../../graphql/model/metrics/metric-aggregation'; import { GraphQlGroupBy } from '../../graphql/model/schema/groupby/graphql-group-by'; import { ObservabilityTraceType } from '../../graphql/model/schema/observability-traces'; +import { SPAN_SCOPE } from '../../graphql/model/schema/span'; import { ExploreSpecification } from '../../graphql/model/schema/specifications/explore-specification'; +import { Specification } from '../../graphql/model/schema/specifier/specification'; +import { TraceType } from '../../graphql/model/schema/trace'; import { ExploreSpecificationBuilder } from '../../graphql/request/builders/specification/explore/explore-specification-builder'; +import { SpecificationBuilder } from '../../graphql/request/builders/specification/specification-builder'; import { EXPLORE_GQL_REQUEST, GraphQlExploreRequest } from '../../graphql/request/handlers/explore/explore-query'; +import { + GraphQlSpansRequest, + SPANS_GQL_REQUEST +} from '../../graphql/request/handlers/spans/spans-graphql-query-handler.service'; +import { + GraphQlTracesRequest, + TRACES_GQL_REQUEST +} from '../../graphql/request/handlers/traces/traces-graphql-query-handler.service'; +import { GraphQlFilterBuilderService } from '../../services/filter-builder/graphql-filter-builder.service'; +import { MetadataService } from '../../services/metadata/metadata.service'; import { CartesianSeriesVisualizationType } from '../cartesian/chart'; @Injectable() diff --git a/projects/observability/src/shared/components/explore-query-editor/group-by/explore-query-group-by-editor.component.test.ts b/projects/observability/src/shared/components/explore-query-editor/group-by/explore-query-group-by-editor.component.test.ts index c480a05da..0c7544fbc 100644 --- a/projects/observability/src/shared/components/explore-query-editor/group-by/explore-query-group-by-editor.component.test.ts +++ b/projects/observability/src/shared/components/explore-query-editor/group-by/explore-query-group-by-editor.component.test.ts @@ -3,10 +3,11 @@ import { fakeAsync, flush } from '@angular/core/testing'; import { IconLibraryTestingModule } from '@hypertrace/assets-library'; import { NavigationService } from '@hypertrace/common'; import { SelectComponent, SelectModule } from '@hypertrace/components'; -import { AttributeMetadata, MetadataService } from '@hypertrace/distributed-tracing'; import { byText, createHostFactory, mockProvider } from '@ngneat/spectator/jest'; import { EMPTY, of } from 'rxjs'; +import { AttributeMetadata } from '../../../graphql/model/metadata/attribute-metadata'; import { ObservabilityTraceType } from '../../../graphql/model/schema/observability-traces'; +import { MetadataService } from '../../../services/metadata/metadata.service'; import { ExploreQueryGroupByEditorComponent } from './explore-query-group-by-editor.component'; describe('Explore Query Group by Editor component', () => { diff --git a/projects/observability/src/shared/components/explore-query-editor/group-by/explore-query-group-by-editor.component.ts b/projects/observability/src/shared/components/explore-query-editor/group-by/explore-query-group-by-editor.component.ts index 8af33d1b9..df07d1826 100644 --- a/projects/observability/src/shared/components/explore-query-editor/group-by/explore-query-group-by-editor.component.ts +++ b/projects/observability/src/shared/components/explore-query-editor/group-by/explore-query-group-by-editor.component.ts @@ -1,9 +1,10 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; import { TypedSimpleChanges } from '@hypertrace/common'; import { SelectOption } from '@hypertrace/components'; -import { MetadataService, TraceType } from '@hypertrace/distributed-tracing'; import { combineLatest, Observable, of, ReplaySubject, Subject } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; +import { TraceType } from '../../../graphql/model/schema/trace'; +import { MetadataService } from '../../../services/metadata/metadata.service'; @Component({ selector: 'ht-explore-query-group-by-editor', diff --git a/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-editor.component.test.ts b/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-editor.component.test.ts index af3f75cee..6e23b4113 100644 --- a/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-editor.component.test.ts +++ b/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-editor.component.test.ts @@ -3,16 +3,13 @@ import { fakeAsync, flush } from '@angular/core/testing'; import { IconLibraryTestingModule } from '@hypertrace/assets-library'; import { NavigationService } from '@hypertrace/common'; import { SelectComponent, SelectModule } from '@hypertrace/components'; -import { - AttributeMetadata, - getAggregationDisplayName, - MetadataService, - MetricAggregationType -} from '@hypertrace/distributed-tracing'; import { byText, createHostFactory, mockProvider } from '@ngneat/spectator/jest'; import { EMPTY, of } from 'rxjs'; +import { AttributeMetadata } from '../../../graphql/model/metadata/attribute-metadata'; +import { getAggregationDisplayName, MetricAggregationType } from '../../../graphql/model/metrics/metric-aggregation'; import { ObservabilityTraceType } from '../../../graphql/model/schema/observability-traces'; import { ExploreSpecificationBuilder } from '../../../graphql/request/builders/specification/explore/explore-specification-builder'; +import { MetadataService } from '../../../services/metadata/metadata.service'; import { CartesianSeriesVisualizationType } from '../../cartesian/chart'; import { ExploreQuerySeriesEditorComponent } from './explore-query-series-editor.component'; diff --git a/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-editor.component.ts b/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-editor.component.ts index 162a0ad4b..d05f34048 100644 --- a/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-editor.component.ts +++ b/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-editor.component.ts @@ -2,16 +2,13 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Out import { IconType } from '@hypertrace/assets-library'; import { TypedSimpleChanges } from '@hypertrace/common'; import { ButtonStyle, SelectOption } from '@hypertrace/components'; -import { - AttributeMetadata, - getAggregationDisplayName, - MetadataService, - MetricAggregationType, - TraceType -} from '@hypertrace/distributed-tracing'; import { combineLatest, EMPTY, Observable, of, ReplaySubject, Subject } from 'rxjs'; import { map, switchMap, take } from 'rxjs/operators'; +import { AttributeMetadata } from '../../../graphql/model/metadata/attribute-metadata'; +import { getAggregationDisplayName, MetricAggregationType } from '../../../graphql/model/metrics/metric-aggregation'; +import { TraceType } from '../../../graphql/model/schema/trace'; import { ExploreSpecificationBuilder } from '../../../graphql/request/builders/specification/explore/explore-specification-builder'; +import { MetadataService } from '../../../services/metadata/metadata.service'; import { CartesianSeriesVisualizationType } from '../../cartesian/chart'; import { ExploreSeries } from '../explore-visualization-builder'; diff --git a/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-group-editor.component.test.ts b/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-group-editor.component.test.ts index 622249954..dddd5ded5 100644 --- a/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-group-editor.component.test.ts +++ b/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-group-editor.component.test.ts @@ -3,11 +3,13 @@ import { fakeAsync } from '@angular/core/testing'; import { IconLibraryTestingModule } from '@hypertrace/assets-library'; import { LoggerService, NavigationService } from '@hypertrace/common'; import { SelectModule } from '@hypertrace/components'; -import { AttributeMetadata, MetadataService, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { createHostFactory, mockProvider } from '@ngneat/spectator/jest'; import { EMPTY, of } from 'rxjs'; +import { AttributeMetadata } from '../../../graphql/model/metadata/attribute-metadata'; +import { MetricAggregationType } from '../../../graphql/model/metrics/metric-aggregation'; import { ObservabilityTraceType } from '../../../graphql/model/schema/observability-traces'; import { ExploreSpecificationBuilder } from '../../../graphql/request/builders/specification/explore/explore-specification-builder'; +import { MetadataService } from '../../../services/metadata/metadata.service'; import { CartesianSeriesVisualizationType } from '../../cartesian/chart'; import { ExploreQuerySeriesEditorComponent } from './explore-query-series-editor.component'; import { ExploreQuerySeriesGroupEditorComponent } from './explore-query-series-group-editor.component'; diff --git a/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-group-editor.component.ts b/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-group-editor.component.ts index 716e33153..a0a0de2ba 100644 --- a/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-group-editor.component.ts +++ b/projects/observability/src/shared/components/explore-query-editor/series/explore-query-series-group-editor.component.ts @@ -1,8 +1,8 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; import { IconType } from '@hypertrace/assets-library'; import { ButtonRole, ButtonStyle } from '@hypertrace/components'; -import { TraceType } from '@hypertrace/distributed-tracing'; import { without } from 'lodash-es'; +import { TraceType } from '../../../graphql/model/schema/trace'; import { ExploreSeries } from '../explore-visualization-builder'; @Component({ diff --git a/projects/distributed-tracing/src/shared/components/log-events/log-events-table.component.scss b/projects/observability/src/shared/components/log-events/log-events-table.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/components/log-events/log-events-table.component.scss rename to projects/observability/src/shared/components/log-events/log-events-table.component.scss diff --git a/projects/distributed-tracing/src/shared/components/log-events/log-events-table.component.test.ts b/projects/observability/src/shared/components/log-events/log-events-table.component.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/log-events/log-events-table.component.test.ts rename to projects/observability/src/shared/components/log-events/log-events-table.component.test.ts diff --git a/projects/distributed-tracing/src/shared/components/log-events/log-events-table.component.ts b/projects/observability/src/shared/components/log-events/log-events-table.component.ts similarity index 98% rename from projects/distributed-tracing/src/shared/components/log-events/log-events-table.component.ts rename to projects/observability/src/shared/components/log-events/log-events-table.component.ts index 07a9923bd..43b741e67 100644 --- a/projects/distributed-tracing/src/shared/components/log-events/log-events-table.component.ts +++ b/projects/observability/src/shared/components/log-events/log-events-table.component.ts @@ -10,10 +10,10 @@ import { TableMode, TableRow } from '@hypertrace/components'; -import { LogEvent } from '@hypertrace/distributed-tracing'; import { isEmpty } from 'lodash-es'; import { Observable, of } from 'rxjs'; import { WaterfallTableCellType } from '../../dashboard/widgets/waterfall/waterfall/span-name/span-name-cell-type'; +import { LogEvent } from '../../dashboard/widgets/waterfall/waterfall/waterfall-chart'; export const enum LogEventsTableViewType { Condensed = 'condensed', diff --git a/projects/distributed-tracing/src/shared/components/log-events/log-events-table.module.ts b/projects/observability/src/shared/components/log-events/log-events-table.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/log-events/log-events-table.module.ts rename to projects/observability/src/shared/components/log-events/log-events-table.module.ts diff --git a/projects/observability/src/shared/components/metric-display/metric-display.component.test.ts b/projects/observability/src/shared/components/metric-display/metric-display.component.test.ts index 0576f96f9..95d93b40b 100644 --- a/projects/observability/src/shared/components/metric-display/metric-display.component.test.ts +++ b/projects/observability/src/shared/components/metric-display/metric-display.component.test.ts @@ -1,5 +1,5 @@ -import { MetricHealth } from '@hypertrace/distributed-tracing'; import { createHostFactory, Spectator } from '@ngneat/spectator/jest'; +import { MetricHealth } from '../../graphql/model/metrics/metric-health'; import { MetricDisplayComponent } from './metric-display.component'; import { MetricDisplayModule } from './metric-display.module'; diff --git a/projects/observability/src/shared/components/metric-display/metric-display.component.ts b/projects/observability/src/shared/components/metric-display/metric-display.component.ts index 4b1e5a09b..8e4189df4 100644 --- a/projects/observability/src/shared/components/metric-display/metric-display.component.ts +++ b/projects/observability/src/shared/components/metric-display/metric-display.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { MetricHealth } from '@hypertrace/distributed-tracing'; +import { MetricHealth } from '../../graphql/model/metrics/metric-health'; @Component({ selector: 'ht-metric-display', diff --git a/projects/distributed-tracing/src/shared/components/span-detail/call/body/span-detail-call-body.component.scss b/projects/observability/src/shared/components/span-detail/call/body/span-detail-call-body.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/call/body/span-detail-call-body.component.scss rename to projects/observability/src/shared/components/span-detail/call/body/span-detail-call-body.component.scss diff --git a/projects/distributed-tracing/src/shared/components/span-detail/call/body/span-detail-call-body.component.ts b/projects/observability/src/shared/components/span-detail/call/body/span-detail-call-body.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/call/body/span-detail-call-body.component.ts rename to projects/observability/src/shared/components/span-detail/call/body/span-detail-call-body.component.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/call/body/span-detail-call-body.module.ts b/projects/observability/src/shared/components/span-detail/call/body/span-detail-call-body.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/call/body/span-detail-call-body.module.ts rename to projects/observability/src/shared/components/span-detail/call/body/span-detail-call-body.module.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/call/headers/span-detail-call-headers.component.scss b/projects/observability/src/shared/components/span-detail/call/headers/span-detail-call-headers.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/call/headers/span-detail-call-headers.component.scss rename to projects/observability/src/shared/components/span-detail/call/headers/span-detail-call-headers.component.scss diff --git a/projects/distributed-tracing/src/shared/components/span-detail/call/headers/span-detail-call-headers.component.ts b/projects/observability/src/shared/components/span-detail/call/headers/span-detail-call-headers.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/call/headers/span-detail-call-headers.component.ts rename to projects/observability/src/shared/components/span-detail/call/headers/span-detail-call-headers.component.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/call/headers/span-detail-call-headers.module.ts b/projects/observability/src/shared/components/span-detail/call/headers/span-detail-call-headers.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/call/headers/span-detail-call-headers.module.ts rename to projects/observability/src/shared/components/span-detail/call/headers/span-detail-call-headers.module.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/exit-calls/span-exit-calls.component.test.ts b/projects/observability/src/shared/components/span-detail/exit-calls/span-exit-calls.component.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/exit-calls/span-exit-calls.component.test.ts rename to projects/observability/src/shared/components/span-detail/exit-calls/span-exit-calls.component.test.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/exit-calls/span-exit-calls.component.ts b/projects/observability/src/shared/components/span-detail/exit-calls/span-exit-calls.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/exit-calls/span-exit-calls.component.ts rename to projects/observability/src/shared/components/span-detail/exit-calls/span-exit-calls.component.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/exit-calls/span-exit-calls.module.ts b/projects/observability/src/shared/components/span-detail/exit-calls/span-exit-calls.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/exit-calls/span-exit-calls.module.ts rename to projects/observability/src/shared/components/span-detail/exit-calls/span-exit-calls.module.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/headers/title/span-detail-title-header.component.scss b/projects/observability/src/shared/components/span-detail/headers/title/span-detail-title-header.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/headers/title/span-detail-title-header.component.scss rename to projects/observability/src/shared/components/span-detail/headers/title/span-detail-title-header.component.scss diff --git a/projects/distributed-tracing/src/shared/components/span-detail/headers/title/span-detail-title-header.component.ts b/projects/observability/src/shared/components/span-detail/headers/title/span-detail-title-header.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/headers/title/span-detail-title-header.component.ts rename to projects/observability/src/shared/components/span-detail/headers/title/span-detail-title-header.component.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/headers/title/span-detail-title-header.module.ts b/projects/observability/src/shared/components/span-detail/headers/title/span-detail-title-header.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/headers/title/span-detail-title-header.module.ts rename to projects/observability/src/shared/components/span-detail/headers/title/span-detail-title-header.module.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/request/span-request-detail.component.scss b/projects/observability/src/shared/components/span-detail/request/span-request-detail.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/request/span-request-detail.component.scss rename to projects/observability/src/shared/components/span-detail/request/span-request-detail.component.scss diff --git a/projects/distributed-tracing/src/shared/components/span-detail/request/span-request-detail.component.test.ts b/projects/observability/src/shared/components/span-detail/request/span-request-detail.component.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/request/span-request-detail.component.test.ts rename to projects/observability/src/shared/components/span-detail/request/span-request-detail.component.test.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/request/span-request-detail.component.ts b/projects/observability/src/shared/components/span-detail/request/span-request-detail.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/request/span-request-detail.component.ts rename to projects/observability/src/shared/components/span-detail/request/span-request-detail.component.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/request/span-request-detail.module.ts b/projects/observability/src/shared/components/span-detail/request/span-request-detail.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/request/span-request-detail.module.ts rename to projects/observability/src/shared/components/span-detail/request/span-request-detail.module.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/response/span-response-detail.component.scss b/projects/observability/src/shared/components/span-detail/response/span-response-detail.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/response/span-response-detail.component.scss rename to projects/observability/src/shared/components/span-detail/response/span-response-detail.component.scss diff --git a/projects/distributed-tracing/src/shared/components/span-detail/response/span-response-detail.component.test.ts b/projects/observability/src/shared/components/span-detail/response/span-response-detail.component.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/response/span-response-detail.component.test.ts rename to projects/observability/src/shared/components/span-detail/response/span-response-detail.component.test.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/response/span-response-detail.component.ts b/projects/observability/src/shared/components/span-detail/response/span-response-detail.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/response/span-response-detail.component.ts rename to projects/observability/src/shared/components/span-detail/response/span-response-detail.component.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/response/span-response-detail.module.ts b/projects/observability/src/shared/components/span-detail/response/span-response-detail.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/response/span-response-detail.module.ts rename to projects/observability/src/shared/components/span-detail/response/span-response-detail.module.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/span-data.ts b/projects/observability/src/shared/components/span-detail/span-data.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/span-data.ts rename to projects/observability/src/shared/components/span-detail/span-data.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/span-detail-layout-style.ts b/projects/observability/src/shared/components/span-detail/span-detail-layout-style.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/span-detail-layout-style.ts rename to projects/observability/src/shared/components/span-detail/span-detail-layout-style.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/span-detail-tab.ts b/projects/observability/src/shared/components/span-detail/span-detail-tab.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/span-detail-tab.ts rename to projects/observability/src/shared/components/span-detail/span-detail-tab.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/span-detail.component.scss b/projects/observability/src/shared/components/span-detail/span-detail.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/span-detail.component.scss rename to projects/observability/src/shared/components/span-detail/span-detail.component.scss diff --git a/projects/distributed-tracing/src/shared/components/span-detail/span-detail.component.test.ts b/projects/observability/src/shared/components/span-detail/span-detail.component.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/span-detail.component.test.ts rename to projects/observability/src/shared/components/span-detail/span-detail.component.test.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/span-detail.component.ts b/projects/observability/src/shared/components/span-detail/span-detail.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/span-detail.component.ts rename to projects/observability/src/shared/components/span-detail/span-detail.component.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/span-detail.module.ts b/projects/observability/src/shared/components/span-detail/span-detail.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/span-detail.module.ts rename to projects/observability/src/shared/components/span-detail/span-detail.module.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/span-title.ts b/projects/observability/src/shared/components/span-detail/span-title.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/span-title.ts rename to projects/observability/src/shared/components/span-detail/span-title.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/tags/span-tags-detail.component.scss b/projects/observability/src/shared/components/span-detail/tags/span-tags-detail.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/tags/span-tags-detail.component.scss rename to projects/observability/src/shared/components/span-detail/tags/span-tags-detail.component.scss diff --git a/projects/distributed-tracing/src/shared/components/span-detail/tags/span-tags-detail.component.test.ts b/projects/observability/src/shared/components/span-detail/tags/span-tags-detail.component.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/tags/span-tags-detail.component.test.ts rename to projects/observability/src/shared/components/span-detail/tags/span-tags-detail.component.test.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/tags/span-tags-detail.component.ts b/projects/observability/src/shared/components/span-detail/tags/span-tags-detail.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/tags/span-tags-detail.component.ts rename to projects/observability/src/shared/components/span-detail/tags/span-tags-detail.component.ts diff --git a/projects/distributed-tracing/src/shared/components/span-detail/tags/span-tags-detail.module.ts b/projects/observability/src/shared/components/span-detail/tags/span-tags-detail.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/span-detail/tags/span-tags-detail.module.ts rename to projects/observability/src/shared/components/span-detail/tags/span-tags-detail.module.ts diff --git a/projects/observability/src/shared/components/table/data-cell/entity/entity-table-cell-renderer-util.ts b/projects/observability/src/shared/components/table/data-cell/entity/entity-table-cell-renderer-util.ts index 93f1ac4d3..73485c786 100644 --- a/projects/observability/src/shared/components/table/data-cell/entity/entity-table-cell-renderer-util.ts +++ b/projects/observability/src/shared/components/table/data-cell/entity/entity-table-cell-renderer-util.ts @@ -1,7 +1,7 @@ import { Dictionary } from '@hypertrace/common'; import { TableRow } from '@hypertrace/components'; -import { isMetricAggregation, MetricAggregation } from '@hypertrace/distributed-tracing'; import { isNull } from 'lodash-es'; +import { isMetricAggregation, MetricAggregation } from '../../../../graphql/model/metrics/metric-aggregation'; import { Entity, Interaction } from '../../../../graphql/model/schema/entity'; import { EntitySpecificationBuilder } from '../../../../graphql/request/builders/specification/entity/entity-specification-builder'; diff --git a/projects/observability/src/shared/components/table/data-cell/exit-calls/exit-calls-table-cell-renderer.component.ts b/projects/observability/src/shared/components/table/data-cell/exit-calls/exit-calls-table-cell-renderer.component.ts index 1313315c7..25321f86f 100644 --- a/projects/observability/src/shared/components/table/data-cell/exit-calls/exit-calls-table-cell-renderer.component.ts +++ b/projects/observability/src/shared/components/table/data-cell/exit-calls/exit-calls-table-cell-renderer.component.ts @@ -13,7 +13,7 @@ import { TABLE_DATA_PARSER, TABLE_ROW_DATA } from '@hypertrace/components'; -import { Trace } from '@hypertrace/distributed-tracing'; +import { Trace } from '../../../../graphql/model/schema/trace'; import { ObservabilityTableCellType } from '../../observability-table-cell-type'; interface CellData { diff --git a/projects/distributed-tracing/src/shared/components/table/data-cell/metric/metric-table-cell-parser.ts b/projects/observability/src/shared/components/table/data-cell/metric/metric-table-cell-parser.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/table/data-cell/metric/metric-table-cell-parser.ts rename to projects/observability/src/shared/components/table/data-cell/metric/metric-table-cell-parser.ts diff --git a/projects/distributed-tracing/src/shared/components/table/data-cell/metric/metric-table-cell-renderer.component.scss b/projects/observability/src/shared/components/table/data-cell/metric/metric-table-cell-renderer.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/components/table/data-cell/metric/metric-table-cell-renderer.component.scss rename to projects/observability/src/shared/components/table/data-cell/metric/metric-table-cell-renderer.component.scss diff --git a/projects/distributed-tracing/src/shared/components/table/data-cell/metric/metric-table-cell-renderer.component.test.ts b/projects/observability/src/shared/components/table/data-cell/metric/metric-table-cell-renderer.component.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/table/data-cell/metric/metric-table-cell-renderer.component.test.ts rename to projects/observability/src/shared/components/table/data-cell/metric/metric-table-cell-renderer.component.test.ts diff --git a/projects/distributed-tracing/src/shared/components/table/data-cell/metric/metric-table-cell-renderer.component.ts b/projects/observability/src/shared/components/table/data-cell/metric/metric-table-cell-renderer.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/table/data-cell/metric/metric-table-cell-renderer.component.ts rename to projects/observability/src/shared/components/table/data-cell/metric/metric-table-cell-renderer.component.ts diff --git a/projects/distributed-tracing/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-parser.ts b/projects/observability/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-parser.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-parser.ts rename to projects/observability/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-parser.ts diff --git a/projects/distributed-tracing/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-renderer.component.scss b/projects/observability/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-renderer.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-renderer.component.scss rename to projects/observability/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-renderer.component.scss diff --git a/projects/distributed-tracing/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-renderer.component.test.ts b/projects/observability/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-renderer.component.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-renderer.component.test.ts rename to projects/observability/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-renderer.component.test.ts diff --git a/projects/distributed-tracing/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-renderer.component.ts b/projects/observability/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-renderer.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-renderer.component.ts rename to projects/observability/src/shared/components/table/data-cell/trace-status/trace-status-table-cell-renderer.component.ts diff --git a/projects/distributed-tracing/src/shared/components/table/tracing-table-cell-renderer.module.ts b/projects/observability/src/shared/components/table/tracing-table-cell-renderer.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/table/tracing-table-cell-renderer.module.ts rename to projects/observability/src/shared/components/table/tracing-table-cell-renderer.module.ts diff --git a/projects/distributed-tracing/src/shared/components/table/tracing-table-cell-type.ts b/projects/observability/src/shared/components/table/tracing-table-cell-type.ts similarity index 100% rename from projects/distributed-tracing/src/shared/components/table/tracing-table-cell-type.ts rename to projects/observability/src/shared/components/table/tracing-table-cell-type.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/dashboard-wrapper/application-aware-dashboard.component.scss b/projects/observability/src/shared/dashboard/dashboard-wrapper/application-aware-dashboard.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/dashboard-wrapper/application-aware-dashboard.component.scss rename to projects/observability/src/shared/dashboard/dashboard-wrapper/application-aware-dashboard.component.scss diff --git a/projects/distributed-tracing/src/shared/dashboard/dashboard-wrapper/application-aware-dashboard.component.ts b/projects/observability/src/shared/dashboard/dashboard-wrapper/application-aware-dashboard.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/dashboard-wrapper/application-aware-dashboard.component.ts rename to projects/observability/src/shared/dashboard/dashboard-wrapper/application-aware-dashboard.component.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.component.scss b/projects/observability/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.component.scss rename to projects/observability/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.component.scss diff --git a/projects/distributed-tracing/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.component.test.ts b/projects/observability/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.component.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.component.test.ts rename to projects/observability/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.component.test.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.component.ts b/projects/observability/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.component.ts rename to projects/observability/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.component.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.module.ts b/projects/observability/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.module.ts rename to projects/observability/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.module.ts diff --git a/projects/observability/src/shared/dashboard/data/graphql/api-calls-count/api-calls-count-data-source-model.ts b/projects/observability/src/shared/dashboard/data/graphql/api-calls-count/api-calls-count-data-source-model.ts index ec014c18d..9ed81e871 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/api-calls-count/api-calls-count-data-source-model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/api-calls-count/api-calls-count-data-source-model.ts @@ -1,12 +1,8 @@ -import { - GraphQlDataSourceModel, - MetricAggregation, - MetricAggregationType, - MetricHealth -} from '@hypertrace/distributed-tracing'; import { Model } from '@hypertrace/hyperdash'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { MetricAggregation, MetricAggregationType } from '../../../../graphql/model/metrics/metric-aggregation'; +import { MetricHealth } from '../../../../graphql/model/metrics/metric-health'; import { ExploreSpecification } from '../../../../graphql/model/schema/specifications/explore-specification'; import { ExploreSpecificationBuilder } from '../../../../graphql/request/builders/specification/explore/explore-specification-builder'; import { ExploreGraphQlQueryHandlerService } from '../../../../graphql/request/handlers/explore/explore-graphql-query-handler.service'; @@ -14,6 +10,7 @@ import { EXPLORE_GQL_REQUEST, GraphQlExploreResponse } from '../../../../graphql/request/handlers/explore/explore-query'; +import { GraphQlDataSourceModel } from '../graphql-data-source.model'; @Model({ type: 'api-calls-count-data-source' diff --git a/projects/observability/src/shared/dashboard/data/graphql/api-calls-count/api-calls-count-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/api-calls-count/api-calls-count-data-source.model.test.ts index ab02abbaf..736242dc2 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/api-calls-count/api-calls-count-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/api-calls-count/api-calls-count-data-source.model.test.ts @@ -1,13 +1,15 @@ import { fakeAsync } from '@angular/core/testing'; -import { AttributeMetadataType, MetricAggregationType, ObservedGraphQlRequest } from '@hypertrace/distributed-tracing'; import { ModelApi } from '@hypertrace/hyperdash'; import { runFakeRxjs } from '@hypertrace/test-utils'; +import { AttributeMetadataType } from '../../../../graphql/model/metadata/attribute-metadata'; +import { MetricAggregationType } from '../../../../graphql/model/metrics/metric-aggregation'; import { ExploreSpecificationBuilder } from '../../../../graphql/request/builders/specification/explore/explore-specification-builder'; import { ExploreGraphQlQueryHandlerService } from '../../../../graphql/request/handlers/explore/explore-graphql-query-handler.service'; import { EXPLORE_GQL_REQUEST, GraphQlExploreResponse } from '../../../../graphql/request/handlers/explore/explore-query'; +import { ObservedGraphQlRequest } from '../graphql-query-event.service'; import { ApiCallsCountDataSourceModel } from './api-calls-count-data-source-model'; describe('API call count data source model', () => { diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/conditional/conditional-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/conditional/conditional-data-source.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/conditional/conditional-data-source.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/conditional/conditional-data-source.model.ts diff --git a/projects/observability/src/shared/dashboard/data/graphql/entity/aggregation/entity-metric-aggregation-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/entity/aggregation/entity-metric-aggregation-data-source.model.test.ts index eec46046e..6b15e21eb 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/entity/aggregation/entity-metric-aggregation-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/entity/aggregation/entity-metric-aggregation-data-source.model.test.ts @@ -1,7 +1,9 @@ -import { GraphQlFilter, GraphQlTimeRange, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { ModelApi } from '@hypertrace/hyperdash'; +import { MetricAggregationType } from '../../../../../graphql/model/metrics/metric-aggregation'; import { ObservabilityEntityType } from '../../../../../graphql/model/schema/entity'; import { GraphQlEntityFilter } from '../../../../../graphql/model/schema/filter/entity/graphql-entity-filter'; +import { GraphQlFilter } from '../../../../../graphql/model/schema/filter/graphql-filter'; +import { GraphQlTimeRange } from '../../../../../graphql/model/schema/timerange/graphql-time-range'; import { ObservabilitySpecificationBuilder } from '../../../../../graphql/request/builders/selections/observability-specification-builder'; import { ENTITY_GQL_REQUEST } from '../../../../../graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service'; import { EntityMetricAggregationDataSourceModel } from './entity-metric-aggregation-data-source.model'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/entity/aggregation/entity-metric-aggregation-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/entity/aggregation/entity-metric-aggregation-data-source.model.ts index 35237e87a..38fa4a368 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/entity/aggregation/entity-metric-aggregation-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/entity/aggregation/entity-metric-aggregation-data-source.model.ts @@ -1,6 +1,6 @@ -import { MetricAggregation } from '@hypertrace/distributed-tracing'; import { Model, ModelModelPropertyTypeInstance, ModelProperty, ModelPropertyType } from '@hypertrace/hyperdash'; import { Observable } from 'rxjs'; +import { MetricAggregation } from '../../../../../graphql/model/metrics/metric-aggregation'; import { MetricAggregationSpecification } from '../../../../../graphql/model/schema/specifications/metric-aggregation-specification'; import { MetricAggregationSpecificationModel } from '../../specifiers/metric-aggregation-specification.model'; import { EntityValueDataSourceModel } from '../entity-value-data-source.model'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/entity/attribute/entities-attribute-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/entity/attribute/entities-attribute-data-source.model.ts index 25f2e685a..9f22010ac 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/entity/attribute/entities-attribute-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/entity/attribute/entities-attribute-data-source.model.ts @@ -1,4 +1,3 @@ -import { AttributeSpecificationModel, Specification } from '@hypertrace/distributed-tracing'; import { Model, ModelModelPropertyTypeInstance, @@ -8,6 +7,8 @@ import { } from '@hypertrace/hyperdash'; import { Observable } from 'rxjs'; import { EntityType } from '../../../../../graphql/model/schema/entity'; +import { Specification } from '../../../../../graphql/model/schema/specifier/specification'; +import { AttributeSpecificationModel } from '../../specifiers/attribute-specification.model'; import { EntitiesValuesDataSourceModel } from '../entities-values-data-source.model'; @Model({ diff --git a/projects/observability/src/shared/dashboard/data/graphql/entity/attribute/entity-attribute-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/entity/attribute/entity-attribute-data-source.model.test.ts index c528358a7..b8abd7f63 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/entity/attribute/entity-attribute-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/entity/attribute/entity-attribute-data-source.model.test.ts @@ -1,7 +1,9 @@ -import { GraphQlFilter, GraphQlTimeRange, SpecificationBuilder } from '@hypertrace/distributed-tracing'; import { ModelApi } from '@hypertrace/hyperdash'; import { ObservabilityEntityType } from '../../../../../graphql/model/schema/entity'; import { GraphQlEntityFilter } from '../../../../../graphql/model/schema/filter/entity/graphql-entity-filter'; +import { GraphQlFilter } from '../../../../../graphql/model/schema/filter/graphql-filter'; +import { GraphQlTimeRange } from '../../../../../graphql/model/schema/timerange/graphql-time-range'; +import { SpecificationBuilder } from '../../../../../graphql/request/builders/specification/specification-builder'; import { ENTITY_GQL_REQUEST } from '../../../../../graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service'; import { EntityAttributeDataSourceModel } from './entity-attribute-data-source.model'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/entity/attribute/entity-attribute-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/entity/attribute/entity-attribute-data-source.model.ts index 601b8985c..7564e94b4 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/entity/attribute/entity-attribute-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/entity/attribute/entity-attribute-data-source.model.ts @@ -1,6 +1,7 @@ -import { AttributeSpecificationModel, Specification } from '@hypertrace/distributed-tracing'; import { Model, ModelModelPropertyTypeInstance, ModelProperty, ModelPropertyType } from '@hypertrace/hyperdash'; import { Observable } from 'rxjs'; +import { Specification } from '../../../../../graphql/model/schema/specifier/specification'; +import { AttributeSpecificationModel } from '../../specifiers/attribute-specification.model'; import { EntityValueDataSourceModel } from '../entity-value-data-source.model'; @Model({ diff --git a/projects/observability/src/shared/dashboard/data/graphql/entity/entities-values-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/entity/entities-values-data-source.model.ts index afcec9379..418d471f6 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/entity/entities-values-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/entity/entities-values-data-source.model.ts @@ -1,14 +1,16 @@ -import { GraphQlDataSourceModel, GraphQlFilter, Specification } from '@hypertrace/distributed-tracing'; import { ModelProperty, NUMBER_PROPERTY } from '@hypertrace/hyperdash'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { EntityType } from '../../../../graphql/model/schema/entity'; +import { GraphQlFilter } from '../../../../graphql/model/schema/filter/graphql-filter'; +import { Specification } from '../../../../graphql/model/schema/specifier/specification'; import { EntitiesResponse } from '../../../../graphql/request/handlers/entities/query/entities-graphql-query-builder.service'; import { EntitiesGraphQlQueryHandlerService, ENTITIES_GQL_REQUEST, GraphQlEntitiesQueryRequest } from '../../../../graphql/request/handlers/entities/query/entities-graphql-query-handler.service'; +import { GraphQlDataSourceModel } from '../graphql-data-source.model'; export abstract class EntitiesValuesDataSourceModel extends GraphQlDataSourceModel { protected abstract specification: Specification; diff --git a/projects/observability/src/shared/dashboard/data/graphql/entity/entity-value-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/entity/entity-value-data-source.model.ts index 92edfadfc..488346fad 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/entity/entity-value-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/entity/entity-value-data-source.model.ts @@ -1,14 +1,16 @@ import { Dictionary } from '@hypertrace/common'; -import { GraphQlDataSourceModel, GraphQlFilter, Specification } from '@hypertrace/distributed-tracing'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { Entity } from '../../../../graphql/model/schema/entity'; import { findEntityFilterOrThrow } from '../../../../graphql/model/schema/filter/entity/graphql-entity-filter'; +import { GraphQlFilter } from '../../../../graphql/model/schema/filter/graphql-filter'; +import { Specification } from '../../../../graphql/model/schema/specifier/specification'; import { EntityGraphQlQueryHandlerService, ENTITY_GQL_REQUEST, GraphQlEntityRequest } from '../../../../graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service'; +import { GraphQlDataSourceModel } from '../graphql-data-source.model'; export abstract class EntityValueDataSourceModel extends GraphQlDataSourceModel { protected abstract specification: Specification; diff --git a/projects/observability/src/shared/dashboard/data/graphql/entity/timeseries/entity-error-percentage-timeseries-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/entity/timeseries/entity-error-percentage-timeseries-data-source.model.ts index 0f245d389..914985335 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/entity/timeseries/entity-error-percentage-timeseries-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/entity/timeseries/entity-error-percentage-timeseries-data-source.model.ts @@ -1,21 +1,17 @@ import { Dictionary, forkJoinSafeEmpty, getPercentage, LoggerService, TimeDuration } from '@hypertrace/common'; -import { - GraphQlDataSourceModel, - GraphQlFilter, - MetricAggregation, - MetricAggregationType, - MetricSpecification, - Specification -} from '@hypertrace/distributed-tracing'; import { Model } from '@hypertrace/hyperdash'; import { ModelInject } from '@hypertrace/hyperdash-angular'; import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; import { Summary } from '../../../../../components/cartesian/chart'; import { MetricTimeseriesInterval } from '../../../../../graphql/model/metric/metric-timeseries'; +import { MetricAggregation, MetricAggregationType } from '../../../../../graphql/model/metrics/metric-aggregation'; import { Entity } from '../../../../../graphql/model/schema/entity'; import { findEntityFilterOrThrow } from '../../../../../graphql/model/schema/filter/entity/graphql-entity-filter'; +import { GraphQlFilter } from '../../../../../graphql/model/schema/filter/graphql-filter'; import { MetricAggregationSpecification } from '../../../../../graphql/model/schema/specifications/metric-aggregation-specification'; +import { Specification } from '../../../../../graphql/model/schema/specifier/specification'; +import { MetricSpecification } from '../../../../../graphql/model/specifications/metric-specification'; import { ObservabilitySpecificationBuilder } from '../../../../../graphql/request/builders/selections/observability-specification-builder'; import { EntityGraphQlQueryHandlerService, @@ -23,6 +19,7 @@ import { GraphQlEntityRequest } from '../../../../../graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service'; import { MetricSeries, MetricSeriesDataFetcher } from '../../../../widgets/charts/cartesian-widget/series.model'; +import { GraphQlDataSourceModel } from '../../graphql-data-source.model'; @Model({ type: 'entity-error-percentage-timeseries-data-source' diff --git a/projects/observability/src/shared/dashboard/data/graphql/entity/timeseries/entity-metric-timeseries-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/entity/timeseries/entity-metric-timeseries-data-source.model.ts index 199d34fa0..12b0753df 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/entity/timeseries/entity-metric-timeseries-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/entity/timeseries/entity-metric-timeseries-data-source.model.ts @@ -1,9 +1,9 @@ import { TimeDuration } from '@hypertrace/common'; -import { MetricAggregation } from '@hypertrace/distributed-tracing'; import { Model, ModelModelPropertyTypeInstance, ModelProperty, ModelPropertyType } from '@hypertrace/hyperdash'; import { combineLatest, Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; import { MetricTimeseriesInterval } from '../../../../../graphql/model/metric/metric-timeseries'; +import { MetricAggregation } from '../../../../../graphql/model/metrics/metric-aggregation'; import { ObservabilitySpecificationBuilder } from '../../../../../graphql/request/builders/selections/observability-specification-builder'; import { MetricSeries, MetricSeriesDataFetcher } from '../../../../widgets/charts/cartesian-widget/series.model'; import { MetricTimeseriesSpecificationModel } from '../../specifiers/metric-timeseries-specification.model'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/explore/explore-cartesian-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/explore/explore-cartesian-data-source.model.test.ts index a34eeb8c8..dc492c64f 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/explore/explore-cartesian-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/explore/explore-cartesian-data-source.model.test.ts @@ -1,11 +1,5 @@ import { ColorService, FixedTimeRange, TimeDuration, TimeUnit } from '@hypertrace/common'; import { createModelFactory } from '@hypertrace/dashboards/testing'; -import { - AttributeMetadataType, - GraphQlQueryEventService, - MetadataService, - MetricAggregationType -} from '@hypertrace/distributed-tracing'; import { Model } from '@hypertrace/hyperdash'; import { runFakeRxjs } from '@hypertrace/test-utils'; import { mockProvider } from '@ngneat/spectator/jest'; @@ -16,13 +10,17 @@ import { ExploreRequestState, ExploreSeries } from '../../../../components/explore-query-editor/explore-visualization-builder'; +import { AttributeMetadataType } from '../../../../graphql/model/metadata/attribute-metadata'; +import { MetricAggregationType } from '../../../../graphql/model/metrics/metric-aggregation'; import { ExploreSpecification } from '../../../../graphql/model/schema/specifications/explore-specification'; import { ExploreSpecificationBuilder } from '../../../../graphql/request/builders/specification/explore/explore-specification-builder'; import { GQL_EXPLORE_RESULT_INTERVAL_KEY, GraphQlExploreResponse } from '../../../../graphql/request/handlers/explore/explore-query'; +import { MetadataService } from '../../../../services/metadata/metadata.service'; import { CartesianResult } from '../../../widgets/charts/cartesian-widget/cartesian-widget.model'; +import { GraphQlQueryEventService } from '../graphql-query-event.service'; import { GraphQlGroupBy } from './../../../../graphql/model/schema/groupby/graphql-group-by'; import { ExploreCartesianDataSourceModel, ExplorerData } from './explore-cartesian-data-source.model'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/explore/explore-cartesian-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/explore/explore-cartesian-data-source.model.ts index 68eb120ac..2cafb5bea 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/explore/explore-cartesian-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/explore/explore-cartesian-data-source.model.ts @@ -1,10 +1,4 @@ import { ColorService, forkJoinSafeEmpty, RequireBy, TimeDuration } from '@hypertrace/common'; -import { - GraphQlDataSourceModel, - GraphQlFilter, - GraphQlTimeRange, - MetadataService -} from '@hypertrace/distributed-tracing'; import { ModelInject } from '@hypertrace/hyperdash-angular'; import { isEmpty } from 'lodash-es'; import { NEVER, Observable, of } from 'rxjs'; @@ -12,14 +6,18 @@ import { map, mergeMap } from 'rxjs/operators'; import { Series } from '../../../../components/cartesian/chart'; import { ExploreRequestState } from '../../../../components/explore-query-editor/explore-visualization-builder'; import { MetricTimeseriesInterval } from '../../../../graphql/model/metric/metric-timeseries'; +import { GraphQlFilter } from '../../../../graphql/model/schema/filter/graphql-filter'; import { ExploreSpecification } from '../../../../graphql/model/schema/specifications/explore-specification'; +import { GraphQlTimeRange } from '../../../../graphql/model/schema/timerange/graphql-time-range'; import { ExploreGraphQlQueryHandlerService } from '../../../../graphql/request/handlers/explore/explore-graphql-query-handler.service'; import { EXPLORE_GQL_REQUEST, GraphQlExploreRequest, GraphQlExploreResponse } from '../../../../graphql/request/handlers/explore/explore-query'; +import { MetadataService } from '../../../../services/metadata/metadata.service'; import { CartesianDataFetcher, CartesianResult } from '../../../widgets/charts/cartesian-widget/cartesian-widget.model'; +import { GraphQlDataSourceModel } from '../graphql-data-source.model'; import { ExploreResult } from './explore-result'; export abstract class ExploreCartesianDataSourceModel extends GraphQlDataSourceModel< diff --git a/projects/observability/src/shared/dashboard/data/graphql/explore/explore-result.test.ts b/projects/observability/src/shared/dashboard/data/graphql/explore/explore-result.test.ts index 1ae75aef8..87afdff75 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/explore/explore-result.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/explore/explore-result.test.ts @@ -1,4 +1,5 @@ -import { AttributeMetadataType, MetricAggregationType } from '@hypertrace/distributed-tracing'; +import { AttributeMetadataType } from '../../../../graphql/model/metadata/attribute-metadata'; +import { MetricAggregationType } from '../../../../graphql/model/metrics/metric-aggregation'; import { GQL_EXPLORE_RESULT_INTERVAL_KEY } from '../../../../graphql/request/handlers/explore/explore-query'; import { ExploreResult } from './explore-result'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/explore/explore-result.ts b/projects/observability/src/shared/dashboard/data/graphql/explore/explore-result.ts index 52cdedfb2..005a22a47 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/explore/explore-result.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/explore/explore-result.ts @@ -1,8 +1,9 @@ import { TimeDuration } from '@hypertrace/common'; -import { GraphQlTimeRange, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { groupBy } from 'lodash-es'; import { MetricTimeseriesInterval } from '../../../../graphql/model/metric/metric-timeseries'; +import { MetricAggregationType } from '../../../../graphql/model/metrics/metric-aggregation'; import { ExploreSpecification } from '../../../../graphql/model/schema/specifications/explore-specification'; +import { GraphQlTimeRange } from '../../../../graphql/model/schema/timerange/graphql-time-range'; import { ExploreSpecificationBuilder } from '../../../../graphql/request/builders/specification/explore/explore-specification-builder'; import { GQL_EXPLORE_RESULT_INTERVAL_KEY, diff --git a/projects/observability/src/shared/dashboard/data/graphql/explorer-visualization/explorer-visualization-cartesian-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/explorer-visualization/explorer-visualization-cartesian-data-source.model.test.ts index 62860f475..5a251f1db 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/explorer-visualization/explorer-visualization-cartesian-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/explorer-visualization/explorer-visualization-cartesian-data-source.model.test.ts @@ -1,17 +1,13 @@ import { ColorService, FixedTimeRange, TimeDuration, TimeUnit } from '@hypertrace/common'; import { createModelFactory } from '@hypertrace/dashboards/testing'; -import { - AttributeMetadataType, - GraphQlQueryEventService, - MetadataService, - MetricAggregationType -} from '@hypertrace/distributed-tracing'; import { runFakeRxjs } from '@hypertrace/test-utils'; import { mockProvider } from '@ngneat/spectator/jest'; import { EMPTY, Observable, of } from 'rxjs'; import { mergeMap, take } from 'rxjs/operators'; import { CartesianSeriesVisualizationType } from '../../../../components/cartesian/chart'; import { ExploreVisualizationRequest } from '../../../../components/explore-query-editor/explore-visualization-builder'; +import { AttributeMetadataType } from '../../../../graphql/model/metadata/attribute-metadata'; +import { MetricAggregationType } from '../../../../graphql/model/metrics/metric-aggregation'; import { ObservabilityTraceType } from '../../../../graphql/model/schema/observability-traces'; import { ExploreSpecification } from '../../../../graphql/model/schema/specifications/explore-specification'; import { ExploreSpecificationBuilder } from '../../../../graphql/request/builders/specification/explore/explore-specification-builder'; @@ -20,8 +16,10 @@ import { GQL_EXPLORE_RESULT_INTERVAL_KEY, GraphQlExploreResponse } from '../../../../graphql/request/handlers/explore/explore-query'; +import { MetadataService } from '../../../../services/metadata/metadata.service'; import { CartesianResult } from '../../../widgets/charts/cartesian-widget/cartesian-widget.model'; import { ExplorerData } from '../explore/explore-cartesian-data-source.model'; +import { GraphQlQueryEventService } from '../graphql-query-event.service'; import { ExplorerVisualizationCartesianDataSourceModel } from './explorer-visualization-cartesian-data-source.model'; describe('Explorer Visualization cartesian data source model', () => { diff --git a/projects/observability/src/shared/dashboard/data/graphql/explorer-visualization/explorer-visualization-cartesian-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/explorer-visualization/explorer-visualization-cartesian-data-source.model.ts index 061a2a2f2..7516b350e 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/explorer-visualization/explorer-visualization-cartesian-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/explorer-visualization/explorer-visualization-cartesian-data-source.model.ts @@ -1,5 +1,4 @@ import { TimeDuration } from '@hypertrace/common'; -import { GraphQlFilter, GraphQlTimeRange } from '@hypertrace/distributed-tracing'; import { Model } from '@hypertrace/hyperdash'; import { NEVER, Observable } from 'rxjs'; import { mergeMap, switchMap } from 'rxjs/operators'; @@ -7,6 +6,8 @@ import { ExploreRequestState, ExploreVisualizationRequest } from '../../../../components/explore-query-editor/explore-visualization-builder'; +import { GraphQlFilter } from '../../../../graphql/model/schema/filter/graphql-filter'; +import { GraphQlTimeRange } from '../../../../graphql/model/schema/timerange/graphql-time-range'; import { ExploreGraphQlQueryHandlerService } from '../../../../graphql/request/handlers/explore/explore-graphql-query-handler.service'; import { GraphQlExploreRequest } from '../../../../graphql/request/handlers/explore/explore-query'; import { CartesianResult } from '../../../widgets/charts/cartesian-widget/cartesian-widget.model'; diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/filter/graphql-filter-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/filter/graphql-filter-data-source.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/filter/graphql-filter-data-source.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/filter/graphql-filter-data-source.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/filter/graphql-id-scope-filter.model.ts b/projects/observability/src/shared/dashboard/data/graphql/filter/graphql-id-scope-filter.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/filter/graphql-id-scope-filter.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/filter/graphql-id-scope-filter.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/filter/graphql-key-value-filter.model.ts b/projects/observability/src/shared/dashboard/data/graphql/filter/graphql-key-value-filter.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/filter/graphql-key-value-filter.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/filter/graphql-key-value-filter.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/graphql-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/graphql-data-source.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/graphql-data-source.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/graphql-data-source.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/graphql-data-source.module.ts b/projects/observability/src/shared/dashboard/data/graphql/graphql-data-source.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/graphql-data-source.module.ts rename to projects/observability/src/shared/dashboard/data/graphql/graphql-data-source.module.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/graphql-handler-configuration.ts b/projects/observability/src/shared/dashboard/data/graphql/graphql-handler-configuration.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/graphql-handler-configuration.ts rename to projects/observability/src/shared/dashboard/data/graphql/graphql-handler-configuration.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/graphql-query-event.service.ts b/projects/observability/src/shared/dashboard/data/graphql/graphql-query-event.service.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/graphql-query-event.service.ts rename to projects/observability/src/shared/dashboard/data/graphql/graphql-query-event.service.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/graphql-table-control-options-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/graphql-table-control-options-data-source.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/graphql-table-control-options-data-source.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/graphql-table-control-options-data-source.model.ts diff --git a/projects/observability/src/shared/dashboard/data/graphql/metric-aggregation/metric-aggregation-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/metric-aggregation/metric-aggregation-data-source.model.test.ts index 8c8b7603e..9ea16c3ef 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/metric-aggregation/metric-aggregation-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/metric-aggregation/metric-aggregation-data-source.model.test.ts @@ -1,19 +1,17 @@ import { fakeAsync } from '@angular/core/testing'; -import { - AttributeMetadataType, - GraphQlFieldFilter, - GraphQlOperatorType, - MetricAggregationType, - ObservedGraphQlRequest -} from '@hypertrace/distributed-tracing'; import { ModelApi } from '@hypertrace/hyperdash'; import { runFakeRxjs } from '@hypertrace/test-utils'; +import { AttributeMetadataType } from '../../../../graphql/model/metadata/attribute-metadata'; +import { MetricAggregationType } from '../../../../graphql/model/metrics/metric-aggregation'; +import { GraphQlFieldFilter } from '../../../../graphql/model/schema/filter/field/graphql-field-filter'; +import { GraphQlOperatorType } from '../../../../graphql/model/schema/filter/graphql-filter'; import { ExploreSpecificationBuilder } from '../../../../graphql/request/builders/specification/explore/explore-specification-builder'; import { ExploreGraphQlQueryHandlerService } from '../../../../graphql/request/handlers/explore/explore-graphql-query-handler.service'; import { EXPLORE_GQL_REQUEST, GraphQlExploreResponse } from '../../../../graphql/request/handlers/explore/explore-query'; +import { ObservedGraphQlRequest } from '../graphql-query-event.service'; import { ExploreSelectionSpecificationModel } from '../specifiers/explore-selection-specification.model'; import { MetricAggregationDataSourceModel } from './metric-aggregation-data-source.model'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/metric-aggregation/metric-aggregation-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/metric-aggregation/metric-aggregation-data-source.model.ts index 854b90303..aa20952eb 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/metric-aggregation/metric-aggregation-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/metric-aggregation/metric-aggregation-data-source.model.ts @@ -1,4 +1,3 @@ -import { GraphQlDataSourceModel, MetricAggregation, MetricHealth } from '@hypertrace/distributed-tracing'; import { Model, ModelProperty, @@ -8,12 +7,15 @@ import { } from '@hypertrace/hyperdash'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { MetricAggregation } from '../../../../graphql/model/metrics/metric-aggregation'; +import { MetricHealth } from '../../../../graphql/model/metrics/metric-health'; import { ExploreSpecificationBuilder } from '../../../../graphql/request/builders/specification/explore/explore-specification-builder'; import { ExploreGraphQlQueryHandlerService } from '../../../../graphql/request/handlers/explore/explore-graphql-query-handler.service'; import { EXPLORE_GQL_REQUEST, GraphQlExploreResponse } from '../../../../graphql/request/handlers/explore/explore-query'; +import { GraphQlDataSourceModel } from '../graphql-data-source.model'; import { ExploreSelectionSpecificationModel } from '../specifiers/explore-selection-specification.model'; @Model({ diff --git a/projects/observability/src/shared/dashboard/data/graphql/percentage/percentage-composite-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/percentage/percentage-composite-data-source.model.ts index c1b195219..8b4e681c4 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/percentage/percentage-composite-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/percentage/percentage-composite-data-source.model.ts @@ -1,8 +1,10 @@ import { forkJoinSafeEmpty, getPercentage } from '@hypertrace/common'; -import { GraphQlDataSourceModel, MetricAggregation, MetricHealth } from '@hypertrace/distributed-tracing'; import { Model, ModelProperty, ModelPropertyType, ModelPropertyTypeInstance } from '@hypertrace/hyperdash'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { MetricAggregation } from '../../../../graphql/model/metrics/metric-aggregation'; +import { MetricHealth } from '../../../../graphql/model/metrics/metric-health'; +import { GraphQlDataSourceModel } from '../graphql-data-source.model'; import { MetricAggregationDataSourceModel } from '../metric-aggregation/metric-aggregation-data-source.model'; @Model({ diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/span/span-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/span/span-data-source.model.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/span/span-data-source.model.test.ts rename to projects/observability/src/shared/dashboard/data/graphql/span/span-data-source.model.test.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/span/span-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/span/span-data-source.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/span/span-data-source.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/span/span-data-source.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/specifiers/attribute-specification.model.ts b/projects/observability/src/shared/dashboard/data/graphql/specifiers/attribute-specification.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/specifiers/attribute-specification.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/specifiers/attribute-specification.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/specifiers/composite-specification.model.ts b/projects/observability/src/shared/dashboard/data/graphql/specifiers/composite-specification.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/specifiers/composite-specification.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/specifiers/composite-specification.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/specifiers/enriched-attribute-specification.model.ts b/projects/observability/src/shared/dashboard/data/graphql/specifiers/enriched-attribute-specification.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/specifiers/enriched-attribute-specification.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/specifiers/enriched-attribute-specification.model.ts diff --git a/projects/observability/src/shared/dashboard/data/graphql/specifiers/entity-specification.model.ts b/projects/observability/src/shared/dashboard/data/graphql/specifiers/entity-specification.model.ts index 4368c674d..e9ee92d79 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/specifiers/entity-specification.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/specifiers/entity-specification.model.ts @@ -1,9 +1,9 @@ import { Dictionary } from '@hypertrace/common'; -import { SpecificationModel } from '@hypertrace/distributed-tracing'; import { Model, ModelProperty, STRING_PROPERTY } from '@hypertrace/hyperdash'; import { Entity, EntityType } from '../../../../graphql/model/schema/entity'; import { EntitySpecification } from '../../../../graphql/model/schema/specifications/entity-specification'; import { ObservabilitySpecificationBuilder } from '../../../../graphql/request/builders/selections/observability-specification-builder'; +import { SpecificationModel } from './specification.model'; @Model({ type: 'entity-specification', diff --git a/projects/observability/src/shared/dashboard/data/graphql/specifiers/error-percentage-metric-aggregation.model.ts b/projects/observability/src/shared/dashboard/data/graphql/specifiers/error-percentage-metric-aggregation.model.ts index 61ac91f06..c0e79fdaa 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/specifiers/error-percentage-metric-aggregation.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/specifiers/error-percentage-metric-aggregation.model.ts @@ -1,12 +1,13 @@ import { Dictionary } from '@hypertrace/common'; import { EnumPropertyTypeInstance, ENUM_TYPE } from '@hypertrace/dashboards'; -import { MetricAggregationType, SpecificationModel } from '@hypertrace/distributed-tracing'; import { Model, ModelProperty } from '@hypertrace/hyperdash'; +import { MetricAggregationType } from '../../../../graphql/model/metrics/metric-aggregation'; import { ErrorPercentageMetricAggregation, ErrorPercentageMetricAggregationSpecification } from '../../../../graphql/model/schema/specifications/error-percentage-aggregation-specification'; import { ObservabilitySpecificationBuilder } from '../../../../graphql/request/builders/selections/observability-specification-builder'; +import { SpecificationModel } from './specification.model'; @Model({ type: 'error-percentage-metric-aggregation', diff --git a/projects/observability/src/shared/dashboard/data/graphql/specifiers/explore-selection-specification.model.ts b/projects/observability/src/shared/dashboard/data/graphql/specifiers/explore-selection-specification.model.ts index 024dc0eaa..fe69d2c9e 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/specifiers/explore-selection-specification.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/specifiers/explore-selection-specification.model.ts @@ -1,12 +1,13 @@ import { Dictionary } from '@hypertrace/common'; import { EnumPropertyTypeInstance, ENUM_TYPE } from '@hypertrace/dashboards'; -import { MetricAggregationType, SpecificationModel } from '@hypertrace/distributed-tracing'; import { Model, ModelProperty, STRING_PROPERTY } from '@hypertrace/hyperdash'; +import { MetricAggregationType } from '../../../../graphql/model/metrics/metric-aggregation'; import { ExploreSpecification, ExploreValue } from '../../../../graphql/model/schema/specifications/explore-specification'; import { ExploreSpecificationBuilder } from '../../../../graphql/request/builders/specification/explore/explore-specification-builder'; +import { SpecificationModel } from './specification.model'; @Model({ type: 'explore-selection', diff --git a/projects/observability/src/shared/dashboard/data/graphql/specifiers/explore/explorer-interval-timestamp-selection.model.ts b/projects/observability/src/shared/dashboard/data/graphql/specifiers/explore/explorer-interval-timestamp-selection.model.ts index f3deddbd8..e0f23675b 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/specifiers/explore/explorer-interval-timestamp-selection.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/specifiers/explore/explorer-interval-timestamp-selection.model.ts @@ -1,6 +1,7 @@ import { Dictionary } from '@hypertrace/common'; -import { Specification, SpecificationModel } from '@hypertrace/distributed-tracing'; import { Model } from '@hypertrace/hyperdash'; +import { Specification } from '../../../../../graphql/model/schema/specifier/specification'; +import { SpecificationModel } from '../specification.model'; import { ExploreSpecification, ExploreValue diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/specifiers/field-specification.model.ts b/projects/observability/src/shared/dashboard/data/graphql/specifiers/field-specification.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/specifiers/field-specification.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/specifiers/field-specification.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/specifiers/mapped-attribute-specification.model.ts b/projects/observability/src/shared/dashboard/data/graphql/specifiers/mapped-attribute-specification.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/specifiers/mapped-attribute-specification.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/specifiers/mapped-attribute-specification.model.ts diff --git a/projects/observability/src/shared/dashboard/data/graphql/specifiers/metric-aggregation-specification.model.ts b/projects/observability/src/shared/dashboard/data/graphql/specifiers/metric-aggregation-specification.model.ts index f616c5d07..165371a5f 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/specifiers/metric-aggregation-specification.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/specifiers/metric-aggregation-specification.model.ts @@ -1,6 +1,6 @@ import { Dictionary } from '@hypertrace/common'; -import { MetricAggregation } from '@hypertrace/distributed-tracing'; import { Model } from '@hypertrace/hyperdash'; +import { MetricAggregation } from '../../../../graphql/model/metrics/metric-aggregation'; import { GraphQlMetricAggregation } from '../../../../graphql/model/schema/metric/graphql-metric-aggregation'; import { MetricAggregationSpecification } from '../../../../graphql/model/schema/specifications/metric-aggregation-specification'; import { ObservabilitySpecificationBuilder } from '../../../../graphql/request/builders/selections/observability-specification-builder'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/specifiers/metric-specification.model.ts b/projects/observability/src/shared/dashboard/data/graphql/specifiers/metric-specification.model.ts index 994e0635f..73057e66f 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/specifiers/metric-specification.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/specifiers/metric-specification.model.ts @@ -1,6 +1,8 @@ import { EnumPropertyTypeInstance, ENUM_TYPE } from '@hypertrace/dashboards'; -import { MetricAggregationType, MetricSpecification, SpecificationModel } from '@hypertrace/distributed-tracing'; import { ModelProperty, STRING_PROPERTY } from '@hypertrace/hyperdash'; +import { MetricAggregationType } from '../../../../graphql/model/metrics/metric-aggregation'; +import { MetricSpecification } from '../../../../graphql/model/specifications/metric-specification'; +import { SpecificationModel } from './specification.model'; export abstract class MetricSpecificationModel extends SpecificationModel diff --git a/projects/observability/src/shared/dashboard/data/graphql/specifiers/metric-timeseries-specification.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/specifiers/metric-timeseries-specification.model.test.ts index 72a1f9d13..00bd239ae 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/specifiers/metric-timeseries-specification.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/specifiers/metric-timeseries-specification.model.test.ts @@ -1,7 +1,7 @@ import { IntervalDurationService, isEqualIgnoreFunctions, TimeDuration, TimeUnit } from '@hypertrace/common'; import { createModelFactory } from '@hypertrace/dashboards/testing'; -import { MetricAggregationType } from '@hypertrace/distributed-tracing'; import { mockProvider } from '@ngneat/spectator/jest'; +import { MetricAggregationType } from '../../../../graphql/model/metrics/metric-aggregation'; import { ObservabilitySpecificationBuilder } from '../../../../graphql/request/builders/selections/observability-specification-builder'; import { MetricTimeseriesSpecificationModel } from './metric-timeseries-specification.model'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/specifiers/percentile-latency-metric-aggregation.model.ts b/projects/observability/src/shared/dashboard/data/graphql/specifiers/percentile-latency-metric-aggregation.model.ts index 794ad9b89..aea5f4a4e 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/specifiers/percentile-latency-metric-aggregation.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/specifiers/percentile-latency-metric-aggregation.model.ts @@ -1,12 +1,13 @@ import { Dictionary } from '@hypertrace/common'; -import { MetricAggregationType, SpecificationModel } from '@hypertrace/distributed-tracing'; import { Model } from '@hypertrace/hyperdash'; +import { MetricAggregationType } from '../../../../graphql/model/metrics/metric-aggregation'; import { GraphQlMetricAggregation } from '../../../../graphql/model/schema/metric/graphql-metric-aggregation'; import { PercentileLatencyMetricAggregation, PercentileLatencyMetricAggregationSpecification } from '../../../../graphql/model/schema/specifications/percentile-latency-aggregation-specification'; import { ObservabilitySpecificationBuilder } from '../../../../graphql/request/builders/selections/observability-specification-builder'; +import { SpecificationModel } from './specification.model'; @Model({ type: 'percentile-latency-metric-aggregation', diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/specifiers/specification.model.ts b/projects/observability/src/shared/dashboard/data/graphql/specifiers/specification.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/specifiers/specification.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/specifiers/specification.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/specifiers/trace-status-specification.model.ts b/projects/observability/src/shared/dashboard/data/graphql/specifiers/trace-status-specification.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/specifiers/trace-status-specification.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/specifiers/trace-status-specification.model.ts diff --git a/projects/observability/src/shared/dashboard/data/graphql/table/entity/entity-table-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/table/entity/entity-table-data-source.model.test.ts index 532040a28..345ef68e9 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/table/entity/entity-table-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/table/entity/entity-table-data-source.model.test.ts @@ -7,17 +7,15 @@ import { TableSortDirection } from '@hypertrace/components'; import { createModelFactory, SpectatorModel } from '@hypertrace/dashboards/testing'; -import { - GraphQlFilterBuilderService, - GraphQlTimeRange, - SpecificationBackedTableColumnDef -} from '@hypertrace/distributed-tracing'; import { GraphQlRequestService } from '@hypertrace/graphql-client'; import { ModelApi } from '@hypertrace/hyperdash'; import { mockProvider } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; import { ObservabilityEntityType } from '../../../../../graphql/model/schema/entity'; +import { GraphQlTimeRange } from '../../../../../graphql/model/schema/timerange/graphql-time-range'; import { ObservabilitySpecificationBuilder } from '../../../../../graphql/request/builders/selections/observability-specification-builder'; +import { GraphQlFilterBuilderService } from '../../../../../services/filter-builder/graphql-filter-builder.service'; +import { SpecificationBackedTableColumnDef } from '../../../../widgets/table/table-widget-column.model'; import { entityIdKey, entityTypeKey } from './../../../../../graphql/model/schema/entity'; import { ENTITIES_GQL_REQUEST } from './../../../../../graphql/request/handlers/entities/query/entities-graphql-query-handler.service'; import { EntityTableDataSourceModel } from './entity-table-data-source.model'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/table/entity/entity-table-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/table/entity/entity-table-data-source.model.ts index bc7b9a9e5..85428b77f 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/table/entity/entity-table-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/table/entity/entity-table-data-source.model.ts @@ -1,10 +1,4 @@ import { TableDataRequest, TableDataResponse, TableRow } from '@hypertrace/components'; -import { - GraphQlFilter, - Specification, - SpecificationBackedTableColumnDef, - TableDataSourceModel -} from '@hypertrace/distributed-tracing'; import { ARRAY_PROPERTY, Model, @@ -17,11 +11,15 @@ import { EMPTY, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { Entity, EntityType } from '../../../../../graphql/model/schema/entity'; import { GraphQlEntityFilter } from '../../../../../graphql/model/schema/filter/entity/graphql-entity-filter'; +import { GraphQlFilter } from '../../../../../graphql/model/schema/filter/graphql-filter'; +import { Specification } from '../../../../../graphql/model/schema/specifier/specification'; import { EntitiesResponse } from '../../../../../graphql/request/handlers/entities/query/entities-graphql-query-builder.service'; import { ENTITIES_GQL_REQUEST, GraphQlEntitiesQueryRequest } from '../../../../../graphql/request/handlers/entities/query/entities-graphql-query-handler.service'; +import { SpecificationBackedTableColumnDef } from '../../../../widgets/table/table-widget-column.model'; +import { TableDataSourceModel } from '../table-data-source.model'; @Model({ type: 'entity-table-data-source' diff --git a/projects/observability/src/shared/dashboard/data/graphql/table/entity/mode-entity-table-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/table/entity/mode-entity-table-data-source.model.ts index 256037931..c7136e177 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/table/entity/mode-entity-table-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/table/entity/mode-entity-table-data-source.model.ts @@ -1,12 +1,10 @@ import { assertUnreachable } from '@hypertrace/common'; import { TableDataRequest, TableDataResponse, TableMode, TableRow } from '@hypertrace/components'; import { ModelTemplatePropertyType } from '@hypertrace/dashboards'; -import { - GraphQlFilter, - SpecificationBackedTableColumnDef, - TableDataSourceModel -} from '@hypertrace/distributed-tracing'; import { Model, ModelJson, ModelProperty } from '@hypertrace/hyperdash'; +import { GraphQlFilter } from '../../../../../graphql/model/schema/filter/graphql-filter'; +import { SpecificationBackedTableColumnDef } from '../../../../widgets/table/table-widget-column.model'; +import { TableDataSourceModel } from '../table-data-source.model'; @Model({ type: 'mode-entity-table-data-source' diff --git a/projects/observability/src/shared/dashboard/data/graphql/table/explore/explore-table-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/table/explore/explore-table-data-source.model.test.ts index ab3b5f775..689c07f08 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/table/explore/explore-table-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/table/explore/explore-table-data-source.model.test.ts @@ -3,12 +3,14 @@ import { TimeDuration, TimeUnit } from '@hypertrace/common'; import { TableDataSource, TableRow, TableSortDirection } from '@hypertrace/components'; import { TimeDurationModel } from '@hypertrace/dashboards'; import { createModelFactory, SpectatorModel } from '@hypertrace/dashboards/testing'; -import { GraphQlTimeRange, SpecificationBackedTableColumnDef } from '@hypertrace/distributed-tracing'; import { GraphQlRequestService } from '@hypertrace/graphql-client'; import { ModelApi } from '@hypertrace/hyperdash'; -import { ExploreSpecificationBuilder, EXPLORE_GQL_REQUEST } from '@hypertrace/observability'; import { mockProvider } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; +import { GraphQlTimeRange } from '../../../../../graphql/model/schema/timerange/graphql-time-range'; +import { ExploreSpecificationBuilder } from '../../../../../graphql/request/builders/specification/explore/explore-specification-builder'; +import { EXPLORE_GQL_REQUEST } from '../../../../../graphql/request/handlers/explore/explore-query'; +import { SpecificationBackedTableColumnDef } from '../../../../widgets/table/table-widget-column.model'; import { ExploreSpecification } from './../../../../../graphql/model/schema/specifications/explore-specification'; import { ExploreTableDataSourceModel } from './explore-table-data-source.model'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/table/explore/explore-table-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/table/explore/explore-table-data-source.model.ts index 40f6fa3d2..808fd0fe1 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/table/explore/explore-table-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/table/explore/explore-table-data-source.model.ts @@ -1,10 +1,5 @@ import { TableDataRequest, TableDataResponse, TableRow } from '@hypertrace/components'; import { TimeDurationModel } from '@hypertrace/dashboards'; -import { - GraphQlFilter, - SpecificationBackedTableColumnDef, - TableDataSourceModel -} from '@hypertrace/distributed-tracing'; import { ARRAY_PROPERTY, BOOLEAN_PROPERTY, @@ -15,6 +10,9 @@ import { NUMBER_PROPERTY, STRING_PROPERTY } from '@hypertrace/hyperdash'; +import { GraphQlFilter } from '../../../../../graphql/model/schema/filter/graphql-filter'; +import { SpecificationBackedTableColumnDef } from '../../../../widgets/table/table-widget-column.model'; +import { TableDataSourceModel } from '../table-data-source.model'; import { ExploreSpecification } from './../../../../../graphql/model/schema/specifications/explore-specification'; import { EXPLORE_GQL_REQUEST, diff --git a/projects/observability/src/shared/dashboard/data/graphql/table/interactions/interactions-table-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/table/interactions/interactions-table-data-source.model.test.ts index 71c45f9b3..b432aee76 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/table/interactions/interactions-table-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/table/interactions/interactions-table-data-source.model.test.ts @@ -1,17 +1,15 @@ import { fakeAsync, flush } from '@angular/core/testing'; import { isEqualIgnoreFunctions } from '@hypertrace/common'; import { TableDataSource, TableRow } from '@hypertrace/components'; -import { - GraphQlTimeRange, - MetricAggregationType, - SpecificationBackedTableColumnDef -} from '@hypertrace/distributed-tracing'; import { ModelApi } from '@hypertrace/hyperdash'; +import { MetricAggregationType } from '../../../../../graphql/model/metrics/metric-aggregation'; import { ObservabilityEntityType } from '../../../../../graphql/model/schema/entity'; import { GraphQlEntityFilter } from '../../../../../graphql/model/schema/filter/entity/graphql-entity-filter'; import { NeighborDirection } from '../../../../../graphql/model/schema/neighbor'; +import { GraphQlTimeRange } from '../../../../../graphql/model/schema/timerange/graphql-time-range'; import { ObservabilitySpecificationBuilder } from '../../../../../graphql/request/builders/selections/observability-specification-builder'; import { INTERACTIONS_GQL_REQUEST } from '../../../../../graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service'; +import { SpecificationBackedTableColumnDef } from '../../../../widgets/table/table-widget-column.model'; import { InteractionsTableDataSourceModel } from './interactions-table-data-source.model'; describe('Interactions table data source model', () => { diff --git a/projects/observability/src/shared/dashboard/data/graphql/table/interactions/interactions-table-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/table/interactions/interactions-table-data-source.model.ts index 80d1efda6..367da5223 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/table/interactions/interactions-table-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/table/interactions/interactions-table-data-source.model.ts @@ -1,19 +1,17 @@ import { TableDataRequest, TableDataResponse, TableRow } from '@hypertrace/components'; -import { - GraphQlFilter, - Specification, - SpecificationBackedTableColumnDef, - TableDataSourceModel -} from '@hypertrace/distributed-tracing'; import { Model } from '@hypertrace/hyperdash'; import { ObservabilityEntityType } from '../../../../../graphql/model/schema/entity'; import { findEntityFilterOrThrow } from '../../../../../graphql/model/schema/filter/entity/graphql-entity-filter'; +import { GraphQlFilter } from '../../../../../graphql/model/schema/filter/graphql-filter'; import { NeighborDirection, specificationDefinesNeighbor } from '../../../../../graphql/model/schema/neighbor'; +import { Specification } from '../../../../../graphql/model/schema/specifier/specification'; import { GraphQlInteractionsRequest, InteractionsResponse, INTERACTIONS_GQL_REQUEST } from '../../../../../graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service'; +import { SpecificationBackedTableColumnDef } from '../../../../widgets/table/table-widget-column.model'; +import { TableDataSourceModel } from '../table-data-source.model'; @Model({ type: 'interactions-table-data-source' diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/table/spans/spans-table-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/table/spans/spans-table-data-source.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/table/spans/spans-table-data-source.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/table/spans/spans-table-data-source.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/table/table-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/table/table-data-source.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/table/table-data-source.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/table/table-data-source.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/table/traces/traces-table-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/table/traces/traces-table-data-source.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/table/traces/traces-table-data-source.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/table/traces/traces-table-data-source.model.ts diff --git a/projects/observability/src/shared/dashboard/data/graphql/topology/metrics/topology-metric-with-category.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/topology/metrics/topology-metric-with-category.model.test.ts index 4d496b2f1..04fd69cb8 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/topology/metrics/topology-metric-with-category.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/topology/metrics/topology-metric-with-category.model.test.ts @@ -1,6 +1,6 @@ import { Color } from '@hypertrace/common'; import { createModelFactory } from '@hypertrace/dashboards/testing'; -import { MetricAggregationType } from '@hypertrace/distributed-tracing'; +import { MetricAggregationType } from '../../../../../graphql/model/metrics/metric-aggregation'; import { MetricAggregationSpecificationModel } from '../../specifiers/metric-aggregation-specification.model'; import { TopologyMetricCategoryModel } from './topology-metric-category.model'; import { TopologyMetricWithCategoryModel } from './topology-metric-with-category.model'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/topology/metrics/topology-metric-with-category.model.ts b/projects/observability/src/shared/dashboard/data/graphql/topology/metrics/topology-metric-with-category.model.ts index 644ff2afe..5db0402af 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/topology/metrics/topology-metric-with-category.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/topology/metrics/topology-metric-with-category.model.ts @@ -1,5 +1,4 @@ import { Dictionary } from '@hypertrace/common'; -import { MetricAggregation } from '@hypertrace/distributed-tracing'; import { ARRAY_PROPERTY, Model, @@ -7,6 +6,7 @@ import { ModelProperty, ModelPropertyType } from '@hypertrace/hyperdash'; +import { MetricAggregation } from '../../../../../graphql/model/metrics/metric-aggregation'; import { MetricAggregationSpecificationModel } from '../../specifiers/metric-aggregation-specification.model'; import { MetricAggregationSpecification } from './../../../../../graphql/model/schema/specifications/metric-aggregation-specification'; import { TopologyMetricCategoryData, TopologyMetricCategoryModel } from './topology-metric-category.model'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/topology/topology-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/topology/topology-data-source.model.test.ts index c23e32803..a8a213c47 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/topology/topology-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/topology/topology-data-source.model.test.ts @@ -1,8 +1,9 @@ import { Color } from '@hypertrace/common'; -import { GraphQlTimeRange, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { GraphQlRequestCacheability, GraphQlRequestOptions } from '@hypertrace/graphql-client'; import { ModelApi } from '@hypertrace/hyperdash'; +import { MetricAggregationType } from '../../../../graphql/model/metrics/metric-aggregation'; import { ObservabilityEntityType } from '../../../../graphql/model/schema/entity'; +import { GraphQlTimeRange } from '../../../../graphql/model/schema/timerange/graphql-time-range'; import { ENTITY_TOPOLOGY_GQL_REQUEST, TopologyNodeSpecification diff --git a/projects/observability/src/shared/dashboard/data/graphql/topology/topology-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/topology/topology-data-source.model.ts index faefa584b..052d635b0 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/topology/topology-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/topology/topology-data-source.model.ts @@ -1,5 +1,4 @@ import { ArrayPropertyTypeInstance, EnumPropertyTypeInstance, ENUM_TYPE } from '@hypertrace/dashboards'; -import { GraphQlDataSourceModel, SpecificationBuilder } from '@hypertrace/distributed-tracing'; import { GraphQlRequestCacheability, GraphQlRequestOptions } from '@hypertrace/graphql-client'; import { ARRAY_PROPERTY, @@ -13,6 +12,7 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ObservabilityEntityType } from '../../../../graphql/model/schema/entity'; import { MetricAggregationSpecification } from '../../../../graphql/model/schema/specifications/metric-aggregation-specification'; +import { SpecificationBuilder } from '../../../../graphql/request/builders/specification/specification-builder'; import { EntityNode, EntityTopologyGraphQlQueryHandlerService, @@ -20,6 +20,7 @@ import { TopologyEdgeSpecification, TopologyNodeSpecification } from '../../../../graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service'; +import { GraphQlDataSourceModel } from '../graphql-data-source.model'; import { TopologyMetricsData, TopologyMetricsModel } from './metrics/topology-metrics.model'; @Model({ diff --git a/projects/observability/src/shared/dashboard/data/graphql/trace/aggregation/trace-metric-aggregation-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/trace/aggregation/trace-metric-aggregation-data-source.model.test.ts index de619da84..4c72fa5b4 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/trace/aggregation/trace-metric-aggregation-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/trace/aggregation/trace-metric-aggregation-data-source.model.test.ts @@ -1,6 +1,8 @@ -import { GraphQlFilter, GraphQlTimeRange, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { ModelApi } from '@hypertrace/hyperdash'; +import { MetricAggregationType } from '../../../../../graphql/model/metrics/metric-aggregation'; +import { GraphQlFilter } from '../../../../../graphql/model/schema/filter/graphql-filter'; import { ObservabilityTraceType } from '../../../../../graphql/model/schema/observability-traces'; +import { GraphQlTimeRange } from '../../../../../graphql/model/schema/timerange/graphql-time-range'; import { ExploreSpecificationBuilder } from '../../../../../graphql/request/builders/specification/explore/explore-specification-builder'; import { EXPLORE_GQL_REQUEST } from '../../../../../graphql/request/handlers/explore/explore-query'; import { TraceMetricAggregationDataSourceModel } from './trace-metric-aggregation-data-source.model'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/trace/aggregation/trace-metric-aggregation-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/trace/aggregation/trace-metric-aggregation-data-source.model.ts index 130e84c92..4f52b6401 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/trace/aggregation/trace-metric-aggregation-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/trace/aggregation/trace-metric-aggregation-data-source.model.ts @@ -1,7 +1,8 @@ -import { MetricAggregation, MetricHealth } from '@hypertrace/distributed-tracing'; import { Model, ModelModelPropertyTypeInstance, ModelProperty, ModelPropertyType } from '@hypertrace/hyperdash'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { MetricAggregation } from '../../../../../graphql/model/metrics/metric-aggregation'; +import { MetricHealth } from '../../../../../graphql/model/metrics/metric-health'; import { ExploreSpecification } from '../../../../../graphql/model/schema/specifications/explore-specification'; import { ExploreSelectionSpecificationModel } from '../../specifiers/explore-selection-specification.model'; import { TraceValueDataSourceModel } from '../trace-value-data-source.model'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/trace/donut/trace-donut-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/trace/donut/trace-donut-data-source.model.test.ts index 01be4b708..c74c1b8e4 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/trace/donut/trace-donut-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/trace/donut/trace-donut-data-source.model.test.ts @@ -1,21 +1,19 @@ import { createModelFactory } from '@hypertrace/dashboards/testing'; -import { - AttributeMetadataType, - GraphQlQueryEventService, - GraphQlTimeRange, - MetricAggregationType -} from '@hypertrace/distributed-tracing'; import { recordObservable, runFakeRxjs } from '@hypertrace/test-utils'; import { mockProvider } from '@ngneat/spectator/jest'; import { Observable } from 'rxjs'; import { map, take } from 'rxjs/operators'; import { DonutSeriesResults } from '../../../../../components/donut/donut'; +import { AttributeMetadataType } from '../../../../../graphql/model/metadata/attribute-metadata'; +import { MetricAggregationType } from '../../../../../graphql/model/metrics/metric-aggregation'; import { ObservabilityTraceType } from '../../../../../graphql/model/schema/observability-traces'; +import { GraphQlTimeRange } from '../../../../../graphql/model/schema/timerange/graphql-time-range'; import { ObservabilitySpecificationBuilder } from '../../../../../graphql/request/builders/selections/observability-specification-builder'; import { EXPLORE_GQL_REQUEST, GraphQlExploreResponse } from '../../../../../graphql/request/handlers/explore/explore-query'; +import { GraphQlQueryEventService } from '../../graphql-query-event.service'; import { TraceDonutDataSourceModel } from './trace-donut-data-source.model'; describe('Donut data source model', () => { diff --git a/projects/observability/src/shared/dashboard/data/graphql/trace/donut/trace-donut-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/trace/donut/trace-donut-data-source.model.ts index eab70b3eb..c272b9c68 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/trace/donut/trace-donut-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/trace/donut/trace-donut-data-source.model.ts @@ -1,4 +1,3 @@ -import { AttributeSpecificationModel, GraphQlDataSourceModel, Specification } from '@hypertrace/distributed-tracing'; import { Model, ModelModelPropertyTypeInstance, @@ -11,6 +10,7 @@ import { map } from 'rxjs/operators'; import { DonutSeries, DonutSeriesResults } from '../../../../../components/donut/donut'; import { ObservabilityTraceType } from '../../../../../graphql/model/schema/observability-traces'; import { MetricAggregationSpecification } from '../../../../../graphql/model/schema/specifications/metric-aggregation-specification'; +import { Specification } from '../../../../../graphql/model/schema/specifier/specification'; import { ExploreSpecificationBuilder } from '../../../../../graphql/request/builders/specification/explore/explore-specification-builder'; import { ExploreGraphQlQueryHandlerService } from '../../../../../graphql/request/handlers/explore/explore-graphql-query-handler.service'; import { @@ -18,6 +18,8 @@ import { GraphQlExploreResponse } from '../../../../../graphql/request/handlers/explore/explore-query'; import { ExploreResult } from '../../explore/explore-result'; +import { GraphQlDataSourceModel } from '../../graphql-data-source.model'; +import { AttributeSpecificationModel } from '../../specifiers/attribute-specification.model'; import { MetricAggregationSpecificationModel } from '../../specifiers/metric-aggregation-specification.model'; @Model({ diff --git a/projects/observability/src/shared/dashboard/data/graphql/trace/timeseries/trace-metric-timeseries-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/trace/timeseries/trace-metric-timeseries-data-source.model.test.ts index 7d6b815e1..9a4165a11 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/trace/timeseries/trace-metric-timeseries-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/trace/timeseries/trace-metric-timeseries-data-source.model.test.ts @@ -1,7 +1,9 @@ import { TimeDuration, TimeUnit } from '@hypertrace/common'; -import { GraphQlFilter, GraphQlTimeRange, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { ModelApi } from '@hypertrace/hyperdash'; +import { MetricAggregationType } from '../../../../../graphql/model/metrics/metric-aggregation'; +import { GraphQlFilter } from '../../../../../graphql/model/schema/filter/graphql-filter'; import { ObservabilityTraceType } from '../../../../../graphql/model/schema/observability-traces'; +import { GraphQlTimeRange } from '../../../../../graphql/model/schema/timerange/graphql-time-range'; import { ExploreSpecificationBuilder } from '../../../../../graphql/request/builders/specification/explore/explore-specification-builder'; import { EXPLORE_GQL_REQUEST } from '../../../../../graphql/request/handlers/explore/explore-query'; import { TraceMetricTimeseriesDataSourceModel } from './trace-metric-timeseries-data-source.model'; diff --git a/projects/observability/src/shared/dashboard/data/graphql/trace/timeseries/trace-metric-timeseries-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/trace/timeseries/trace-metric-timeseries-data-source.model.ts index 28d335393..962871408 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/trace/timeseries/trace-metric-timeseries-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/trace/timeseries/trace-metric-timeseries-data-source.model.ts @@ -1,5 +1,4 @@ import { forkJoinSafeEmpty, TimeDuration } from '@hypertrace/common'; -import { MetadataService } from '@hypertrace/distributed-tracing'; import { Model, ModelModelPropertyTypeInstance, ModelProperty, ModelPropertyType } from '@hypertrace/hyperdash'; import { ModelInject } from '@hypertrace/hyperdash-angular'; import { Observable, of } from 'rxjs'; @@ -11,6 +10,7 @@ import { GQL_EXPLORE_RESULT_INTERVAL_KEY, GraphQlExploreResult } from '../../../../../graphql/request/handlers/explore/explore-query'; +import { MetadataService } from '../../../../../services/metadata/metadata.service'; import { MetricSeries, MetricSeriesDataFetcher } from '../../../../widgets/charts/cartesian-widget/series.model'; import { ExploreSelectionSpecificationModel } from '../../specifiers/explore-selection-specification.model'; import { TraceSeriesValuesDataSourceModel } from '../trace-series-values-data-source.model'; diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/trace/trace-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/trace/trace-data-source.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/trace/trace-data-source.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/trace/trace-data-source.model.ts diff --git a/projects/observability/src/shared/dashboard/data/graphql/trace/trace-series-values-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/trace/trace-series-values-data-source.model.ts index 110c40245..0ef72dd80 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/trace/trace-series-values-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/trace/trace-series-values-data-source.model.ts @@ -1,5 +1,4 @@ import { TimeDuration } from '@hypertrace/common'; -import { GraphQlDataSourceModel } from '@hypertrace/distributed-tracing'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ObservabilityTraceType } from '../../../../graphql/model/schema/observability-traces'; @@ -10,6 +9,7 @@ import { GraphQlExploreRequest, GraphQlExploreResult } from '../../../../graphql/request/handlers/explore/explore-query'; +import { GraphQlDataSourceModel } from '../graphql-data-source.model'; export abstract class TraceSeriesValuesDataSourceModel extends GraphQlDataSourceModel { protected abstract specification: ExploreSpecification; diff --git a/projects/observability/src/shared/dashboard/data/graphql/trace/trace-value-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/trace/trace-value-data-source.model.ts index 68c87d77b..b7e953b96 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/trace/trace-value-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/trace/trace-value-data-source.model.ts @@ -1,4 +1,3 @@ -import { GraphQlDataSourceModel } from '@hypertrace/distributed-tracing'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ObservabilityTraceType } from '../../../../graphql/model/schema/observability-traces'; @@ -9,6 +8,7 @@ import { GraphQlExploreRequest, GraphQlExploreResultValue } from '../../../../graphql/request/handlers/explore/explore-query'; +import { GraphQlDataSourceModel } from '../graphql-data-source.model'; export abstract class TraceValueDataSourceModel extends GraphQlDataSourceModel { protected abstract specification: ExploreSpecification; diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/trace/traces-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/trace/traces-data-source.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/trace/traces-data-source.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/trace/traces-data-source.model.ts diff --git a/projects/observability/src/shared/dashboard/data/graphql/waterfall/api-trace-waterfall-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/waterfall/api-trace-waterfall-data-source.model.test.ts index 33ae7156a..48ec1161f 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/waterfall/api-trace-waterfall-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/waterfall/api-trace-waterfall-data-source.model.test.ts @@ -1,21 +1,16 @@ import { createModelFactory } from '@hypertrace/dashboards/testing'; -import { - GraphQlQueryEventService, - LogEventsService, - MetadataService, - spanIdKey, - SpanType, - Trace, - traceIdKey, - traceTypeKey, - TRACE_GQL_REQUEST, - WaterfallData -} from '@hypertrace/distributed-tracing'; import { recordObservable, runFakeRxjs } from '@hypertrace/test-utils'; import { mockProvider } from '@ngneat/spectator/jest'; import { Observable, of } from 'rxjs'; import { map, take } from 'rxjs/operators'; import { ObservabilityTraceType } from '../../../../graphql/model/schema/observability-traces'; +import { spanIdKey, SpanType } from '../../../../graphql/model/schema/span'; +import { Trace, traceIdKey, traceTypeKey } from '../../../../graphql/model/schema/trace'; +import { TRACE_GQL_REQUEST } from '../../../../graphql/request/handlers/traces/trace-graphql-query-handler.service'; +import { LogEventsService } from '../../../../services/log-events/log-events.service'; +import { MetadataService } from '../../../../services/metadata/metadata.service'; +import { WaterfallData } from '../../../widgets/waterfall/waterfall/waterfall-chart'; +import { GraphQlQueryEventService } from '../graphql-query-event.service'; import { ApiTraceWaterfallDataSourceModel } from './api-trace-waterfall-data-source.model'; describe('Api Trace Waterfall data source model', () => { diff --git a/projects/observability/src/shared/dashboard/data/graphql/waterfall/api-trace-waterfall-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/waterfall/api-trace-waterfall-data-source.model.ts index 07a77ec4f..a804293e9 100644 --- a/projects/observability/src/shared/dashboard/data/graphql/waterfall/api-trace-waterfall-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/data/graphql/waterfall/api-trace-waterfall-data-source.model.ts @@ -1,26 +1,21 @@ import { DateCoercer, Dictionary } from '@hypertrace/common'; -import { - AttributeMetadata, - GraphQlDataSourceModel, - LogEvent, - LogEventsService, - MetadataService, - Span, - spanIdKey, - SpanType, - SPAN_SCOPE, - SpecificationBuilder, - Trace, - TraceGraphQlQueryHandlerService, - traceIdKey, - TRACE_GQL_REQUEST, - WaterfallData -} from '@hypertrace/distributed-tracing'; import { Model, ModelProperty, STRING_PROPERTY, UNKNOWN_PROPERTY } from '@hypertrace/hyperdash'; import { ModelInject } from '@hypertrace/hyperdash-angular'; import { combineLatest, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { AttributeMetadata } from '../../../../graphql/model/metadata/attribute-metadata'; import { ObservabilityTraceType } from '../../../../graphql/model/schema/observability-traces'; +import { Span, spanIdKey, SpanType, SPAN_SCOPE } from '../../../../graphql/model/schema/span'; +import { Trace, traceIdKey } from '../../../../graphql/model/schema/trace'; +import { SpecificationBuilder } from '../../../../graphql/request/builders/specification/specification-builder'; +import { + TraceGraphQlQueryHandlerService, + TRACE_GQL_REQUEST +} from '../../../../graphql/request/handlers/traces/trace-graphql-query-handler.service'; +import { LogEventsService } from '../../../../services/log-events/log-events.service'; +import { MetadataService } from '../../../../services/metadata/metadata.service'; +import { LogEvent, WaterfallData } from '../../../widgets/waterfall/waterfall/waterfall-chart'; +import { GraphQlDataSourceModel } from '../graphql-data-source.model'; @Model({ type: 'api-trace-waterfall-data-source' diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model.test.ts rename to projects/observability/src/shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model.test.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model.ts rename to projects/observability/src/shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/interaction/detail-sheet/container/detail-sheet-interaction-container.component.ts b/projects/observability/src/shared/dashboard/interaction/detail-sheet/container/detail-sheet-interaction-container.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/interaction/detail-sheet/container/detail-sheet-interaction-container.component.ts rename to projects/observability/src/shared/dashboard/interaction/detail-sheet/container/detail-sheet-interaction-container.component.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.model.test.ts b/projects/observability/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.model.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.model.test.ts rename to projects/observability/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.model.test.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.model.ts b/projects/observability/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.model.ts rename to projects/observability/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.service.test.ts b/projects/observability/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.service.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.service.test.ts rename to projects/observability/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.service.test.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.service.ts b/projects/observability/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.service.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.service.ts rename to projects/observability/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction-handler.service.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction.module.ts b/projects/observability/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction.module.ts rename to projects/observability/src/shared/dashboard/interaction/detail-sheet/detail-sheet-interaction.module.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/interaction/interaction-handler.ts b/projects/observability/src/shared/dashboard/interaction/interaction-handler.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/interaction/interaction-handler.ts rename to projects/observability/src/shared/dashboard/interaction/interaction-handler.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/interaction/span-trace/model/span-trace-navigation-handler.model.test.ts b/projects/observability/src/shared/dashboard/interaction/span-trace/model/span-trace-navigation-handler.model.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/interaction/span-trace/model/span-trace-navigation-handler.model.test.ts rename to projects/observability/src/shared/dashboard/interaction/span-trace/model/span-trace-navigation-handler.model.test.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/interaction/span-trace/model/span-trace-navigation-handler.model.ts b/projects/observability/src/shared/dashboard/interaction/span-trace/model/span-trace-navigation-handler.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/interaction/span-trace/model/span-trace-navigation-handler.model.ts rename to projects/observability/src/shared/dashboard/interaction/span-trace/model/span-trace-navigation-handler.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/interaction/tracing-dashboard-interactions.module.ts b/projects/observability/src/shared/dashboard/interaction/tracing-dashboard-interactions.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/interaction/tracing-dashboard-interactions.module.ts rename to projects/observability/src/shared/dashboard/interaction/tracing-dashboard-interactions.module.ts diff --git a/projects/observability/src/shared/dashboard/interactions/api-trace/api-trace-navigation-handler.model.test.ts b/projects/observability/src/shared/dashboard/interactions/api-trace/api-trace-navigation-handler.model.test.ts index 9fb70661c..5c70405cd 100644 --- a/projects/observability/src/shared/dashboard/interactions/api-trace/api-trace-navigation-handler.model.test.ts +++ b/projects/observability/src/shared/dashboard/interactions/api-trace/api-trace-navigation-handler.model.test.ts @@ -1,7 +1,8 @@ import { createModelFactory } from '@hypertrace/dashboards/testing'; -import { Trace, traceIdKey, traceTypeKey, TracingNavigationService } from '@hypertrace/distributed-tracing'; import { mockProvider } from '@ngneat/spectator/jest'; import { ObservabilityTraceType } from '../../../graphql/model/schema/observability-traces'; +import { Trace, traceIdKey, traceTypeKey } from '../../../graphql/model/schema/trace'; +import { TracingNavigationService } from '../../../services/navigation/tracing-navigation.service'; import { ApiTraceNavigationHandlerModel } from './api-trace-navigation-handler.model'; describe('Api Trace Navigation Handler Model', () => { diff --git a/projects/observability/src/shared/dashboard/interactions/api-trace/api-trace-navigation-handler.model.ts b/projects/observability/src/shared/dashboard/interactions/api-trace/api-trace-navigation-handler.model.ts index 2837a02c1..7132a6f42 100644 --- a/projects/observability/src/shared/dashboard/interactions/api-trace/api-trace-navigation-handler.model.ts +++ b/projects/observability/src/shared/dashboard/interactions/api-trace/api-trace-navigation-handler.model.ts @@ -1,14 +1,10 @@ -import { - InteractionHandler, - Trace, - traceIdKey, - traceTypeKey, - TracingNavigationService -} from '@hypertrace/distributed-tracing'; import { Model } from '@hypertrace/hyperdash'; import { ModelInject } from '@hypertrace/hyperdash-angular'; import { Observable, of } from 'rxjs'; import { ObservabilityTraceType } from '../../../graphql/model/schema/observability-traces'; +import { Trace, traceIdKey, traceTypeKey } from '../../../graphql/model/schema/trace'; +import { TracingNavigationService } from '../../../services/navigation/tracing-navigation.service'; +import { InteractionHandler } from '../../interaction/interaction-handler'; @Model({ type: 'api-trace-navigation-handler' diff --git a/projects/observability/src/shared/dashboard/interactions/entity/model/entity-navigation-handler.model.ts b/projects/observability/src/shared/dashboard/interactions/entity/model/entity-navigation-handler.model.ts index 85e0ca353..fd9717f93 100644 --- a/projects/observability/src/shared/dashboard/interactions/entity/model/entity-navigation-handler.model.ts +++ b/projects/observability/src/shared/dashboard/interactions/entity/model/entity-navigation-handler.model.ts @@ -1,9 +1,9 @@ -import { InteractionHandler } from '@hypertrace/distributed-tracing'; import { Model } from '@hypertrace/hyperdash'; import { ModelInject } from '@hypertrace/hyperdash-angular'; import { Observable, of } from 'rxjs'; import { Entity } from '../../../../graphql/model/schema/entity'; import { EntityNavigationService } from '../../../../services/navigation/entity/entity-navigation.service'; +import { InteractionHandler } from '../../../interaction/interaction-handler'; @Model({ type: 'entity-navigation-handler' diff --git a/projects/observability/src/shared/dashboard/observability-dashboard.module.ts b/projects/observability/src/shared/dashboard/observability-dashboard.module.ts index ce7477f72..b044798c2 100644 --- a/projects/observability/src/shared/dashboard/observability-dashboard.module.ts +++ b/projects/observability/src/shared/dashboard/observability-dashboard.module.ts @@ -1,8 +1,8 @@ import { NgModule } from '@angular/core'; -import { TracingDashboardModule } from '@hypertrace/distributed-tracing'; import { ObservabilityIconLibraryModule } from '../icons/observability-icon-library.module'; import { ObservabilityGraphQlDataSourceModule } from './data/graphql/observability-graphql-data-source.module'; import { ObservabilityDashboardInteractionsModule } from './interactions/observability-dashboard-interactions.module'; +import { TracingDashboardModule } from './tracing-dashboard.module'; import { ObservabilityDashboardWidgetsModule } from './widgets/observability-dashboard-widgets.module'; @NgModule({ diff --git a/projects/distributed-tracing/src/shared/dashboard/properties/tracing-dashboard-properties.module.ts b/projects/observability/src/shared/dashboard/properties/tracing-dashboard-properties.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/properties/tracing-dashboard-properties.module.ts rename to projects/observability/src/shared/dashboard/properties/tracing-dashboard-properties.module.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/tracing-dashboard.module.ts b/projects/observability/src/shared/dashboard/tracing-dashboard.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/tracing-dashboard.module.ts rename to projects/observability/src/shared/dashboard/tracing-dashboard.module.ts diff --git a/projects/observability/src/shared/dashboard/widgets/metric-display/metric-display-widget.model.test.ts b/projects/observability/src/shared/dashboard/widgets/metric-display/metric-display-widget.model.test.ts index 865f13b3a..e893a816c 100644 --- a/projects/observability/src/shared/dashboard/widgets/metric-display/metric-display-widget.model.test.ts +++ b/projects/observability/src/shared/dashboard/widgets/metric-display/metric-display-widget.model.test.ts @@ -1,7 +1,8 @@ import { createModelFactory, SpectatorModel } from '@hypertrace/dashboards/testing'; -import { MetricAggregation, MetricHealth } from '@hypertrace/distributed-tracing'; import { runFakeRxjs } from '@hypertrace/test-utils'; import { of } from 'rxjs'; +import { MetricAggregation } from '../../../graphql/model/metrics/metric-aggregation'; +import { MetricHealth } from '../../../graphql/model/metrics/metric-health'; import { MetricDisplayWidgetModel } from './metric-display-widget.model'; describe('Metric display widget model', () => { diff --git a/projects/observability/src/shared/dashboard/widgets/metric-display/metric-display-widget.model.ts b/projects/observability/src/shared/dashboard/widgets/metric-display/metric-display-widget.model.ts index d7d578b24..35c4e750b 100644 --- a/projects/observability/src/shared/dashboard/widgets/metric-display/metric-display-widget.model.ts +++ b/projects/observability/src/shared/dashboard/widgets/metric-display/metric-display-widget.model.ts @@ -1,9 +1,10 @@ -import { MetricAggregation, MetricHealth } from '@hypertrace/distributed-tracing'; import { BOOLEAN_PROPERTY, Model, ModelApi, ModelProperty, STRING_PROPERTY } from '@hypertrace/hyperdash'; import { ModelInject, MODEL_API } from '@hypertrace/hyperdash-angular'; import { defaults } from 'lodash-es'; import { EMPTY, Observable, of } from 'rxjs'; import { mergeMap } from 'rxjs/operators'; +import { MetricAggregation } from '../../../graphql/model/metrics/metric-aggregation'; +import { MetricHealth } from '../../../graphql/model/metrics/metric-health'; import { EntityMetricAggregationDataSourceModel } from '../../data/graphql/entity/aggregation/entity-metric-aggregation-data-source.model'; import { EntityAttributeDataSourceModel } from '../../data/graphql/entity/attribute/entity-attribute-data-source.model'; diff --git a/projects/observability/src/shared/dashboard/widgets/radar/data/entity/entity-radar-data-source.model.test.ts b/projects/observability/src/shared/dashboard/widgets/radar/data/entity/entity-radar-data-source.model.test.ts index 4b029264b..f7e582017 100644 --- a/projects/observability/src/shared/dashboard/widgets/radar/data/entity/entity-radar-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/widgets/radar/data/entity/entity-radar-data-source.model.test.ts @@ -1,10 +1,11 @@ import { fakeAsync, tick } from '@angular/core/testing'; import { isEqualIgnoreFunctions, TimeDuration, TimeUnit } from '@hypertrace/common'; -import { GraphQlTimeRange, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { ModelApi } from '@hypertrace/hyperdash'; import { mergeMap } from 'rxjs/operators'; +import { MetricAggregationType } from '../../../../../graphql/model/metrics/metric-aggregation'; import { ObservabilityEntityType } from '../../../../../graphql/model/schema/entity'; import { GraphQlEntityFilter } from '../../../../../graphql/model/schema/filter/entity/graphql-entity-filter'; +import { GraphQlTimeRange } from '../../../../../graphql/model/schema/timerange/graphql-time-range'; import { ObservabilitySpecificationBuilder } from '../../../../../graphql/request/builders/selections/observability-specification-builder'; import { ENTITY_GQL_REQUEST, diff --git a/projects/observability/src/shared/dashboard/widgets/radar/data/entity/entity-radar-data-source.model.ts b/projects/observability/src/shared/dashboard/widgets/radar/data/entity/entity-radar-data-source.model.ts index 7c867c0d3..4a494b807 100644 --- a/projects/observability/src/shared/dashboard/widgets/radar/data/entity/entity-radar-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/widgets/radar/data/entity/entity-radar-data-source.model.ts @@ -1,10 +1,13 @@ -import { GraphQlFilter, GraphQlTimeRange, MetricAggregation, Specification } from '@hypertrace/distributed-tracing'; import { ARRAY_PROPERTY, Model, ModelProperty } from '@hypertrace/hyperdash'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { RadarPoint } from '../../../../../components/radar/radar'; +import { MetricAggregation } from '../../../../../graphql/model/metrics/metric-aggregation'; import { Entity } from '../../../../../graphql/model/schema/entity'; import { findEntityFilterOrThrow } from '../../../../../graphql/model/schema/filter/entity/graphql-entity-filter'; +import { GraphQlFilter } from '../../../../../graphql/model/schema/filter/graphql-filter'; +import { Specification } from '../../../../../graphql/model/schema/specifier/specification'; +import { GraphQlTimeRange } from '../../../../../graphql/model/schema/timerange/graphql-time-range'; import { EntityGraphQlQueryHandlerService, ENTITY_GQL_REQUEST, diff --git a/projects/observability/src/shared/dashboard/widgets/radar/data/radar-data-source.model.ts b/projects/observability/src/shared/dashboard/widgets/radar/data/radar-data-source.model.ts index b433a7a22..c394edb37 100644 --- a/projects/observability/src/shared/dashboard/widgets/radar/data/radar-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/widgets/radar/data/radar-data-source.model.ts @@ -1,8 +1,9 @@ import { forkJoinSafeEmpty, TimeDuration } from '@hypertrace/common'; -import { GraphQlDataSourceModel, GraphQlTimeRange } from '@hypertrace/distributed-tracing'; import { Observable, of } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; import { RadarPoint } from '../../../../components/radar/radar'; +import { GraphQlTimeRange } from '../../../../graphql/model/schema/timerange/graphql-time-range'; +import { GraphQlDataSourceModel } from '../../../data/graphql/graphql-data-source.model'; export abstract class RadarDataSourceModel extends GraphQlDataSourceModel { protected abstract fetchData(timeRange: GraphQlTimeRange): Observable; diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/span-detail/data/span-detail-data-source.model.test.ts b/projects/observability/src/shared/dashboard/widgets/span-detail/data/span-detail-data-source.model.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/span-detail/data/span-detail-data-source.model.test.ts rename to projects/observability/src/shared/dashboard/widgets/span-detail/data/span-detail-data-source.model.test.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/span-detail/data/span-detail-data-source.model.ts b/projects/observability/src/shared/dashboard/widgets/span-detail/data/span-detail-data-source.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/span-detail/data/span-detail-data-source.model.ts rename to projects/observability/src/shared/dashboard/widgets/span-detail/data/span-detail-data-source.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/span-detail/span-detail-widget-renderer.component.scss b/projects/observability/src/shared/dashboard/widgets/span-detail/span-detail-widget-renderer.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/span-detail/span-detail-widget-renderer.component.scss rename to projects/observability/src/shared/dashboard/widgets/span-detail/span-detail-widget-renderer.component.scss diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/span-detail/span-detail-widget-renderer.component.ts b/projects/observability/src/shared/dashboard/widgets/span-detail/span-detail-widget-renderer.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/span-detail/span-detail-widget-renderer.component.ts rename to projects/observability/src/shared/dashboard/widgets/span-detail/span-detail-widget-renderer.component.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/span-detail/span-detail-widget.model.ts b/projects/observability/src/shared/dashboard/widgets/span-detail/span-detail-widget.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/span-detail/span-detail-widget.model.ts rename to projects/observability/src/shared/dashboard/widgets/span-detail/span-detail-widget.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/span-detail/span-detail-widget.module.ts b/projects/observability/src/shared/dashboard/widgets/span-detail/span-detail-widget.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/span-detail/span-detail-widget.module.ts rename to projects/observability/src/shared/dashboard/widgets/span-detail/span-detail-widget.module.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/selections/table-widget-row-selection.model.test.ts b/projects/observability/src/shared/dashboard/widgets/table/selections/table-widget-row-selection.model.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/selections/table-widget-row-selection.model.test.ts rename to projects/observability/src/shared/dashboard/widgets/table/selections/table-widget-row-selection.model.test.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/selections/table-widget-row-selection.model.ts b/projects/observability/src/shared/dashboard/widgets/table/selections/table-widget-row-selection.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/selections/table-widget-row-selection.model.ts rename to projects/observability/src/shared/dashboard/widgets/table/selections/table-widget-row-selection.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/services/table-widget-column.service.test.ts b/projects/observability/src/shared/dashboard/widgets/table/services/table-widget-column.service.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/services/table-widget-column.service.test.ts rename to projects/observability/src/shared/dashboard/widgets/table/services/table-widget-column.service.test.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts b/projects/observability/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts rename to projects/observability/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-base.model.ts b/projects/observability/src/shared/dashboard/widgets/table/table-widget-base.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-base.model.ts rename to projects/observability/src/shared/dashboard/widgets/table/table-widget-base.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-column.model.test.ts b/projects/observability/src/shared/dashboard/widgets/table/table-widget-column.model.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-column.model.test.ts rename to projects/observability/src/shared/dashboard/widgets/table/table-widget-column.model.test.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-column.model.ts b/projects/observability/src/shared/dashboard/widgets/table/table-widget-column.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-column.model.ts rename to projects/observability/src/shared/dashboard/widgets/table/table-widget-column.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-control-checkbox-option.model.ts b/projects/observability/src/shared/dashboard/widgets/table/table-widget-control-checkbox-option.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-control-checkbox-option.model.ts rename to projects/observability/src/shared/dashboard/widgets/table/table-widget-control-checkbox-option.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-control-select-option.model.ts b/projects/observability/src/shared/dashboard/widgets/table/table-widget-control-select-option.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-control-select-option.model.ts rename to projects/observability/src/shared/dashboard/widgets/table/table-widget-control-select-option.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-control.model.ts b/projects/observability/src/shared/dashboard/widgets/table/table-widget-control.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-control.model.ts rename to projects/observability/src/shared/dashboard/widgets/table/table-widget-control.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.scss b/projects/observability/src/shared/dashboard/widgets/table/table-widget-renderer.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.scss rename to projects/observability/src/shared/dashboard/widgets/table/table-widget-renderer.component.scss diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.ts b/projects/observability/src/shared/dashboard/widgets/table/table-widget-renderer.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.ts rename to projects/observability/src/shared/dashboard/widgets/table/table-widget-renderer.component.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-view-toggle.model.ts b/projects/observability/src/shared/dashboard/widgets/table/table-widget-view-toggle.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-view-toggle.model.ts rename to projects/observability/src/shared/dashboard/widgets/table/table-widget-view-toggle.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-view.model.ts b/projects/observability/src/shared/dashboard/widgets/table/table-widget-view.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-view.model.ts rename to projects/observability/src/shared/dashboard/widgets/table/table-widget-view.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget.model.ts b/projects/observability/src/shared/dashboard/widgets/table/table-widget.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget.model.ts rename to projects/observability/src/shared/dashboard/widgets/table/table-widget.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget.module.ts b/projects/observability/src/shared/dashboard/widgets/table/table-widget.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget.module.ts rename to projects/observability/src/shared/dashboard/widgets/table/table-widget.module.ts diff --git a/projects/observability/src/shared/dashboard/widgets/top-n/data/top-n-data-source.model.test.ts b/projects/observability/src/shared/dashboard/widgets/top-n/data/top-n-data-source.model.test.ts index 85d005ff8..f242c5ca6 100644 --- a/projects/observability/src/shared/dashboard/widgets/top-n/data/top-n-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/widgets/top-n/data/top-n-data-source.model.test.ts @@ -1,8 +1,9 @@ import { fakeAsync, tick } from '@angular/core/testing'; -import { GraphQlTimeRange, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { ModelApi } from '@hypertrace/hyperdash'; import { mergeMap } from 'rxjs/operators'; +import { MetricAggregationType } from '../../../../graphql/model/metrics/metric-aggregation'; import { ObservabilityEntityType } from '../../../../graphql/model/schema/entity'; +import { GraphQlTimeRange } from '../../../../graphql/model/schema/timerange/graphql-time-range'; import { ExploreSpecificationBuilder } from '../../../../graphql/request/builders/specification/explore/explore-specification-builder'; import { EXPLORE_GQL_REQUEST, GraphQlExploreRequest } from '../../../../graphql/request/handlers/explore/explore-query'; import { TopNDataSourceModel } from './top-n-data-source.model'; diff --git a/projects/observability/src/shared/dashboard/widgets/top-n/data/top-n-data-source.model.ts b/projects/observability/src/shared/dashboard/widgets/top-n/data/top-n-data-source.model.ts index b95eafcaa..27d408307 100644 --- a/projects/observability/src/shared/dashboard/widgets/top-n/data/top-n-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/widgets/top-n/data/top-n-data-source.model.ts @@ -1,6 +1,5 @@ import { TableSortDirection } from '@hypertrace/components'; import { EnumPropertyTypeInstance, ENUM_TYPE } from '@hypertrace/dashboards'; -import { GraphQlDataSourceModel } from '@hypertrace/distributed-tracing'; import { ARRAY_PROPERTY, Model, ModelProperty, NUMBER_PROPERTY } from '@hypertrace/hyperdash'; import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -12,6 +11,7 @@ import { EXPLORE_GQL_REQUEST, GraphQlExploreResponse } from '../../../../graphql/request/handlers/explore/explore-query'; +import { GraphQlDataSourceModel } from '../../../data/graphql/graphql-data-source.model'; import { TopNExploreSelectionSpecificationModel } from './top-n-explore-selection-specification.model'; @Model({ diff --git a/projects/observability/src/shared/dashboard/widgets/top-n/data/top-n-explore-selection-specification.model.ts b/projects/observability/src/shared/dashboard/widgets/top-n/data/top-n-explore-selection-specification.model.ts index a615ff33d..219594c6a 100644 --- a/projects/observability/src/shared/dashboard/widgets/top-n/data/top-n-explore-selection-specification.model.ts +++ b/projects/observability/src/shared/dashboard/widgets/top-n/data/top-n-explore-selection-specification.model.ts @@ -1,4 +1,3 @@ -import { GraphQlFilter } from '@hypertrace/distributed-tracing'; import { ARRAY_PROPERTY, Model, @@ -7,6 +6,7 @@ import { ModelPropertyType, STRING_PROPERTY } from '@hypertrace/hyperdash'; +import { GraphQlFilter } from '../../../../graphql/model/schema/filter/graphql-filter'; import { ExploreSpecification } from '../../../../graphql/model/schema/specifications/explore-specification'; import { ExploreSelectionSpecificationModel } from '../../../data/graphql/specifiers/explore-selection-specification.model'; diff --git a/projects/observability/src/shared/dashboard/widgets/top-n/top-n-widget-renderer.component.test.ts b/projects/observability/src/shared/dashboard/widgets/top-n/top-n-widget-renderer.component.test.ts index 5170eb0f1..6eef1b5f3 100644 --- a/projects/observability/src/shared/dashboard/widgets/top-n/top-n-widget-renderer.component.test.ts +++ b/projects/observability/src/shared/dashboard/widgets/top-n/top-n-widget-renderer.component.test.ts @@ -1,11 +1,11 @@ import { FormattingModule, NavigationService } from '@hypertrace/common'; import { LoadAsyncModule, TitledContentComponent } from '@hypertrace/components'; import { mockDashboardWidgetProviders } from '@hypertrace/dashboards/testing'; -import { MetricAggregationType } from '@hypertrace/distributed-tracing'; import { runFakeRxjs } from '@hypertrace/test-utils'; import { createComponentFactory, mockProvider } from '@ngneat/spectator/jest'; import { MockComponent } from 'ng-mocks'; import { of } from 'rxjs'; +import { MetricAggregationType } from '../../../graphql/model/metrics/metric-aggregation'; import { entityIdKey, entityTypeKey, ObservabilityEntityType } from '../../../graphql/model/schema/entity'; import { ExploreSpecificationBuilder } from '../../../graphql/request/builders/specification/explore/explore-specification-builder'; import { EntityNavigationService } from '../../../services/navigation/entity/entity-navigation.service'; diff --git a/projects/observability/src/shared/dashboard/widgets/top-n/top-n-widget-renderer.component.ts b/projects/observability/src/shared/dashboard/widgets/top-n/top-n-widget-renderer.component.ts index 6981245fc..edd61df49 100644 --- a/projects/observability/src/shared/dashboard/widgets/top-n/top-n-widget-renderer.component.ts +++ b/projects/observability/src/shared/dashboard/widgets/top-n/top-n-widget-renderer.component.ts @@ -2,12 +2,12 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject } from '@ import { forkJoinSafeEmpty, SubscriptionLifecycle } from '@hypertrace/common'; import { SelectOption, SelectSize } from '@hypertrace/components'; import { InteractiveDataWidgetRenderer } from '@hypertrace/dashboards'; -import { MetadataService } from '@hypertrace/distributed-tracing'; import { Renderer } from '@hypertrace/hyperdash'; import { RendererApi, RENDERER_API } from '@hypertrace/hyperdash-angular'; import { NEVER, Observable } from 'rxjs'; import { map, switchMap, tap } from 'rxjs/operators'; import { GaugeItem } from '../../../components/gauge-list/gauge-list.component'; +import { MetadataService } from '../../../services/metadata/metadata.service'; import { EntityNavigationService } from '../../../services/navigation/entity/entity-navigation.service'; import { TopNWidgetDataFetcher, TopNWidgetValueData } from './data/top-n-data-source.model'; import { TopNExploreSelectionSpecificationModel } from './data/top-n-explore-selection-specification.model'; diff --git a/projects/observability/src/shared/dashboard/widgets/topology/edge/curved/entity-edge-curve-renderer.service.ts b/projects/observability/src/shared/dashboard/widgets/topology/edge/curved/entity-edge-curve-renderer.service.ts index c43fb9bbc..3c049640c 100644 --- a/projects/observability/src/shared/dashboard/widgets/topology/edge/curved/entity-edge-curve-renderer.service.ts +++ b/projects/observability/src/shared/dashboard/widgets/topology/edge/curved/entity-edge-curve-renderer.service.ts @@ -1,6 +1,5 @@ import { Injectable, Renderer2 } from '@angular/core'; import { Color, DomElementMeasurerService, NumericFormatter, selector } from '@hypertrace/common'; -import { MetricAggregation } from '@hypertrace/distributed-tracing'; import { select, Selection } from 'd3-selection'; import { Link, linkHorizontal } from 'd3-shape'; import { @@ -15,6 +14,7 @@ import { } from '../../../../../components/topology/topology'; import { D3UtilService } from '../../../../../components/utils/d3/d3-util.service'; import { SvgUtilService } from '../../../../../components/utils/svg/svg-util.service'; +import { MetricAggregation } from '../../../../../graphql/model/metrics/metric-aggregation'; import { MetricAggregationSpecification } from '../../../../../graphql/model/schema/specifications/metric-aggregation-specification'; import { EntityEdge } from '../../../../../graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service'; import { TopologyMetricCategoryData } from '../../../../data/graphql/topology/metrics/topology-metric-category.model'; diff --git a/projects/observability/src/shared/dashboard/widgets/topology/node/box/entity-node-box-renderer.service.ts b/projects/observability/src/shared/dashboard/widgets/topology/node/box/entity-node-box-renderer.service.ts index 30d0b64f5..28a4d0805 100644 --- a/projects/observability/src/shared/dashboard/widgets/topology/node/box/entity-node-box-renderer.service.ts +++ b/projects/observability/src/shared/dashboard/widgets/topology/node/box/entity-node-box-renderer.service.ts @@ -1,6 +1,5 @@ import { Injectable, Renderer2 } from '@angular/core'; import { Color, DomElementMeasurerService, NumericFormatter, selector } from '@hypertrace/common'; -import { MetricAggregation, MetricHealth } from '@hypertrace/distributed-tracing'; import { select, Selection } from 'd3-selection'; import { Observable, Subject } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; @@ -13,6 +12,8 @@ import { } from '../../../../../components/topology/topology'; import { D3UtilService } from '../../../../../components/utils/d3/d3-util.service'; import { SvgUtilService } from '../../../../../components/utils/svg/svg-util.service'; +import { MetricAggregation } from '../../../../../graphql/model/metrics/metric-aggregation'; +import { MetricHealth } from '../../../../../graphql/model/metrics/metric-health'; import { Entity } from '../../../../../graphql/model/schema/entity'; import { MetricAggregationSpecification } from '../../../../../graphql/model/schema/specifications/metric-aggregation-specification'; import { EntityNode } from '../../../../../graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service'; diff --git a/projects/observability/src/shared/dashboard/widgets/topology/tooltip/topology-entity-tooltip.component.ts b/projects/observability/src/shared/dashboard/widgets/topology/tooltip/topology-entity-tooltip.component.ts index 4dbd5c6de..7ac4de8cc 100644 --- a/projects/observability/src/shared/dashboard/widgets/topology/tooltip/topology-entity-tooltip.component.ts +++ b/projects/observability/src/shared/dashboard/widgets/topology/tooltip/topology-entity-tooltip.component.ts @@ -2,7 +2,6 @@ import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { IconType } from '@hypertrace/assets-library'; import { Dictionary, forkJoinSafeEmpty } from '@hypertrace/common'; import { IconSize, PopoverRef, POPOVER_DATA } from '@hypertrace/components'; -import { MetadataService, MetricAggregation } from '@hypertrace/distributed-tracing'; import { Observable } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; import { @@ -10,12 +9,14 @@ import { TopologyTooltipEdgeData, TopologyTooltipNodeData } from '../../../../components/topology/renderers/tooltip/topology-tooltip-renderer.service'; +import { MetricAggregation } from '../../../../graphql/model/metrics/metric-aggregation'; import { entityTypeKey, INTERACTION_SCOPE } from '../../../../graphql/model/schema/entity'; import { MetricAggregationSpecification } from '../../../../graphql/model/schema/specifications/metric-aggregation-specification'; import { EntityEdge, EntityNode } from '../../../../graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service'; +import { MetadataService } from '../../../../services/metadata/metadata.service'; @Component({ selector: 'ht-topology-entity-tooltip', diff --git a/projects/observability/src/shared/dashboard/widgets/topology/topology-data-source-model-properties.service.test.ts b/projects/observability/src/shared/dashboard/widgets/topology/topology-data-source-model-properties.service.test.ts index 02c494f5f..abfb94c6d 100644 --- a/projects/observability/src/shared/dashboard/widgets/topology/topology-data-source-model-properties.service.test.ts +++ b/projects/observability/src/shared/dashboard/widgets/topology/topology-data-source-model-properties.service.test.ts @@ -1,7 +1,7 @@ import { Color } from '@hypertrace/common'; -import { MetricAggregationType } from '@hypertrace/distributed-tracing'; -import { MetricAggregationSpecificationModel } from '@hypertrace/observability'; import { createServiceFactory } from '@ngneat/spectator/jest'; +import { MetricAggregationType } from '../../../graphql/model/metrics/metric-aggregation'; +import { MetricAggregationSpecificationModel } from '../../data/graphql/specifiers/metric-aggregation-specification.model'; import { TopologyMetricCategoryModel } from '../../data/graphql/topology/metrics/topology-metric-category.model'; import { TopologyMetricWithCategoryModel } from '../../data/graphql/topology/metrics/topology-metric-with-category.model'; import { TopologyMetricsData } from '../../data/graphql/topology/metrics/topology-metrics.model'; diff --git a/projects/observability/src/shared/dashboard/widgets/topology/topology-widget-renderer.component.test.ts b/projects/observability/src/shared/dashboard/widgets/topology/topology-widget-renderer.component.test.ts index fa56182a6..511796e95 100644 --- a/projects/observability/src/shared/dashboard/widgets/topology/topology-widget-renderer.component.test.ts +++ b/projects/observability/src/shared/dashboard/widgets/topology/topology-widget-renderer.component.test.ts @@ -5,8 +5,6 @@ import { discardPeriodicTasks, fakeAsync, flush, TestBed } from '@angular/core/t import { IconLibraryTestingModule, IconRegistryService } from '@hypertrace/assets-library'; import { Color, DomElementMeasurerService, selector } from '@hypertrace/common'; import { mockDashboardWidgetProviders } from '@hypertrace/dashboards/testing'; -import { MetricAggregationType, MetricHealth } from '@hypertrace/distributed-tracing'; -import { MetricAggregationSpecificationModel } from '@hypertrace/observability'; import { addWidthAndHeightToSvgElForTest } from '@hypertrace/test-utils'; import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest'; import { uniq } from 'lodash-es'; @@ -14,6 +12,8 @@ import { of } from 'rxjs'; import { TopologyNodeRendererService } from '../../../components/topology/renderers/node/topology-node-renderer.service'; import { D3UtilService } from '../../../components/utils/d3/d3-util.service'; import { EntityMetadata, ENTITY_METADATA } from '../../../constants/entity-metadata'; +import { MetricAggregationType } from '../../../graphql/model/metrics/metric-aggregation'; +import { MetricHealth } from '../../../graphql/model/metrics/metric-health'; import { entityIdKey, entityTypeKey, ObservabilityEntityType } from '../../../graphql/model/schema/entity'; import { ErrorPercentageMetricValueCategory } from '../../../graphql/model/schema/specifications/error-percentage-aggregation-specification'; import { PercentileLatencyMetricValueCategory } from '../../../graphql/model/schema/specifications/percentile-latency-aggregation-specification'; @@ -24,6 +24,7 @@ import { } from '../../../graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service'; import { ObservabilityIconLibraryModule } from '../../../icons/observability-icon-library.module'; import { ObservabilityIconType } from '../../../icons/observability-icon-type'; +import { MetricAggregationSpecificationModel } from '../../data/graphql/specifiers/metric-aggregation-specification.model'; import { TopologyMetricCategoryModel } from '../../data/graphql/topology/metrics/topology-metric-category.model'; import { TopologyMetricWithCategoryModel } from '../../data/graphql/topology/metrics/topology-metric-with-category.model'; import { TopologyMetricsModel } from './../../data/graphql/topology/metrics/topology-metrics.model'; diff --git a/projects/observability/src/shared/dashboard/widgets/topology/topology-widget-renderer.component.ts b/projects/observability/src/shared/dashboard/widgets/topology/topology-widget-renderer.component.ts index 28303feb8..dc5fb1993 100644 --- a/projects/observability/src/shared/dashboard/widgets/topology/topology-widget-renderer.component.ts +++ b/projects/observability/src/shared/dashboard/widgets/topology/topology-widget-renderer.component.ts @@ -1,7 +1,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject } from '@angular/core'; import { forkJoinSafeEmpty } from '@hypertrace/common'; import { WidgetRenderer } from '@hypertrace/dashboards'; -import { MetadataService } from '@hypertrace/distributed-tracing'; import { Renderer } from '@hypertrace/hyperdash'; import { RendererApi, RENDERER_API } from '@hypertrace/hyperdash-angular'; import { EMPTY, Observable, of } from 'rxjs'; @@ -14,6 +13,7 @@ import { INTERACTION_SCOPE } from '../../../graphql/model/schema/entity'; import { ErrorPercentageMetricValueCategory } from '../../../graphql/model/schema/specifications/error-percentage-aggregation-specification'; import { MetricAggregationSpecification } from '../../../graphql/model/schema/specifications/metric-aggregation-specification'; import { PercentileLatencyMetricValueCategory } from '../../../graphql/model/schema/specifications/percentile-latency-aggregation-specification'; +import { MetadataService } from '../../../services/metadata/metadata.service'; import { TopologyData } from '../../data/graphql/topology/topology-data-source.model'; import { EntityEdgeCurveRendererService } from './edge/curved/entity-edge-curve-renderer.service'; import { ApiNodeBoxRendererService } from './node/box/api-node-renderer/api-node-box-renderer.service'; diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model.test.ts b/projects/observability/src/shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model.test.ts similarity index 97% rename from projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model.test.ts rename to projects/observability/src/shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model.test.ts index 9dc2f6c95..d01fd0376 100644 --- a/projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model.test.ts +++ b/projects/observability/src/shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model.test.ts @@ -1,5 +1,5 @@ import { ModelApi } from '@hypertrace/hyperdash'; -import { ObservabilityTraceType } from '@hypertrace/observability'; +import { ObservabilityTraceType } from '../../../../graphql/model/schema/observability-traces'; import { spanIdKey } from '../../../../graphql/model/schema/span'; import { traceIdKey, traceTypeKey, TRACE_SCOPE } from '../../../../graphql/model/schema/trace'; import { diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model.ts b/projects/observability/src/shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model.ts similarity index 92% rename from projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model.ts rename to projects/observability/src/shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model.ts index 076c206c7..9a25a9499 100644 --- a/projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model.ts +++ b/projects/observability/src/shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model.ts @@ -1,8 +1,7 @@ +import { Dictionary } from '@hypertrace/common'; import { Model } from '@hypertrace/hyperdash'; +import { ObservabilityTraceType } from '../../../../graphql/model/schema/observability-traces'; import { Trace, traceIdKey, traceTypeKey } from '../../../../graphql/model/schema/trace'; - -import { Dictionary } from '@hypertrace/common'; -import { ObservabilityTraceType } from '@hypertrace/observability'; import { TraceDetailData, TraceDetailDataSourceModel } from './trace-detail-data-source.model'; @Model({ diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/data/trace-detail-data-source.model.test.ts b/projects/observability/src/shared/dashboard/widgets/trace-detail/data/trace-detail-data-source.model.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/data/trace-detail-data-source.model.test.ts rename to projects/observability/src/shared/dashboard/widgets/trace-detail/data/trace-detail-data-source.model.test.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/data/trace-detail-data-source.model.ts b/projects/observability/src/shared/dashboard/widgets/trace-detail/data/trace-detail-data-source.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/data/trace-detail-data-source.model.ts rename to projects/observability/src/shared/dashboard/widgets/trace-detail/data/trace-detail-data-source.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/trace-detail-widget-renderer.component.scss b/projects/observability/src/shared/dashboard/widgets/trace-detail/trace-detail-widget-renderer.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/trace-detail-widget-renderer.component.scss rename to projects/observability/src/shared/dashboard/widgets/trace-detail/trace-detail-widget-renderer.component.scss diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/trace-detail-widget-renderer.component.ts b/projects/observability/src/shared/dashboard/widgets/trace-detail/trace-detail-widget-renderer.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/trace-detail-widget-renderer.component.ts rename to projects/observability/src/shared/dashboard/widgets/trace-detail/trace-detail-widget-renderer.component.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/trace-detail-widget.model.ts b/projects/observability/src/shared/dashboard/widgets/trace-detail/trace-detail-widget.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/trace-detail-widget.model.ts rename to projects/observability/src/shared/dashboard/widgets/trace-detail/trace-detail-widget.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/trace-detail-widget.module.ts b/projects/observability/src/shared/dashboard/widgets/trace-detail/trace-detail-widget.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/trace-detail-widget.module.ts rename to projects/observability/src/shared/dashboard/widgets/trace-detail/trace-detail-widget.module.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/tracing-dashboard-widgets.module.ts b/projects/observability/src/shared/dashboard/widgets/tracing-dashboard-widgets.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/tracing-dashboard-widgets.module.ts rename to projects/observability/src/shared/dashboard/widgets/tracing-dashboard-widgets.module.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall-widget-renderer.component.scss b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall-widget-renderer.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall-widget-renderer.component.scss rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall-widget-renderer.component.scss diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall-widget-renderer.component.test.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall-widget-renderer.component.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall-widget-renderer.component.test.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall-widget-renderer.component.test.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall-widget-renderer.component.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall-widget-renderer.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall-widget-renderer.component.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall-widget-renderer.component.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall-widget.model.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall-widget.model.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall-widget.model.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall-widget.model.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall-widget.module.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall-widget.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall-widget.module.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall-widget.module.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.component.scss b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.component.scss rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.component.scss diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.component.test.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.component.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.component.test.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.component.test.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.component.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.component.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.component.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.module.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.module.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/marker-tooltip/marker-tooltip.module.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-cell-data.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-cell-data.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-cell-data.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-cell-data.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-cell-type.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-cell-type.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-cell-type.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-cell-type.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-parser.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-parser.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-parser.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-parser.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.scss b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.scss rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.scss diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.test.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.test.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.test.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.scss b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.scss similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.scss rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.scss diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.test.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.test.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.test.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.module.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.module.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.module.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.service.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.service.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.service.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.service.ts diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.ts b/projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.ts similarity index 100% rename from projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.ts rename to projects/observability/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/metadata/attribute-metadata.ts b/projects/observability/src/shared/graphql/model/metadata/attribute-metadata.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/metadata/attribute-metadata.ts rename to projects/observability/src/shared/graphql/model/metadata/attribute-metadata.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/metrics/metric-aggregation.test.ts b/projects/observability/src/shared/graphql/model/metrics/metric-aggregation.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/metrics/metric-aggregation.test.ts rename to projects/observability/src/shared/graphql/model/metrics/metric-aggregation.test.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/metrics/metric-aggregation.ts b/projects/observability/src/shared/graphql/model/metrics/metric-aggregation.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/metrics/metric-aggregation.ts rename to projects/observability/src/shared/graphql/model/metrics/metric-aggregation.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/metrics/metric-health.ts b/projects/observability/src/shared/graphql/model/metrics/metric-health.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/metrics/metric-health.ts rename to projects/observability/src/shared/graphql/model/metrics/metric-health.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/schema/enriched-attribute.ts b/projects/observability/src/shared/graphql/model/schema/enriched-attribute.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/schema/enriched-attribute.ts rename to projects/observability/src/shared/graphql/model/schema/enriched-attribute.ts diff --git a/projects/observability/src/shared/graphql/model/schema/filter/entity/graphql-entity-filter.ts b/projects/observability/src/shared/graphql/model/schema/filter/entity/graphql-entity-filter.ts index fcf833d46..d1aecc02c 100644 --- a/projects/observability/src/shared/graphql/model/schema/filter/entity/graphql-entity-filter.ts +++ b/projects/observability/src/shared/graphql/model/schema/filter/entity/graphql-entity-filter.ts @@ -1,6 +1,6 @@ -import { GraphQlFilter, GraphQlFilterType, GraphQlOperatorType } from '@hypertrace/distributed-tracing'; import { GraphQlArgumentValue, GraphQlEnumArgument } from '@hypertrace/graphql-client'; import { Entity, entityIdKey, EntityType, entityTypeKey } from '../../entity'; +import { GraphQlFilter, GraphQlFilterType, GraphQlOperatorType } from '../graphql-filter'; export class GraphQlEntityFilter implements GraphQlFilter { public static forEntity(entity: Entity): GraphQlEntityFilter { diff --git a/projects/distributed-tracing/src/shared/graphql/model/schema/filter/field/graphql-field-filter.ts b/projects/observability/src/shared/graphql/model/schema/filter/field/graphql-field-filter.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/schema/filter/field/graphql-field-filter.ts rename to projects/observability/src/shared/graphql/model/schema/filter/field/graphql-field-filter.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/schema/filter/global-graphql-filter.service.test.ts b/projects/observability/src/shared/graphql/model/schema/filter/global-graphql-filter.service.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/schema/filter/global-graphql-filter.service.test.ts rename to projects/observability/src/shared/graphql/model/schema/filter/global-graphql-filter.service.test.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/schema/filter/global-graphql-filter.service.ts b/projects/observability/src/shared/graphql/model/schema/filter/global-graphql-filter.service.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/schema/filter/global-graphql-filter.service.ts rename to projects/observability/src/shared/graphql/model/schema/filter/global-graphql-filter.service.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/schema/filter/graphql-filter.ts b/projects/observability/src/shared/graphql/model/schema/filter/graphql-filter.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/schema/filter/graphql-filter.ts rename to projects/observability/src/shared/graphql/model/schema/filter/graphql-filter.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/schema/filter/id/graphql-id-filter.ts b/projects/observability/src/shared/graphql/model/schema/filter/id/graphql-id-filter.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/schema/filter/id/graphql-id-filter.ts rename to projects/observability/src/shared/graphql/model/schema/filter/id/graphql-id-filter.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/schema/metrics/graphql-metric-aggregation-type.ts b/projects/observability/src/shared/graphql/model/schema/metrics/graphql-metric-aggregation-type.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/schema/metrics/graphql-metric-aggregation-type.ts rename to projects/observability/src/shared/graphql/model/schema/metrics/graphql-metric-aggregation-type.ts diff --git a/projects/observability/src/shared/graphql/model/schema/neighbor.ts b/projects/observability/src/shared/graphql/model/schema/neighbor.ts index 8a98417b7..1a0d3b922 100644 --- a/projects/observability/src/shared/graphql/model/schema/neighbor.ts +++ b/projects/observability/src/shared/graphql/model/schema/neighbor.ts @@ -1,5 +1,5 @@ -import { Specification } from '@hypertrace/distributed-tracing'; import { ObservabilityEntityType } from './entity'; +import { Specification } from './specifier/specification'; export const enum NeighborDirection { Upstream = 'upstream', diff --git a/projects/distributed-tracing/src/shared/graphql/model/schema/sort/graphql-sort-argument.ts b/projects/observability/src/shared/graphql/model/schema/sort/graphql-sort-argument.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/schema/sort/graphql-sort-argument.ts rename to projects/observability/src/shared/graphql/model/schema/sort/graphql-sort-argument.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/schema/sort/graphql-sort-by-specification.ts b/projects/observability/src/shared/graphql/model/schema/sort/graphql-sort-by-specification.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/schema/sort/graphql-sort-by-specification.ts rename to projects/observability/src/shared/graphql/model/schema/sort/graphql-sort-by-specification.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/schema/sort/graphql-sort-direction.ts b/projects/observability/src/shared/graphql/model/schema/sort/graphql-sort-direction.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/schema/sort/graphql-sort-direction.ts rename to projects/observability/src/shared/graphql/model/schema/sort/graphql-sort-direction.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/schema/sort/graphql-sort-without-direction.ts b/projects/observability/src/shared/graphql/model/schema/sort/graphql-sort-without-direction.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/schema/sort/graphql-sort-without-direction.ts rename to projects/observability/src/shared/graphql/model/schema/sort/graphql-sort-without-direction.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/schema/span.ts b/projects/observability/src/shared/graphql/model/schema/span.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/schema/span.ts rename to projects/observability/src/shared/graphql/model/schema/span.ts diff --git a/projects/observability/src/shared/graphql/model/schema/specifications/entity-specification.ts b/projects/observability/src/shared/graphql/model/schema/specifications/entity-specification.ts index d1cdf9753..a7c965c33 100644 --- a/projects/observability/src/shared/graphql/model/schema/specifications/entity-specification.ts +++ b/projects/observability/src/shared/graphql/model/schema/specifications/entity-specification.ts @@ -1,6 +1,6 @@ import { Dictionary } from '@hypertrace/common'; -import { Specification } from '@hypertrace/distributed-tracing'; import { Entity } from '../entity'; +import { Specification } from '../specifier/specification'; export interface EntitySpecification extends Specification { extractFromServerData(resultContainer: Dictionary): Entity; diff --git a/projects/observability/src/shared/graphql/model/schema/specifications/error-percentage-aggregation-specification.ts b/projects/observability/src/shared/graphql/model/schema/specifications/error-percentage-aggregation-specification.ts index 3bf50a9e8..9449fdbfe 100644 --- a/projects/observability/src/shared/graphql/model/schema/specifications/error-percentage-aggregation-specification.ts +++ b/projects/observability/src/shared/graphql/model/schema/specifications/error-percentage-aggregation-specification.ts @@ -1,5 +1,5 @@ import { Dictionary } from '@hypertrace/common'; -import { MetricAggregation } from '@hypertrace/distributed-tracing'; +import { MetricAggregation } from '../../metrics/metric-aggregation'; import { MetricAggregationSpecification } from './metric-aggregation-specification'; export interface ErrorPercentageMetricAggregationSpecification extends MetricAggregationSpecification { diff --git a/projects/observability/src/shared/graphql/model/schema/specifications/explore-specification.ts b/projects/observability/src/shared/graphql/model/schema/specifications/explore-specification.ts index 44de582b8..7ead219fa 100644 --- a/projects/observability/src/shared/graphql/model/schema/specifications/explore-specification.ts +++ b/projects/observability/src/shared/graphql/model/schema/specifications/explore-specification.ts @@ -1,5 +1,6 @@ import { Dictionary, PartialBy } from '@hypertrace/common'; -import { AttributeMetadataType, MetricSpecification } from '@hypertrace/distributed-tracing'; +import { AttributeMetadataType } from '../../metadata/attribute-metadata'; +import { MetricSpecification } from '../../specifications/metric-specification'; export interface ExploreSpecification extends PartialBy { extractFromServerData(resultContainer: Dictionary): ExploreValue; diff --git a/projects/observability/src/shared/graphql/model/schema/specifications/metric-aggregation-specification.ts b/projects/observability/src/shared/graphql/model/schema/specifications/metric-aggregation-specification.ts index bafcde44b..4301db5b6 100644 --- a/projects/observability/src/shared/graphql/model/schema/specifications/metric-aggregation-specification.ts +++ b/projects/observability/src/shared/graphql/model/schema/specifications/metric-aggregation-specification.ts @@ -1,5 +1,6 @@ import { Dictionary } from '@hypertrace/common'; -import { MetricAggregation, MetricSpecification } from '@hypertrace/distributed-tracing'; +import { MetricAggregation } from '../../metrics/metric-aggregation'; +import { MetricSpecification } from '../../specifications/metric-specification'; import { GraphQlMetricAggregation } from '../metric/graphql-metric-aggregation'; export interface MetricAggregationSpecification extends MetricSpecification { diff --git a/projects/observability/src/shared/graphql/model/schema/specifications/metric-timeseries-band-specification.ts b/projects/observability/src/shared/graphql/model/schema/specifications/metric-timeseries-band-specification.ts index 958aac716..11502810e 100644 --- a/projects/observability/src/shared/graphql/model/schema/specifications/metric-timeseries-band-specification.ts +++ b/projects/observability/src/shared/graphql/model/schema/specifications/metric-timeseries-band-specification.ts @@ -1,6 +1,6 @@ import { Dictionary, TimeDuration } from '@hypertrace/common'; -import { MetricSpecification } from '@hypertrace/distributed-tracing'; import { MetricTimeseriesBandInterval } from '../../metric/metric-timeseries'; +import { MetricSpecification } from '../../specifications/metric-specification'; import { GraphQlMetricTimeseriesBandContainer } from '../metric/graphql-metric-timeseries'; export interface MetricTimeseriesBandSpecification extends MetricSpecification { diff --git a/projects/observability/src/shared/graphql/model/schema/specifications/metric-timeseries-specification.ts b/projects/observability/src/shared/graphql/model/schema/specifications/metric-timeseries-specification.ts index ac1f74cc5..e3e2a1d9b 100644 --- a/projects/observability/src/shared/graphql/model/schema/specifications/metric-timeseries-specification.ts +++ b/projects/observability/src/shared/graphql/model/schema/specifications/metric-timeseries-specification.ts @@ -1,6 +1,6 @@ import { Dictionary, TimeDuration } from '@hypertrace/common'; -import { MetricSpecification } from '@hypertrace/distributed-tracing'; import { MetricTimeseriesInterval } from '../../metric/metric-timeseries'; +import { MetricSpecification } from '../../specifications/metric-specification'; import { GraphQlMetricTimeseriesContainer } from '../metric/graphql-metric-timeseries'; export interface MetricTimeseriesSpecification extends MetricSpecification { diff --git a/projects/observability/src/shared/graphql/model/schema/specifications/percentile-latency-aggregation-specification.ts b/projects/observability/src/shared/graphql/model/schema/specifications/percentile-latency-aggregation-specification.ts index d10e8ab50..5eaaef1c6 100644 --- a/projects/observability/src/shared/graphql/model/schema/specifications/percentile-latency-aggregation-specification.ts +++ b/projects/observability/src/shared/graphql/model/schema/specifications/percentile-latency-aggregation-specification.ts @@ -1,5 +1,5 @@ import { Dictionary } from '@hypertrace/common'; -import { MetricAggregation } from '@hypertrace/distributed-tracing'; +import { MetricAggregation } from '../../metrics/metric-aggregation'; import { GraphQlMetricAggregation } from '../metric/graphql-metric-aggregation'; import { MetricAggregationSpecification } from './metric-aggregation-specification'; diff --git a/projects/distributed-tracing/src/shared/graphql/model/schema/specifier/specification.ts b/projects/observability/src/shared/graphql/model/schema/specifier/specification.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/schema/specifier/specification.ts rename to projects/observability/src/shared/graphql/model/schema/specifier/specification.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/schema/timerange/graphql-time-range.ts b/projects/observability/src/shared/graphql/model/schema/timerange/graphql-time-range.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/schema/timerange/graphql-time-range.ts rename to projects/observability/src/shared/graphql/model/schema/timerange/graphql-time-range.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/schema/trace.ts b/projects/observability/src/shared/graphql/model/schema/trace.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/schema/trace.ts rename to projects/observability/src/shared/graphql/model/schema/trace.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/specifications/composite-specification.ts b/projects/observability/src/shared/graphql/model/specifications/composite-specification.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/specifications/composite-specification.ts rename to projects/observability/src/shared/graphql/model/specifications/composite-specification.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/specifications/enriched-attribute-specification.ts b/projects/observability/src/shared/graphql/model/specifications/enriched-attribute-specification.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/specifications/enriched-attribute-specification.ts rename to projects/observability/src/shared/graphql/model/specifications/enriched-attribute-specification.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/specifications/metric-specification.ts b/projects/observability/src/shared/graphql/model/specifications/metric-specification.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/specifications/metric-specification.ts rename to projects/observability/src/shared/graphql/model/specifications/metric-specification.ts diff --git a/projects/distributed-tracing/src/shared/graphql/model/specifications/trace-status-specification.ts b/projects/observability/src/shared/graphql/model/specifications/trace-status-specification.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/model/specifications/trace-status-specification.ts rename to projects/observability/src/shared/graphql/model/specifications/trace-status-specification.ts diff --git a/projects/distributed-tracing/src/shared/graphql/request/builders/argument/graphql-argument-builder.test.ts b/projects/observability/src/shared/graphql/request/builders/argument/graphql-argument-builder.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/builders/argument/graphql-argument-builder.test.ts rename to projects/observability/src/shared/graphql/request/builders/argument/graphql-argument-builder.test.ts diff --git a/projects/distributed-tracing/src/shared/graphql/request/builders/argument/graphql-argument-builder.ts b/projects/observability/src/shared/graphql/request/builders/argument/graphql-argument-builder.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/builders/argument/graphql-argument-builder.ts rename to projects/observability/src/shared/graphql/request/builders/argument/graphql-argument-builder.ts diff --git a/projects/observability/src/shared/graphql/request/builders/argument/graphql-observability-argument-builder.ts b/projects/observability/src/shared/graphql/request/builders/argument/graphql-observability-argument-builder.ts index ac69fc664..4aebf06d1 100644 --- a/projects/observability/src/shared/graphql/request/builders/argument/graphql-observability-argument-builder.ts +++ b/projects/observability/src/shared/graphql/request/builders/argument/graphql-observability-argument-builder.ts @@ -1,16 +1,14 @@ import { TimeDuration } from '@hypertrace/common'; -import { - convertToGraphQlMetricAggregationType, - GraphQlArgumentBuilder, - GraphQlSortBySpecification, - MetricAggregationType, - TraceType -} from '@hypertrace/distributed-tracing'; import { GraphQlArgument, GraphQlEnumArgument } from '@hypertrace/graphql-client'; +import { MetricAggregationType } from '../../../model/metrics/metric-aggregation'; import { EntityType } from '../../../model/schema/entity'; import { GraphQlGroupBy } from '../../../model/schema/groupby/graphql-group-by'; import { GraphQlIntervalUnit } from '../../../model/schema/interval/graphql-interval-unit'; +import { convertToGraphQlMetricAggregationType } from '../../../model/schema/metrics/graphql-metric-aggregation-type'; +import { GraphQlSortBySpecification } from '../../../model/schema/sort/graphql-sort-by-specification'; +import { TraceType } from '../../../model/schema/trace'; import { convertToGraphQlIntervalUnit } from '../specification/metric/metric-interval-unit-converter'; +import { GraphQlArgumentBuilder } from './graphql-argument-builder'; export class GraphQlObservabilityArgumentBuilder extends GraphQlArgumentBuilder { public forIncludeInactive(includeInactive?: boolean): GraphQlArgument[] { diff --git a/projects/distributed-tracing/src/shared/graphql/request/builders/selections/graphql-selection-builder.ts b/projects/observability/src/shared/graphql/request/builders/selections/graphql-selection-builder.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/builders/selections/graphql-selection-builder.ts rename to projects/observability/src/shared/graphql/request/builders/selections/graphql-selection-builder.ts diff --git a/projects/observability/src/shared/graphql/request/builders/selections/observability-specification-builder.ts b/projects/observability/src/shared/graphql/request/builders/selections/observability-specification-builder.ts index c754ee61e..13dbe52c2 100644 --- a/projects/observability/src/shared/graphql/request/builders/selections/observability-specification-builder.ts +++ b/projects/observability/src/shared/graphql/request/builders/selections/observability-specification-builder.ts @@ -1,18 +1,14 @@ import { DateCoercer, Dictionary, TimeDuration } from '@hypertrace/common'; -import { - convertToGraphQlMetricAggregationType, - GraphQlMetricAggregationType, - MetricAggregation, - MetricAggregationType, - MetricHealth, - MetricSpecification, - Specification, - SpecificationBuilder -} from '@hypertrace/distributed-tracing'; import { GraphQlEnumArgument, GraphQlSelection } from '@hypertrace/graphql-client'; import { assignIn } from 'lodash-es'; +import { MetricAggregation, MetricAggregationType } from '../../../model/metrics/metric-aggregation'; +import { MetricHealth } from '../../../model/metrics/metric-health'; import { EntityType, ObservabilityEntityType } from '../../../model/schema/entity'; import { GraphQlMetricBandInterval } from '../../../model/schema/metric/graphql-metric-timeseries'; +import { + convertToGraphQlMetricAggregationType, + GraphQlMetricAggregationType +} from '../../../model/schema/metrics/graphql-metric-aggregation-type'; import { DefinesNeighbor, NeighborDirection } from '../../../model/schema/neighbor'; import { EntitySpecification } from '../../../model/schema/specifications/entity-specification'; import { @@ -26,9 +22,12 @@ import { PercentileLatencyMetricAggregationSpecification, PercentileLatencyMetricValueCategory } from '../../../model/schema/specifications/percentile-latency-aggregation-specification'; +import { Specification } from '../../../model/schema/specifier/specification'; +import { MetricSpecification } from '../../../model/specifications/metric-specification'; import { GraphQlObservabilityArgumentBuilder } from '../argument/graphql-observability-argument-builder'; import { EntitySpecificationBuilder } from '../specification/entity/entity-specification-builder'; import { convertToGraphQlMetricAggregationPath } from '../specification/metric/metric-aggregation-converters'; +import { SpecificationBuilder } from '../specification/specification-builder'; export class ObservabilitySpecificationBuilder extends SpecificationBuilder { protected readonly argBuilder: GraphQlObservabilityArgumentBuilder = new GraphQlObservabilityArgumentBuilder(); diff --git a/projects/distributed-tracing/src/shared/graphql/request/builders/specification/attribute/enriched-attribute-specification-builder.test.ts b/projects/observability/src/shared/graphql/request/builders/specification/attribute/enriched-attribute-specification-builder.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/builders/specification/attribute/enriched-attribute-specification-builder.test.ts rename to projects/observability/src/shared/graphql/request/builders/specification/attribute/enriched-attribute-specification-builder.test.ts diff --git a/projects/distributed-tracing/src/shared/graphql/request/builders/specification/attribute/enriched-attribute-specification-builder.ts b/projects/observability/src/shared/graphql/request/builders/specification/attribute/enriched-attribute-specification-builder.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/builders/specification/attribute/enriched-attribute-specification-builder.ts rename to projects/observability/src/shared/graphql/request/builders/specification/attribute/enriched-attribute-specification-builder.ts diff --git a/projects/observability/src/shared/graphql/request/builders/specification/entity/entity-specification-builder.ts b/projects/observability/src/shared/graphql/request/builders/specification/entity/entity-specification-builder.ts index edb235b8a..e39250db5 100644 --- a/projects/observability/src/shared/graphql/request/builders/specification/entity/entity-specification-builder.ts +++ b/projects/observability/src/shared/graphql/request/builders/specification/entity/entity-specification-builder.ts @@ -1,5 +1,4 @@ import { Dictionary } from '@hypertrace/common'; -import { GraphQlArgumentBuilder } from '@hypertrace/distributed-tracing'; import { GraphQlSelection } from '@hypertrace/graphql-client'; import { Entity, @@ -9,6 +8,7 @@ import { ObservabilityEntityType } from '../../../../model/schema/entity'; import { EntitySpecification } from '../../../../model/schema/specifications/entity-specification'; +import { GraphQlArgumentBuilder } from '../../argument/graphql-argument-builder'; export class EntitySpecificationBuilder { private static readonly DEFAULT_TYPE_FIELD: string = 'type'; diff --git a/projects/observability/src/shared/graphql/request/builders/specification/explore/explore-specification-builder.ts b/projects/observability/src/shared/graphql/request/builders/specification/explore/explore-specification-builder.ts index a47b82a42..627e3a41d 100644 --- a/projects/observability/src/shared/graphql/request/builders/specification/explore/explore-specification-builder.ts +++ b/projects/observability/src/shared/graphql/request/builders/specification/explore/explore-specification-builder.ts @@ -1,13 +1,13 @@ import { DateCoercer, Dictionary } from '@hypertrace/common'; -import { - AttributeMetadataType, - convertToGraphQlMetricAggregationType, - GraphQlMetricAggregationType, - GraphQlSortWithoutDirection, - MetricAggregationType -} from '@hypertrace/distributed-tracing'; import { GraphQlEnumArgument } from '@hypertrace/graphql-client'; +import { AttributeMetadataType } from '../../../../model/metadata/attribute-metadata'; +import { MetricAggregationType } from '../../../../model/metrics/metric-aggregation'; import { INTERVAL_START_QUERY_KEY } from '../../../../model/schema/explore'; +import { + convertToGraphQlMetricAggregationType, + GraphQlMetricAggregationType +} from '../../../../model/schema/metrics/graphql-metric-aggregation-type'; +import { GraphQlSortWithoutDirection } from '../../../../model/schema/sort/graphql-sort-without-direction'; import { ExploreSpecification } from '../../../../model/schema/specifications/explore-specification'; import { GraphQlObservabilityArgumentBuilder } from '../../argument/graphql-observability-argument-builder'; diff --git a/projects/observability/src/shared/graphql/request/builders/specification/metric/metric-aggregation-converters.ts b/projects/observability/src/shared/graphql/request/builders/specification/metric/metric-aggregation-converters.ts index 070418c38..8804cc48c 100644 --- a/projects/observability/src/shared/graphql/request/builders/specification/metric/metric-aggregation-converters.ts +++ b/projects/observability/src/shared/graphql/request/builders/specification/metric/metric-aggregation-converters.ts @@ -1,5 +1,5 @@ import { assertUnreachable } from '@hypertrace/common'; -import { MetricAggregationType } from '@hypertrace/distributed-tracing'; +import { MetricAggregationType } from '../../../../model/metrics/metric-aggregation'; import { GraphQlMetricAggregationPath } from '../../../../model/schema/metric/graphql-metric-aggregation'; export const convertToGraphQlMetricAggregationPath = (value: MetricAggregationType): GraphQlMetricAggregationPath => { diff --git a/projects/distributed-tracing/src/shared/graphql/request/builders/specification/specification-builder.test.ts b/projects/observability/src/shared/graphql/request/builders/specification/specification-builder.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/builders/specification/specification-builder.test.ts rename to projects/observability/src/shared/graphql/request/builders/specification/specification-builder.test.ts diff --git a/projects/distributed-tracing/src/shared/graphql/request/builders/specification/specification-builder.ts b/projects/observability/src/shared/graphql/request/builders/specification/specification-builder.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/builders/specification/specification-builder.ts rename to projects/observability/src/shared/graphql/request/builders/specification/specification-builder.ts diff --git a/projects/distributed-tracing/src/shared/graphql/request/builders/specification/trace/trace-status/trace-status-specification-builder.test.ts b/projects/observability/src/shared/graphql/request/builders/specification/trace/trace-status/trace-status-specification-builder.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/builders/specification/trace/trace-status/trace-status-specification-builder.test.ts rename to projects/observability/src/shared/graphql/request/builders/specification/trace/trace-status/trace-status-specification-builder.test.ts diff --git a/projects/distributed-tracing/src/shared/graphql/request/builders/specification/trace/trace-status/trace-status-specification-builder.ts b/projects/observability/src/shared/graphql/request/builders/specification/trace/trace-status/trace-status-specification-builder.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/builders/specification/trace/trace-status/trace-status-specification-builder.ts rename to projects/observability/src/shared/graphql/request/builders/specification/trace/trace-status/trace-status-specification-builder.ts diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/entities-graphql-query-builder.service.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/entities-graphql-query-builder.service.ts index 92c53182a..4a9f174d4 100644 --- a/projects/observability/src/shared/graphql/request/handlers/entities/query/entities-graphql-query-builder.service.ts +++ b/projects/observability/src/shared/graphql/request/handlers/entities/query/entities-graphql-query-builder.service.ts @@ -1,14 +1,5 @@ import { Inject, Injectable } from '@angular/core'; import { Dictionary, forkJoinSafeEmpty } from '@hypertrace/common'; -import { - GlobalGraphQlFilterService, - GraphQlFilter, - GraphQlSelectionBuilder, - GraphQlSortBySpecification, - GraphQlTimeRange, - MetadataService, - Specification -} from '@hypertrace/distributed-tracing'; import { GraphQlArgument, GraphQlRequestCacheability, @@ -18,8 +9,15 @@ import { import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { EntityMetadataMap, ENTITY_METADATA } from '../../../../../constants/entity-metadata'; +import { MetadataService } from '../../../../../services/metadata/metadata.service'; import { Entity, entityIdKey, EntityType, entityTypeKey } from '../../../../model/schema/entity'; +import { GlobalGraphQlFilterService } from '../../../../model/schema/filter/global-graphql-filter.service'; +import { GraphQlFilter } from '../../../../model/schema/filter/graphql-filter'; +import { GraphQlSortBySpecification } from '../../../../model/schema/sort/graphql-sort-by-specification'; +import { Specification } from '../../../../model/schema/specifier/specification'; +import { GraphQlTimeRange } from '../../../../model/schema/timerange/graphql-time-range'; import { GraphQlObservabilityArgumentBuilder } from '../../../builders/argument/graphql-observability-argument-builder'; +import { GraphQlSelectionBuilder } from '../../../builders/selections/graphql-selection-builder'; @Injectable({ providedIn: 'root' }) export class EntitiesGraphqlQueryBuilderService { diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/entities-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/entities-graphql-query-handler.service.test.ts index 8442eefd9..1ad28b8aa 100644 --- a/projects/observability/src/shared/graphql/request/handlers/entities/query/entities-graphql-query-handler.service.test.ts +++ b/projects/observability/src/shared/graphql/request/handlers/entities/query/entities-graphql-query-handler.service.test.ts @@ -1,21 +1,19 @@ import { fakeAsync } from '@angular/core/testing'; import { Dictionary, FixedTimeRange, TimeDuration, TimeUnit } from '@hypertrace/common'; -import { - AttributeMetadataType, - GraphQlTimeRange, - MetadataService, - MetricAggregationType, - MetricHealth, - Specification -} from '@hypertrace/distributed-tracing'; import { GraphQlEnumArgument, GraphQlRequestCacheability, GraphQlSelection } from '@hypertrace/graphql-client'; import { runFakeRxjs } from '@hypertrace/test-utils'; import { createServiceFactory, mockProvider } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; import { ENTITY_METADATA } from '../../../../../../shared/constants/entity-metadata'; +import { MetadataService } from '../../../../../services/metadata/metadata.service'; +import { AttributeMetadataType } from '../../../../model/metadata/attribute-metadata'; +import { MetricAggregationType } from '../../../../model/metrics/metric-aggregation'; +import { MetricHealth } from '../../../../model/metrics/metric-health'; import { entityIdKey, entityTypeKey, ObservabilityEntityType } from '../../../../model/schema/entity'; import { GraphQlEntityFilter } from '../../../../model/schema/filter/entity/graphql-entity-filter'; import { GraphQlIntervalUnit } from '../../../../model/schema/interval/graphql-interval-unit'; +import { Specification } from '../../../../model/schema/specifier/specification'; +import { GraphQlTimeRange } from '../../../../model/schema/timerange/graphql-time-range'; import { ObservabilitySpecificationBuilder } from '../../../builders/selections/observability-specification-builder'; import { EntitiesGraphQlQueryHandlerService, diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts index f540b11c9..441768f64 100644 --- a/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts +++ b/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { GraphQlTimeRange, Specification } from '@hypertrace/distributed-tracing'; import { GraphQlHandlerType, GraphQlQueryHandler, @@ -10,6 +9,8 @@ import { Observable } from 'rxjs'; import { map, throwIfEmpty } from 'rxjs/operators'; import { Entity, EntityType } from '../../../../../model/schema/entity'; import { GraphQlEntityFilter } from '../../../../../model/schema/filter/entity/graphql-entity-filter'; +import { Specification } from '../../../../../model/schema/specifier/specification'; +import { GraphQlTimeRange } from '../../../../../model/schema/timerange/graphql-time-range'; import { EntitiesGraphqlQueryBuilderService } from '../entities-graphql-query-builder.service'; import { EntitiesGraphQlQueryHandlerService, diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.test.ts index 50e944d52..9daeb73ed 100644 --- a/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.test.ts +++ b/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.test.ts @@ -1,21 +1,18 @@ import { fakeAsync } from '@angular/core/testing'; import { Dictionary, FixedTimeRange } from '@hypertrace/common'; -import { - AttributeMetadataType, - GraphQlFilterType, - GraphQlOperatorType, - GraphQlTimeRange, - MetadataService, - MetricAggregationType, - MetricHealth, - Specification -} from '@hypertrace/distributed-tracing'; import { GraphQlEnumArgument } from '@hypertrace/graphql-client'; import { runFakeRxjs } from '@hypertrace/test-utils'; import { createServiceFactory, mockProvider } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; import { ENTITY_METADATA } from '../../../../../../constants/entity-metadata'; +import { MetadataService } from '../../../../../../services/metadata/metadata.service'; +import { AttributeMetadataType } from '../../../../../model/metadata/attribute-metadata'; +import { MetricAggregationType } from '../../../../../model/metrics/metric-aggregation'; +import { MetricHealth } from '../../../../../model/metrics/metric-health'; import { entityIdKey, entityTypeKey, ObservabilityEntityType } from '../../../../../model/schema/entity'; +import { GraphQlFilterType, GraphQlOperatorType } from '../../../../../model/schema/filter/graphql-filter'; +import { Specification } from '../../../../../model/schema/specifier/specification'; +import { GraphQlTimeRange } from '../../../../../model/schema/timerange/graphql-time-range'; import { ObservabilitySpecificationBuilder } from '../../../../builders/selections/observability-specification-builder'; import { GraphQlInteractionsRequest, diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.ts index dc0a46d20..d1dd96220 100644 --- a/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.ts +++ b/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.ts @@ -1,16 +1,14 @@ import { Injectable } from '@angular/core'; import { DeepReadonly, forkJoinSafeEmpty, RequireBy } from '@hypertrace/common'; -import { - GraphQlSelectionBuilder, - GraphQlTimeRange, - MetadataService, - Specification -} from '@hypertrace/distributed-tracing'; import { GraphQlHandlerType, GraphQlQueryHandler, GraphQlSelection } from '@hypertrace/graphql-client'; import { combineLatest, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { MetadataService } from '../../../../../../services/metadata/metadata.service'; import { EntityType, Interaction, INTERACTION_SCOPE } from '../../../../../model/schema/entity'; +import { Specification } from '../../../../../model/schema/specifier/specification'; +import { GraphQlTimeRange } from '../../../../../model/schema/timerange/graphql-time-range'; import { GraphQlObservabilityArgumentBuilder } from '../../../../builders/argument/graphql-observability-argument-builder'; +import { GraphQlSelectionBuilder } from '../../../../builders/selections/graphql-selection-builder'; import { EntitiesGraphqlQueryBuilderService } from '../entities-graphql-query-builder.service'; import { EntityGraphQlQueryHandlerService, diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service.test.ts index 6af18a252..b61a9f3f4 100644 --- a/projects/observability/src/shared/graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service.test.ts +++ b/projects/observability/src/shared/graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service.test.ts @@ -1,9 +1,11 @@ import { FixedTimeRange, isEqualIgnoreFunctions } from '@hypertrace/common'; -import { GraphQlTimeRange, MetricAggregationType, MetricHealth } from '@hypertrace/distributed-tracing'; import { GraphQlEnumArgument } from '@hypertrace/graphql-client'; import { createServiceFactory } from '@ngneat/spectator/jest'; +import { MetricAggregationType } from '../../../../../model/metrics/metric-aggregation'; +import { MetricHealth } from '../../../../../model/metrics/metric-health'; import { entityIdKey, entityTypeKey, ObservabilityEntityType } from '../../../../../model/schema/entity'; import { GraphQlIntervalUnit } from '../../../../../model/schema/interval/graphql-interval-unit'; +import { GraphQlTimeRange } from '../../../../../model/schema/timerange/graphql-time-range'; import { ObservabilitySpecificationBuilder } from '../../../../builders/selections/observability-specification-builder'; import { EntityEdge, diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service.ts index 18c721bf0..0a9521dab 100644 --- a/projects/observability/src/shared/graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service.ts +++ b/projects/observability/src/shared/graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service.ts @@ -1,19 +1,17 @@ import { Injectable } from '@angular/core'; import { Dictionary } from '@hypertrace/common'; -import { - GlobalGraphQlFilterService, - GraphQlFilter, - GraphQlSelectionBuilder, - GraphQlTimeRange, - Specification, - SpecificationBuilder -} from '@hypertrace/distributed-tracing'; import { GraphQlHandlerType, GraphQlQueryHandler, GraphQlSelection } from '@hypertrace/graphql-client'; import { fromPairs } from 'lodash-es'; import { Entity, entityIdKey, entityTypeKey, ObservabilityEntityType } from '../../../../../model/schema/entity'; +import { GlobalGraphQlFilterService } from '../../../../../model/schema/filter/global-graphql-filter.service'; +import { GraphQlFilter } from '../../../../../model/schema/filter/graphql-filter'; import { GraphQlMetricAggregation } from '../../../../../model/schema/metric/graphql-metric-aggregation'; import { MetricAggregationSpecification } from '../../../../../model/schema/specifications/metric-aggregation-specification'; +import { Specification } from '../../../../../model/schema/specifier/specification'; +import { GraphQlTimeRange } from '../../../../../model/schema/timerange/graphql-time-range'; import { GraphQlObservabilityArgumentBuilder } from '../../../../builders/argument/graphql-observability-argument-builder'; +import { GraphQlSelectionBuilder } from '../../../../builders/selections/graphql-selection-builder'; +import { SpecificationBuilder } from '../../../../builders/specification/specification-builder'; @Injectable({ providedIn: 'root' }) export class EntityTopologyGraphQlQueryHandlerService diff --git a/projects/observability/src/shared/graphql/request/handlers/explore/explore-graphql-query-builder.service.ts b/projects/observability/src/shared/graphql/request/handlers/explore/explore-graphql-query-builder.service.ts index 8ca1d7e6a..8337583d2 100644 --- a/projects/observability/src/shared/graphql/request/handlers/explore/explore-graphql-query-builder.service.ts +++ b/projects/observability/src/shared/graphql/request/handlers/explore/explore-graphql-query-builder.service.ts @@ -1,11 +1,12 @@ import { Injectable } from '@angular/core'; import { DateCoercer, Dictionary } from '@hypertrace/common'; -import { GlobalGraphQlFilterService, GraphQlSelectionBuilder } from '@hypertrace/distributed-tracing'; import { GraphQlArgument, GraphQlEnumArgument, GraphQlSelection } from '@hypertrace/graphql-client'; import { INTERVAL_START_QUERY_KEY } from '../../../model/schema/explore'; +import { GlobalGraphQlFilterService } from '../../../model/schema/filter/global-graphql-filter.service'; import { GraphQlGroupBy } from '../../../model/schema/groupby/graphql-group-by'; import { ExploreSpecification } from '../../../model/schema/specifications/explore-specification'; import { GraphQlObservabilityArgumentBuilder } from '../../builders/argument/graphql-observability-argument-builder'; +import { GraphQlSelectionBuilder } from '../../builders/selections/graphql-selection-builder'; import { ExploreSpecificationBuilder } from '../../builders/specification/explore/explore-specification-builder'; import { GQL_EXPLORE_RESULT_INTERVAL_KEY, diff --git a/projects/observability/src/shared/graphql/request/handlers/explore/explore-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/explore/explore-graphql-query-handler.service.test.ts index 9eae3b3f1..8b51596b6 100644 --- a/projects/observability/src/shared/graphql/request/handlers/explore/explore-graphql-query-handler.service.test.ts +++ b/projects/observability/src/shared/graphql/request/handlers/explore/explore-graphql-query-handler.service.test.ts @@ -1,20 +1,17 @@ import { FixedTimeRange, TimeDuration, TimeUnit } from '@hypertrace/common'; -import { - AttributeMetadataType, - GraphQlFieldFilter, - GraphQlFilterType, - GraphQlMetricAggregationType, - GraphQlOperatorType, - GraphQlTimeRange, - MetadataService, - MetricAggregationType -} from '@hypertrace/distributed-tracing'; import { GraphQlEnumArgument } from '@hypertrace/graphql-client'; import { createServiceFactory, mockProvider } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; +import { MetadataService } from '../../../../services/metadata/metadata.service'; +import { AttributeMetadataType } from '../../../model/metadata/attribute-metadata'; +import { MetricAggregationType } from '../../../model/metrics/metric-aggregation'; import { ObservabilityEntityType } from '../../../model/schema/entity'; +import { GraphQlFieldFilter } from '../../../model/schema/filter/field/graphql-field-filter'; +import { GraphQlFilterType, GraphQlOperatorType } from '../../../model/schema/filter/graphql-filter'; import { GraphQlIntervalUnit } from '../../../model/schema/interval/graphql-interval-unit'; +import { GraphQlMetricAggregationType } from '../../../model/schema/metrics/graphql-metric-aggregation-type'; import { ObservabilityTraceType } from '../../../model/schema/observability-traces'; +import { GraphQlTimeRange } from '../../../model/schema/timerange/graphql-time-range'; import { ExploreSpecificationBuilder } from '../../builders/specification/explore/explore-specification-builder'; import { ExploreGraphQlQueryHandlerService } from './explore-graphql-query-handler.service'; import { EXPLORE_GQL_REQUEST, GQL_EXPLORE_RESULT_INTERVAL_KEY, GraphQlExploreRequest } from './explore-query'; diff --git a/projects/observability/src/shared/graphql/request/handlers/explore/explore-query.ts b/projects/observability/src/shared/graphql/request/handlers/explore/explore-query.ts index 0f99810b1..b3b8da39b 100644 --- a/projects/observability/src/shared/graphql/request/handlers/explore/explore-query.ts +++ b/projects/observability/src/shared/graphql/request/handlers/explore/explore-query.ts @@ -1,8 +1,10 @@ import { TimeDuration } from '@hypertrace/common'; -import { GraphQlFilter, GraphQlSortBySpecification, GraphQlTimeRange } from '@hypertrace/distributed-tracing'; import { INTERVAL_START_QUERY_KEY } from '../../../model/schema/explore'; +import { GraphQlFilter } from '../../../model/schema/filter/graphql-filter'; import { GraphQlGroupBy } from '../../../model/schema/groupby/graphql-group-by'; +import { GraphQlSortBySpecification } from '../../../model/schema/sort/graphql-sort-by-specification'; import { ExploreSpecification, ExploreValue } from '../../../model/schema/specifications/explore-specification'; +import { GraphQlTimeRange } from '../../../model/schema/timerange/graphql-time-range'; export const EXPLORE_GQL_REQUEST = Symbol('GraphQL Query Request'); diff --git a/projects/distributed-tracing/src/shared/graphql/request/handlers/spans/span-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/spans/span-graphql-query-handler.service.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/handlers/spans/span-graphql-query-handler.service.test.ts rename to projects/observability/src/shared/graphql/request/handlers/spans/span-graphql-query-handler.service.test.ts diff --git a/projects/distributed-tracing/src/shared/graphql/request/handlers/spans/span-graphql-query-handler.service.ts b/projects/observability/src/shared/graphql/request/handlers/spans/span-graphql-query-handler.service.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/handlers/spans/span-graphql-query-handler.service.ts rename to projects/observability/src/shared/graphql/request/handlers/spans/span-graphql-query-handler.service.ts diff --git a/projects/distributed-tracing/src/shared/graphql/request/handlers/spans/spans-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/spans/spans-graphql-query-handler.service.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/handlers/spans/spans-graphql-query-handler.service.test.ts rename to projects/observability/src/shared/graphql/request/handlers/spans/spans-graphql-query-handler.service.test.ts diff --git a/projects/distributed-tracing/src/shared/graphql/request/handlers/spans/spans-graphql-query-handler.service.ts b/projects/observability/src/shared/graphql/request/handlers/spans/spans-graphql-query-handler.service.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/handlers/spans/spans-graphql-query-handler.service.ts rename to projects/observability/src/shared/graphql/request/handlers/spans/spans-graphql-query-handler.service.ts diff --git a/projects/distributed-tracing/src/shared/graphql/request/handlers/traces/export-spans-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/traces/export-spans-graphql-query-handler.service.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/handlers/traces/export-spans-graphql-query-handler.service.test.ts rename to projects/observability/src/shared/graphql/request/handlers/traces/export-spans-graphql-query-handler.service.test.ts diff --git a/projects/distributed-tracing/src/shared/graphql/request/handlers/traces/export-spans-graphql-query-handler.service.ts b/projects/observability/src/shared/graphql/request/handlers/traces/export-spans-graphql-query-handler.service.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/handlers/traces/export-spans-graphql-query-handler.service.ts rename to projects/observability/src/shared/graphql/request/handlers/traces/export-spans-graphql-query-handler.service.ts diff --git a/projects/distributed-tracing/src/shared/graphql/request/handlers/traces/trace-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/traces/trace-graphql-query-handler.service.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/handlers/traces/trace-graphql-query-handler.service.test.ts rename to projects/observability/src/shared/graphql/request/handlers/traces/trace-graphql-query-handler.service.test.ts diff --git a/projects/distributed-tracing/src/shared/graphql/request/handlers/traces/trace-graphql-query-handler.service.ts b/projects/observability/src/shared/graphql/request/handlers/traces/trace-graphql-query-handler.service.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/handlers/traces/trace-graphql-query-handler.service.ts rename to projects/observability/src/shared/graphql/request/handlers/traces/trace-graphql-query-handler.service.ts diff --git a/projects/distributed-tracing/src/shared/graphql/request/handlers/traces/traces-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/traces/traces-graphql-query-handler.service.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/handlers/traces/traces-graphql-query-handler.service.test.ts rename to projects/observability/src/shared/graphql/request/handlers/traces/traces-graphql-query-handler.service.test.ts diff --git a/projects/distributed-tracing/src/shared/graphql/request/handlers/traces/traces-graphql-query-handler.service.ts b/projects/observability/src/shared/graphql/request/handlers/traces/traces-graphql-query-handler.service.ts similarity index 100% rename from projects/distributed-tracing/src/shared/graphql/request/handlers/traces/traces-graphql-query-handler.service.ts rename to projects/observability/src/shared/graphql/request/handlers/traces/traces-graphql-query-handler.service.ts diff --git a/projects/distributed-tracing/src/shared/icons/tracing-icon-library.module.ts b/projects/observability/src/shared/icons/tracing-icon-library.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/icons/tracing-icon-library.module.ts rename to projects/observability/src/shared/icons/tracing-icon-library.module.ts diff --git a/projects/distributed-tracing/src/shared/icons/tracing-icon-type.ts b/projects/observability/src/shared/icons/tracing-icon-type.ts similarity index 100% rename from projects/distributed-tracing/src/shared/icons/tracing-icon-type.ts rename to projects/observability/src/shared/icons/tracing-icon-type.ts diff --git a/projects/observability/src/shared/services/entity/entity-detail.service.ts b/projects/observability/src/shared/services/entity/entity-detail.service.ts index d2e359c0e..560903492 100644 --- a/projects/observability/src/shared/services/entity/entity-detail.service.ts +++ b/projects/observability/src/shared/services/entity/entity-detail.service.ts @@ -1,19 +1,17 @@ import { Injectable, OnDestroy } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { ReplayObservable, TimeRangeService } from '@hypertrace/common'; -import { - GraphQlFilter, - GraphQlFilterDataSourceModel, - GraphQlTimeRange, - Specification, - SpecificationBuilder -} from '@hypertrace/distributed-tracing'; import { GraphQlRequestService } from '@hypertrace/graphql-client'; import { Dashboard } from '@hypertrace/hyperdash'; import { combineLatest, Subject, Subscription } from 'rxjs'; import { concatMap, map, shareReplay, takeUntil } from 'rxjs/operators'; +import { GraphQlFilterDataSourceModel } from '../../dashboard/data/graphql/filter/graphql-filter-data-source.model'; import { Entity, EntityType } from '../../graphql/model/schema/entity'; import { GraphQlEntityFilter } from '../../graphql/model/schema/filter/entity/graphql-entity-filter'; +import { GraphQlFilter } from '../../graphql/model/schema/filter/graphql-filter'; +import { Specification } from '../../graphql/model/schema/specifier/specification'; +import { GraphQlTimeRange } from '../../graphql/model/schema/timerange/graphql-time-range'; +import { SpecificationBuilder } from '../../graphql/request/builders/specification/specification-builder'; import { EntityGraphQlQueryHandlerService, ENTITY_GQL_REQUEST diff --git a/projects/distributed-tracing/src/shared/services/filter-builder/graphql-filter-builder.service.test.ts b/projects/observability/src/shared/services/filter-builder/graphql-filter-builder.service.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/services/filter-builder/graphql-filter-builder.service.test.ts rename to projects/observability/src/shared/services/filter-builder/graphql-filter-builder.service.test.ts diff --git a/projects/distributed-tracing/src/shared/services/filter-builder/graphql-filter-builder.service.ts b/projects/observability/src/shared/services/filter-builder/graphql-filter-builder.service.ts similarity index 100% rename from projects/distributed-tracing/src/shared/services/filter-builder/graphql-filter-builder.service.ts rename to projects/observability/src/shared/services/filter-builder/graphql-filter-builder.service.ts diff --git a/projects/distributed-tracing/src/shared/services/icon-lookup/tracing-icon-lookup.service.test.ts b/projects/observability/src/shared/services/icon-lookup/tracing-icon-lookup.service.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/services/icon-lookup/tracing-icon-lookup.service.test.ts rename to projects/observability/src/shared/services/icon-lookup/tracing-icon-lookup.service.test.ts diff --git a/projects/distributed-tracing/src/shared/services/icon-lookup/tracing-icon-lookup.service.ts b/projects/observability/src/shared/services/icon-lookup/tracing-icon-lookup.service.ts similarity index 100% rename from projects/distributed-tracing/src/shared/services/icon-lookup/tracing-icon-lookup.service.ts rename to projects/observability/src/shared/services/icon-lookup/tracing-icon-lookup.service.ts diff --git a/projects/distributed-tracing/src/shared/services/log-events/log-events.service.test.ts b/projects/observability/src/shared/services/log-events/log-events.service.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/services/log-events/log-events.service.test.ts rename to projects/observability/src/shared/services/log-events/log-events.service.test.ts diff --git a/projects/distributed-tracing/src/shared/services/log-events/log-events.service.ts b/projects/observability/src/shared/services/log-events/log-events.service.ts similarity index 97% rename from projects/distributed-tracing/src/shared/services/log-events/log-events.service.ts rename to projects/observability/src/shared/services/log-events/log-events.service.ts index 0c8bbf3f0..3c1fc39bd 100644 --- a/projects/distributed-tracing/src/shared/services/log-events/log-events.service.ts +++ b/projects/observability/src/shared/services/log-events/log-events.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; import { DateCoercer, Dictionary } from '@hypertrace/common'; import { GraphQlRequestService } from '@hypertrace/graphql-client'; -import { ObservabilityTraceType } from '@hypertrace/observability'; import { isEmpty } from 'lodash-es'; import { Observable } from 'rxjs'; import { LogEvent } from '../../dashboard/widgets/waterfall/waterfall/waterfall-chart'; +import { ObservabilityTraceType } from '../../graphql/model/schema/observability-traces'; import { Span } from '../../graphql/model/schema/span'; import { Trace, TraceType, traceTypeKey } from '../../graphql/model/schema/trace'; import { SpecificationBuilder } from '../../graphql/request/builders/specification/specification-builder'; diff --git a/projects/distributed-tracing/src/shared/services/metadata/handler/metadata-graphql-query-handler.service.test.ts b/projects/observability/src/shared/services/metadata/handler/metadata-graphql-query-handler.service.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/services/metadata/handler/metadata-graphql-query-handler.service.test.ts rename to projects/observability/src/shared/services/metadata/handler/metadata-graphql-query-handler.service.test.ts diff --git a/projects/distributed-tracing/src/shared/services/metadata/handler/metadata-graphql-query-handler.service.ts b/projects/observability/src/shared/services/metadata/handler/metadata-graphql-query-handler.service.ts similarity index 100% rename from projects/distributed-tracing/src/shared/services/metadata/handler/metadata-graphql-query-handler.service.ts rename to projects/observability/src/shared/services/metadata/handler/metadata-graphql-query-handler.service.ts diff --git a/projects/distributed-tracing/src/shared/services/metadata/metadata.service.module.ts b/projects/observability/src/shared/services/metadata/metadata.service.module.ts similarity index 100% rename from projects/distributed-tracing/src/shared/services/metadata/metadata.service.module.ts rename to projects/observability/src/shared/services/metadata/metadata.service.module.ts diff --git a/projects/distributed-tracing/src/shared/services/metadata/metadata.service.test.ts b/projects/observability/src/shared/services/metadata/metadata.service.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/services/metadata/metadata.service.test.ts rename to projects/observability/src/shared/services/metadata/metadata.service.test.ts diff --git a/projects/distributed-tracing/src/shared/services/metadata/metadata.service.ts b/projects/observability/src/shared/services/metadata/metadata.service.ts similarity index 100% rename from projects/distributed-tracing/src/shared/services/metadata/metadata.service.ts rename to projects/observability/src/shared/services/metadata/metadata.service.ts diff --git a/projects/distributed-tracing/src/shared/services/navigation/tracing-navigation.service.test.ts b/projects/observability/src/shared/services/navigation/tracing-navigation.service.test.ts similarity index 100% rename from projects/distributed-tracing/src/shared/services/navigation/tracing-navigation.service.test.ts rename to projects/observability/src/shared/services/navigation/tracing-navigation.service.test.ts diff --git a/projects/distributed-tracing/src/shared/services/navigation/tracing-navigation.service.ts b/projects/observability/src/shared/services/navigation/tracing-navigation.service.ts similarity index 100% rename from projects/distributed-tracing/src/shared/services/navigation/tracing-navigation.service.ts rename to projects/observability/src/shared/services/navigation/tracing-navigation.service.ts diff --git a/projects/observability/tsconfig.lib.json b/projects/observability/tsconfig.lib.json index 00b651bcd..1d64a2145 100644 --- a/projects/observability/tsconfig.lib.json +++ b/projects/observability/tsconfig.lib.json @@ -13,7 +13,6 @@ "@hypertrace/common": ["projects/common/src/public-api.ts"], "@hypertrace/components": ["projects/components/src/public-api.ts"], "@hypertrace/dashboards": ["projects/dashboards/src/public-api.ts"], - "@hypertrace/distributed-tracing": ["projects/distributed-tracing/src/public-api.ts"], "@hypertrace/test-utils": ["projects/test-utils/src/public-api.ts"], "@hypertrace/dashboards/testing": ["projects/dashboards/src/test/public-api.ts"] } diff --git a/src/app/home/data/label/total-errors-label-data-source.model.test.ts b/src/app/home/data/label/total-errors-label-data-source.model.test.ts index c56f80ec4..fdf88521c 100644 --- a/src/app/home/data/label/total-errors-label-data-source.model.test.ts +++ b/src/app/home/data/label/total-errors-label-data-source.model.test.ts @@ -1,20 +1,18 @@ import { fakeAsync, tick } from '@angular/core/testing'; import { TimeDuration, TimeDurationService, TimeRange, TimeUnit } from '@hypertrace/common'; import { createModelFactory, SpectatorModel } from '@hypertrace/dashboards/testing'; -import { - AttributeMetadataType, - GraphQlQueryEventService, - GraphQlTimeRange, - MetricAggregationType, - ObservedGraphQlRequest -} from '@hypertrace/distributed-tracing'; import { ModelApi } from '@hypertrace/hyperdash'; import { + AttributeMetadataType, ExploreGraphQlQueryHandlerService, ExploreSpecification, EXPLORE_GQL_REQUEST, GraphQlExploreRequest, - ObservabilityTraceType + GraphQlQueryEventService, + GraphQlTimeRange, + MetricAggregationType, + ObservabilityTraceType, + ObservedGraphQlRequest } from '@hypertrace/observability'; import { runFakeRxjs } from '@hypertrace/test-utils'; import { mockProvider } from '@ngneat/spectator/jest'; diff --git a/src/app/home/data/label/total-errors-label-data-source.model.ts b/src/app/home/data/label/total-errors-label-data-source.model.ts index 8e838a024..c82f04b7d 100644 --- a/src/app/home/data/label/total-errors-label-data-source.model.ts +++ b/src/app/home/data/label/total-errors-label-data-source.model.ts @@ -1,8 +1,8 @@ -import { MetricAggregationType } from '@hypertrace/distributed-tracing'; import { Model } from '@hypertrace/hyperdash'; import { ExploreSpecification, ExploreSpecificationBuilder, + MetricAggregationType, TraceValueDataSourceModel } from '@hypertrace/observability'; import { Observable } from 'rxjs'; diff --git a/src/app/home/data/system/observe-system-radar-data-source.model.test.ts b/src/app/home/data/system/observe-system-radar-data-source.model.test.ts index 452d629c4..96ad32260 100644 --- a/src/app/home/data/system/observe-system-radar-data-source.model.test.ts +++ b/src/app/home/data/system/observe-system-radar-data-source.model.test.ts @@ -1,20 +1,18 @@ import { fakeAsync, tick } from '@angular/core/testing'; import { TimeDuration, TimeDurationService, TimeRange, TimeUnit } from '@hypertrace/common'; import { createModelFactory, SpectatorModel } from '@hypertrace/dashboards/testing'; -import { - AttributeMetadataType, - GraphQlQueryEventService, - GraphQlTimeRange, - MetricAggregationType, - ObservedGraphQlRequest -} from '@hypertrace/distributed-tracing'; import { ModelApi } from '@hypertrace/hyperdash'; import { + AttributeMetadataType, ExploreGraphQlQueryHandlerService, ExploreSpecification, EXPLORE_GQL_REQUEST, GraphQlExploreRequest, - ObservabilityTraceType + GraphQlQueryEventService, + GraphQlTimeRange, + MetricAggregationType, + ObservabilityTraceType, + ObservedGraphQlRequest } from '@hypertrace/observability'; import { runFakeRxjs } from '@hypertrace/test-utils'; import { mockProvider } from '@ngneat/spectator/jest'; diff --git a/src/app/home/data/system/observe-system-radar-data-source.model.ts b/src/app/home/data/system/observe-system-radar-data-source.model.ts index f68adbe06..8e16b4991 100644 --- a/src/app/home/data/system/observe-system-radar-data-source.model.ts +++ b/src/app/home/data/system/observe-system-radar-data-source.model.ts @@ -1,5 +1,4 @@ import { forkJoinSafeEmpty } from '@hypertrace/common'; -import { GraphQlTimeRange, MetricAggregationType } from '@hypertrace/distributed-tracing'; import { Model } from '@hypertrace/hyperdash'; import { ExploreGraphQlQueryHandlerService, @@ -8,6 +7,8 @@ import { EXPLORE_GQL_REQUEST, GraphQlExploreRequest, GraphQlExploreResponse, + GraphQlTimeRange, + MetricAggregationType, ObservabilityTraceType, RadarDataSourceModel, RadarPoint diff --git a/src/app/home/home.component.test.ts b/src/app/home/home.component.test.ts index 9552a3e4e..a1ec7b67d 100644 --- a/src/app/home/home.component.test.ts +++ b/src/app/home/home.component.test.ts @@ -1,7 +1,6 @@ import { IconLibraryTestingModule } from '@hypertrace/assets-library'; import { mockDashboardProviders } from '@hypertrace/dashboards/testing'; -import { NavigableDashboardComponent } from '@hypertrace/distributed-tracing'; -import { EntitiesGraphqlQueryBuilderService } from '@hypertrace/observability'; +import { EntitiesGraphqlQueryBuilderService, NavigableDashboardComponent } from '@hypertrace/observability'; import { createComponentFactory, mockProvider } from '@ngneat/spectator/jest'; import { HomeComponent } from './home.component'; import { HomeModule } from './home.module'; diff --git a/src/app/home/home.dashboard.ts b/src/app/home/home.dashboard.ts index 59a1839e2..b5875503f 100644 --- a/src/app/home/home.dashboard.ts +++ b/src/app/home/home.dashboard.ts @@ -3,10 +3,11 @@ import { CoreTableCellRendererType, TableMode, TableStyle, TitlePosition } from import { DashboardDefaultConfiguration, GraphQlOperatorType, + LegendPosition, MetricAggregationType, + ObservabilityTableCellType, TracingTableCellType -} from '@hypertrace/distributed-tracing'; -import { LegendPosition, ObservabilityTableCellType } from '@hypertrace/observability'; +} from '@hypertrace/observability'; // tslint:disable: max-file-line-count export const homeDashboard: DashboardDefaultConfiguration = { diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index eca03138f..5ff331f87 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -2,8 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { HtRoute } from '@hypertrace/common'; -import { NavigableDashboardModule } from '@hypertrace/distributed-tracing'; -import { ObservabilityDashboardModule } from '@hypertrace/observability'; +import { NavigableDashboardModule, ObservabilityDashboardModule } from '@hypertrace/observability'; import { TotalErrorsLabelDataSourceModule } from './data/label/total-errors-label-data-source.module'; import { ObserveSystemRadarDataSourceModule } from './data/system/observe-system-radar-data-source.module'; import { HomeComponent } from './home.component'; diff --git a/src/app/routes/explorer/explorer-routing.module.ts b/src/app/routes/explorer/explorer-routing.module.ts index 0a12e870b..fa2823cd8 100644 --- a/src/app/routes/explorer/explorer-routing.module.ts +++ b/src/app/routes/explorer/explorer-routing.module.ts @@ -2,8 +2,12 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { HtRoute } from '@hypertrace/common'; import { FilterBuilderLookupService } from '@hypertrace/components'; -import { MetadataService } from '@hypertrace/distributed-tracing'; -import { ExplorerComponent, ExplorerDashboardBuilder, ExplorerModule } from '@hypertrace/observability'; +import { + ExplorerComponent, + ExplorerDashboardBuilder, + ExplorerModule, + MetadataService +} from '@hypertrace/observability'; const ROUTE_CONFIG: HtRoute[] = [ { diff --git a/src/app/routes/root-routing.module.ts b/src/app/routes/root-routing.module.ts index 8f5919cd3..63c396550 100644 --- a/src/app/routes/root-routing.module.ts +++ b/src/app/routes/root-routing.module.ts @@ -77,7 +77,7 @@ const ROUTE_CONFIG: HtRoute[] = [ }, { path: 'trace', - loadChildren: () => import('@hypertrace/distributed-tracing').then(module => module.TraceDetailPageModule) + loadChildren: () => import('@hypertrace/observability').then(module => module.TraceDetailPageModule) }, { path: 'api-trace', diff --git a/tsconfig.base.json b/tsconfig.base.json index 0b614ff7f..374e43474 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -23,7 +23,6 @@ "@hypertrace/components": ["projects/components/src/public-api.ts"], "@hypertrace/dashboards": ["projects/dashboards/src/public-api.ts"], "@hypertrace/graphql-client": ["projects/graphql-client/src/public-api.ts"], - "@hypertrace/distributed-tracing": ["projects/distributed-tracing/src/public-api.ts"], "@hypertrace/test-utils": ["projects/test-utils/src/public-api.ts"], "@hypertrace/dashboards/testing": ["projects/dashboards/src/test/public-api.ts"], "@hypertrace/observability": ["projects/observability/src/public-api.ts"] diff --git a/tsconfig.json b/tsconfig.json index 279f9e68c..2642541ba 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,9 +19,6 @@ { "path": "./projects/graphql-client/tsconfig.lib.json" }, - { - "path": "./projects/distributed-tracing/tsconfig.lib.json" - }, { "path": "./projects/components/tsconfig.lib.json" }, diff --git a/tslint.json b/tslint.json index 1f2cab30d..b7464e4c8 100644 --- a/tslint.json +++ b/tslint.json @@ -21,7 +21,6 @@ "@hypertrace/common/testing", "@hypertrace/dashboards/testing", "@hypertrace/graphql-client", - "@hypertrace/distributed-tracing", "@hypertrace/test-utils", "@hypertrace/observability", "ng-mocks"