feat: Use trace types from interfaces (#2)

package.json

@@ -25,6 +25,7 @@
     "node": ">=16"
   },
   "dependencies": {
+    "@well-known-components/interfaces": "^1.2.0",
     "tslib": "^2.5.0"
   },
   "files": [
@@ -35,8 +36,6 @@
     "@typescript-eslint/eslint-plugin": "^5.51.0",
     "@typescript-eslint/parser": "^5.51.0",
     "@well-known-components/http-server": "^1.1.6",
-    "@well-known-components/interfaces": "^1.1.3",
-    "@well-known-components/tracer-component": "^1.0.0",
     "eslint": "^8.33.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",

src/component.ts

@@ -1,5 +1,4 @@
-import type { IHttpServerComponent } from '@well-known-components/interfaces'
-import type { ITracerComponent, TraceContext } from '@well-known-components/tracer-component'
+import type { IHttpServerComponent, ITracerComponent, TraceContext } from '@well-known-components/interfaces'
 import { parseTraceParentHeader, parseTraceState } from './logic'
 import { IHttpTracerComponent } from './types'
 

src/logic.ts

@@ -1,4 +1,4 @@
-import { Trace } from '@well-known-components/tracer-component'
+import type { Trace } from '@well-known-components/interfaces'
 
 /**
  * Parses the tracestate header into an object.
@@ -44,9 +44,9 @@ export function parseTraceParentHeader(traceParent: string): Trace | null {
     parentIdIsInvalid
     ? null
     : {
-        version: traceParentProperties[0],
+        version: parseInt(traceParentProperties[0], 16),
         traceId: traceParentProperties[1],
         parentId: traceParentProperties[2],
-        traceFlags: traceParentProperties[3]
+        traceFlags: parseInt(traceParentProperties[3], 16)
       }
 }

test/component.spec.ts

@@ -1,5 +1,4 @@
-import type { ITracerComponent } from '@well-known-components/tracer-component'
-import type { IHttpServerComponent } from '@well-known-components/interfaces'
+import type { ITracerComponent, IHttpServerComponent } from '@well-known-components/interfaces'
 import { createHttpTracerComponent } from '../src'
 import { parseTraceParentHeader } from '../src/logic'
 
@@ -20,6 +19,7 @@ beforeEach(() => {
   mockedGetTraceStateString = jest.fn()
   tracerComponentMock = {
     span: jest.fn().mockImplementation((_name, spanFunction) => spanFunction()),
+    isInsideOfTraceSpan: jest.fn(),
     getSpanId: jest.fn(),
     getTrace: jest.fn(),
     getTraceString: mockedGetTraceString,

test/logic.spec.ts

@@ -63,10 +63,10 @@ describe('when parsing the trace parent header', () => {
   describe('and the header is well formatted', () => {
     it('should return a trace object', () => {
       expect(parseTraceParentHeader('00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01')).toEqual({
-        version: '00',
+        version: 0,
         traceId: '4bf92f3577b34da6a3ce929d0e0e4736',
         parentId: '00f067aa0ba902b7',
-        traceFlags: '01'
+        traceFlags: 1
       })
     })
   })