Skip to content

Switches ID encoding to fixed-length (1.0.x backport) #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 16, 2016
Merged

Switches ID encoding to fixed-length (1.0.x backport) #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Span.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,12 +414,34 @@ public boolean isExportable() {
}

/**
* Represents given long id as hex string
* Represents given long id as 16-character lower-hex string
*/
public static String idToHex(long id) {
return Long.toHexString(id);
char[] data = new char[16];
writeHexLong(data, 0, id);
return new String(data);
}

/** Inspired by {@code okio.Buffer.writeLong} */
static void writeHexLong(char[] data, int pos, long v) {
writeHexByte(data, pos + 0, (byte) ((v >>> 56L) & 0xff));
writeHexByte(data, pos + 2, (byte) ((v >>> 48L) & 0xff));
writeHexByte(data, pos + 4, (byte) ((v >>> 40L) & 0xff));
writeHexByte(data, pos + 6, (byte) ((v >>> 32L) & 0xff));
writeHexByte(data, pos + 8, (byte) ((v >>> 24L) & 0xff));
writeHexByte(data, pos + 10, (byte) ((v >>> 16L) & 0xff));
writeHexByte(data, pos + 12, (byte) ((v >>> 8L) & 0xff));
writeHexByte(data, pos + 14, (byte) (v & 0xff));
}

static void writeHexByte(char[] data, int pos, byte b) {
data[pos + 0] = HEX_DIGITS[(b >> 4) & 0xf];
data[pos + 1] = HEX_DIGITS[b & 0xf];
}

static final char[] HEX_DIGITS =
{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};

/**
* Parses a 1 to 32 character lower-hex string with no prefix into an unsigned long, tossing any
* bits higher than 64.
Expand Down
4 changes: 2 additions & 2 deletions spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/SpanTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
public class SpanTests {

@Test
public void should_convert_long_to_hex_string() throws Exception {
public void should_convert_long_to_16_character_hex_string() throws Exception {
long someLong = 123123L;

String hexString = Span.idToHex(someLong);

then(hexString).isEqualTo("1e0f3");
then(hexString).isEqualTo("000000000001e0f3");
}

@Test
Expand Down
6 changes: 3 additions & 3 deletions ...springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ public void should_attach_trace_headers_to_the_sent_request() throws Exception {

HttpRequest httpRequest = builder.build();
then(httpRequest.getHttpHeaders().getFirstValue(Span.SPAN_ID_NAME))
.isEqualTo("1");
.isEqualTo("0000000000000001");
then(httpRequest.getHttpHeaders().getFirstValue(Span.TRACE_ID_NAME))
.isEqualTo("2");
.isEqualTo("0000000000000002");
then(httpRequest.getHttpHeaders().getFirstValue(Span.SPAN_NAME_NAME))
.isEqualTo("name");
then(httpRequest.getHttpHeaders().getFirstValue(Span.PARENT_ID_NAME))
.isEqualTo("3");
.isEqualTo("0000000000000003");
then(httpRequest.getHttpHeaders().getFirstValue(Span.PROCESS_ID_NAME))
.isEqualTo("processId");
}
Expand Down