Skip to content

Commit 7adc277

Browse files
authored
Fixes things not fixed in #80 (#81)
1 parent b92d3d0 commit 7adc277

File tree

4 files changed

+26
-42
lines changed

4 files changed

+26
-42
lines changed

package-lock.json

+13-36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

validate.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe('Zipkin Http Api', () => {
3030
});
3131
});
3232

33-
it('/api/v1 yaml should have no swagger syntax errors', done => {
33+
it('/api/v2 yaml should have no swagger syntax errors', done => {
3434
validateSwagger('./zipkin2-api.yaml', result => {
3535
expect(result.errors).toHaveLength(0);
3636
done();

zipkin-api.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,15 @@ paths:
165165
- name: traceId
166166
in: path
167167
required: true
168-
description: the 64 or 128-bit big endian, hex-encoded id of the trace as a path parameter.
169168
type: string
169+
maxLength: 32
170+
minLength: 16
171+
pattern: "[a-f0-9]{16,32}"
172+
description: |
173+
Trace identifier, set on all spans within it.
174+
175+
Encoded as 16 or 32 lowercase hex characters corresponding to 64 or 128 bits.
176+
For example, a 128bit trace ID looks like 4e441824ec2b6a44ffdc9bb9a6453df3
170177
- name: raw
171178
in: query
172179
required: false

zipkin2-api.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ paths:
159159
type: string
160160
maxLength: 32
161161
minLength: 16
162-
pattern: "[a-z0-9]{16,32}"
162+
pattern: "[a-f0-9]{16,32}"
163163
description: |
164164
Trace identifier, set on all spans within it.
165165
@@ -358,7 +358,7 @@ definitions:
358358
type: string
359359
maxLength: 32
360360
minLength: 16
361-
pattern: "[a-z0-9]{16,32}"
361+
pattern: "[a-f0-9]{16,32}"
362362
description: |
363363
Randomly generated, unique identifier for a trace, set on all spans within it.
364364
@@ -374,13 +374,13 @@ definitions:
374374
For example, do not embed variables into the name.
375375
parentId:
376376
type: string
377-
pattern: "[a-z0-9]{16}"
377+
pattern: "[a-f0-9]{16}"
378378
maxLength: 16
379379
minLength: 16
380380
description: 'The parent span ID or absent if this the root span in a trace.'
381381
id:
382382
type: string
383-
pattern: "[a-z0-9]{16}"
383+
pattern: "[a-f0-9]{16}"
384384
maxLength: 16
385385
minLength: 16
386386
description: |

0 commit comments

Comments
 (0)