Merge 6167838 into d1d9973

yarpc · Oct 5, 2016 · aa4cc67 · aa4cc67
2 parents d1d9973 + 6167838
commit aa4cc67
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 517 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ Releases
 v0.4.0 (unreleased)
 -------------------
 
--   No changes yet.
+-   **Breaking**: Remove the ability to set Baggage Headers through yarpc, use opentracing baggage instead
 
 
 v0.3.1 (2016-09-31)

diff --git a/context.go b/context.go
diff --git a/context_test.go b/context_test.go
diff --git a/internal/baggage/context.go b/internal/baggage/context.go
diff --git a/internal/baggage/context_test.go b/internal/baggage/context_test.go
diff --git a/transport/http/constants.go b/transport/http/constants.go
@@ -25,9 +25,6 @@ const (
 	// the wire.
 	ApplicationHeaderPrefix = "Rpc-Header-"
 
-	// BaggageHeaderPrefix is the prefix added to context headers over the wire.
-	BaggageHeaderPrefix = "Context-"
-
 	// TODO(abg): Allow customizing header prefixes
 
 	// CallerHeader is the HTTP header used to indiate the service doing the calling
@@ -38,7 +35,7 @@ const (
 	EncodingHeader = "Rpc-Encoding"
 
 	// TTLMSHeader is the HTTP header used to indicate the ttl in ms
-	TTLMSHeader = BaggageHeaderPrefix + "TTL-MS"
+	TTLMSHeader = "Context-TTL-MS"
 
 	// ProcedureHeader is the HTTP header used to indicate the procedure
 	ProcedureHeader = "Rpc-Procedure"