Merge branch 'main' into rename-route-interface

Author: arjunlalb

projects/components/src/button/button.component.scss

@@ -117,7 +117,8 @@
   }
 }
 
-.text {
+.text,
+.plain-text {
   &.primary {
     @include button-style(inherit, inherit, $blue-5, $blue-4);
   }
@@ -147,7 +148,7 @@
   height: 40px;
   border-radius: 8px;
 
-  &:not(.icon-only) {
+  &:not(.icon-only, .plain-text) {
     padding: 0 20px;
   }
 
@@ -161,7 +162,7 @@
   height: 36px;
   border-radius: 6px;
 
-  &:not(.icon-only) {
+  &:not(.icon-only, .plain-text) {
     padding: 0 16px;
   }
 
@@ -175,7 +176,7 @@
   height: 32px;
   border-radius: 6px;
 
-  &:not(.icon-only) {
+  &:not(.icon-only, .plain-text) {
     padding: 0 16px;
   }
 
@@ -189,7 +190,7 @@
   height: 24px;
   border-radius: 4px;
 
-  &:not(.icon-only) {
+  &:not(.icon-only, .plain-text) {
     padding: 0 12px;
   }
 
@@ -203,7 +204,7 @@
   height: 18px;
   border-radius: 4px;
 
-  &:not(.icon-only) {
+  &:not(.icon-only, .plain-text) {
     padding: 0 12px;
   }
 

projects/components/src/button/button.component.test.ts

@@ -146,6 +146,12 @@ describe('Button Component', () => {
     });
     expect(spectator.query('.button')).toHaveClass('button secondary small text');
 
+    // Text
+    spectator.setInput({
+      display: ButtonStyle.PlainText
+    });
+    expect(spectator.query('.button')).toHaveClass('button secondary small plain-text');
+
     // Solid
     spectator.setInput({
       display: ButtonStyle.Solid

projects/components/src/button/button.ts

@@ -18,9 +18,10 @@ export const enum ButtonSize {
 
 export const enum ButtonStyle {
   // These values are used as css classes
-  //                        Background Color | Background Hover Color | Text Hover Color | Border Color
-  Solid = 'solid', //             Yes                   Yes                   No                No
-  Outlined = 'outlined', //       No                    Yes                   No                No
-  Bordered = 'bordered', //       No                    Yes                   No                Yes
-  Text = 'text' //                No                    No                    Yes               No
+  //                        Background Color | Background Hover Color | Text Hover Color | Border Color | Padding
+  Solid = 'solid', //             Yes                   Yes                   No                No          Yes
+  Outlined = 'outlined', //       No                    Yes                   No                No          Yes
+  Bordered = 'bordered', //       No                    Yes                   No                Yes         Yes
+  Text = 'text', //               No                    No                    Yes               No          Yes
+  PlainText = 'plain-text' //     No                    No                    Yes               No           No
 }

projects/components/src/sequence/renderer/sequence-bar-renderer.service.ts

@@ -230,7 +230,7 @@ export class SequenceBarRendererService {
               ? scaledEnd - this.markerWidth - 2
               : marker.markerTime
         });
-        markerTime = scaledNormalizedMarkers[index].markerTime;
+        markerTime = marker.markerTime;
       } else {
         scaledNormalizedMarkers[index] = {
           ...scaledNormalizedMarkers[index],

projects/distributed-tracing/src/shared/components/log-events/log-events-table.component.ts

@@ -120,7 +120,7 @@ export class LogEventsTableComponent implements OnChanges {
             title: 'Timestamp',
             display: CoreTableCellRendererType.RelativeTimestamp,
             visible: true,
-            width: '150px',
+            width: '120px',
             sortable: false,
             filterable: false
           },
@@ -136,7 +136,15 @@ export class LogEventsTableComponent implements OnChanges {
             title: 'Span',
             display: WaterfallTableCellType.SpanName,
             visible: true,
-            width: '30%',
+            width: '20%',
+            sortable: false,
+            filterable: false
+          },
+          {
+            id: 'spanId',
+            title: 'Span Id',
+            visible: true,
+            width: '15%',
             sortable: false,
             filterable: false
           }

projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.ts

@@ -202,7 +202,7 @@ export class WaterfallChartComponent implements OnChanges {
 
     let markerData: MarkerTooltipData = {
       relativeTimes: [],
-      summary: spanWaterfallData.logEvents[0].summary
+      summary: spanWaterfallData.logEvents.find(logEvent => logEvent.timestamp === marker.timestamps[0])?.summary ?? ''
     };
     spanWaterfallData.logEvents.forEach((logEvent: LogEvent) => {
       if (marker.timestamps.includes(logEvent.timestamp)) {

projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.ts

@@ -41,6 +41,7 @@ export interface WaterfallChartState {
 
 export interface LogEvent {
   spanStartTime?: number;
+  spanId: string;
   attributes: Dictionary<unknown>;
   timestamp: string;
   summary: string;

projects/distributed-tracing/src/shared/services/log-events/log-events.service.test.ts

@@ -65,7 +65,8 @@ describe('Log Events Service', () => {
         {
           timestamp: 'time',
           attributes: {},
-          summary: 'summary'
+          summary: 'summary',
+          spanId: 'test-id'
         }
       ]
     };
@@ -74,7 +75,8 @@ describe('Log Events Service', () => {
         timestamp: 'time',
         attributes: {},
         summary: 'summary',
-        spanStartTime: 1608151401295
+        spanStartTime: 1608151401295,
+        spanId: 'test-id'
       }
     ];
     expect(spectator.service.getLogEventsWithSpanStartTime(logEvents, 1608151401295)).toMatchObject(

projects/distributed-tracing/src/shared/services/log-events/log-events.service.ts

@@ -17,7 +17,7 @@ import {
 export class LogEventsService {
   private readonly specificationBuilder: SpecificationBuilder = new SpecificationBuilder();
   private readonly dateCoercer: DateCoercer = new DateCoercer();
-  private readonly logEventProperties: string[] = ['attributes', 'timestamp', 'summary'];
+  private readonly logEventProperties: string[] = ['attributes', 'timestamp', 'summary', 'spanId'];
   private readonly spanPropertiesForTrace: string[] = ['startTime', 'serviceName', 'displaySpanName', 'protocolName'];
   private readonly spanPropertiesForApiTrace: string[] = [
     'startTime',