Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ public final class GrpcInjectAdapter implements CarrierSetter<Metadata> {

@Override
public void set(final Metadata carrier, final String key, final String value) {
carrier.put(Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER), value);
Metadata.Key<String> metadataKey = Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
if (!key.startsWith("ot-baggage-") || !carrier.containsKey(metadataKey)) {
carrier.put(metadataKey, value);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import datadog.trace.agent.test.naming.VersionedNamingTestBase
import io.grpc.Metadata
import static datadog.trace.instrumentation.grpc.client.GrpcInjectAdapter.SETTER

class GrpcInjectAdapterTest extends VersionedNamingTestBase {
def "carrier set is called only once per unique ot-baggage-* key"() {
setup:
def carrier = new Metadata()

def baggage = [
["ot-baggage-foo", "v1"],
["ot-baggage-foo", "v2"],
["ot-baggage-bar", "v3"]
]

when:
baggage.each { pair ->
def (key, value) = pair
SETTER.set(carrier, key, value)
}

then:
carrier.headerCount() == 2
carrier.get(getKey("ot-baggage-foo")) == "v1" // first value wins
carrier.get(getKey("ot-baggage-bar")) == "v3"
}

def "carrier set is can set repeated keys that are not ot-baggage-*"() {
setup:
def carrier = new Metadata()

def baggage = [["foo", "v1"], ["foo", "v2"], ["bar", "v3"]]

when:
baggage.each { pair ->
def (key, value) = pair
SETTER.set(carrier, key, value)
}

then:
carrier.headerCount() == 3
carrier.get(getKey("foo")) == "v2" // last value wins
carrier.get(getKey("bar")) == "v3"
}

Metadata.Key<String> getKey(String key){
Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER)
}


@Override
int version() {
return 0
}

@Override
String service() {
return null
}

@Override
String operation() {
return null
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ public final class GrpcInjectAdapter implements CarrierSetter<Metadata> {

@Override
public void set(final Metadata carrier, final String key, final String value) {
carrier.put(Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER), value);
Metadata.Key<String> metadataKey = Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
if (!key.startsWith("ot-baggage-") || !carrier.containsKey(metadataKey)) {
carrier.put(metadataKey, value);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import datadog.trace.agent.test.naming.VersionedNamingTestBase
import io.grpc.Metadata
import static datadog.trace.instrumentation.grpc.client.GrpcInjectAdapter.SETTER

class GrpcInjectAdapterTest extends VersionedNamingTestBase {
def "carrier set is called only once per unique ot-baggage-* key"() {
setup:
def carrier = new Metadata()

def baggage = [
["ot-baggage-foo", "v1"],
["ot-baggage-foo", "v2"],
["ot-baggage-bar", "v3"]
]

when:
baggage.each { pair ->
def (key, value) = pair
SETTER.set(carrier, key, value)
}

then:
carrier.headerCount() == 2
carrier.get(getKey("ot-baggage-foo")) == "v1" // first value wins
carrier.get(getKey("ot-baggage-bar")) == "v3"
}

def "carrier set is can set repeated keys that are not ot-baggage-*"() {
setup:
def carrier = new Metadata()

def baggage = [["foo", "v1"], ["foo", "v2"], ["bar", "v3"]]

when:
baggage.each { pair ->
def (key, value) = pair
SETTER.set(carrier, key, value)
}

then:
carrier.headerCount() == 3
carrier.get(getKey("foo")) == "v2" // last value wins
carrier.get(getKey("bar")) == "v3"
}

Metadata.Key<String> getKey(String key){
Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER)
}


@Override
int version() {
return 0
}

@Override
String service() {
return null
}

@Override
String operation() {
return null
}
}