diff --git a/cmd/agent/app/agent.go b/cmd/agent/app/agent.go
index f7ba833726a..c4525552355 100644
--- a/cmd/agent/app/agent.go
+++ b/cmd/agent/app/agent.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/agent_test.go b/cmd/agent/app/agent_test.go
index ec93f8568d6..42a20a5247c 100644
--- a/cmd/agent/app/agent_test.go
+++ b/cmd/agent/app/agent_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/builder.go b/cmd/agent/app/builder.go
index 70ae709bfbe..a79400d7d94 100644
--- a/cmd/agent/app/builder.go
+++ b/cmd/agent/app/builder.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/builder_test.go b/cmd/agent/app/builder_test.go
index 70065eb41df..23991aff250 100644
--- a/cmd/agent/app/builder_test.go
+++ b/cmd/agent/app/builder_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/configmanager/manager.go b/cmd/agent/app/configmanager/manager.go
index 9e830bf74c4..f0ed9885220 100644
--- a/cmd/agent/app/configmanager/manager.go
+++ b/cmd/agent/app/configmanager/manager.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/configmanager/tchannel/manager.go b/cmd/agent/app/configmanager/tchannel/manager.go
index 585aae682f2..8be176fb750 100644
--- a/cmd/agent/app/configmanager/tchannel/manager.go
+++ b/cmd/agent/app/configmanager/tchannel/manager.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/configmanager/tchannel/manager_test.go b/cmd/agent/app/configmanager/tchannel/manager_test.go
index 83f3abc0b43..554f33776ea 100644
--- a/cmd/agent/app/configmanager/tchannel/manager_test.go
+++ b/cmd/agent/app/configmanager/tchannel/manager_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/customtransports/buffered_read_transport.go b/cmd/agent/app/customtransports/buffered_read_transport.go
index 26561adf89b..7cc184942a2 100644
--- a/cmd/agent/app/customtransports/buffered_read_transport.go
+++ b/cmd/agent/app/customtransports/buffered_read_transport.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/customtransports/buffered_read_transport_test.go b/cmd/agent/app/customtransports/buffered_read_transport_test.go
index 47d86bf7eab..a03245be98c 100644
--- a/cmd/agent/app/customtransports/buffered_read_transport_test.go
+++ b/cmd/agent/app/customtransports/buffered_read_transport_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/flags.go b/cmd/agent/app/flags.go
index 1a0b642ab95..0ae62a8633d 100644
--- a/cmd/agent/app/flags.go
+++ b/cmd/agent/app/flags.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/flags_test.go b/cmd/agent/app/flags_test.go
index 7ea6738ef5f..e9a1c38ece5 100644
--- a/cmd/agent/app/flags_test.go
+++ b/cmd/agent/app/flags_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/httpserver/server.go b/cmd/agent/app/httpserver/server.go
index abeae157081..c9732ab9b1d 100644
--- a/cmd/agent/app/httpserver/server.go
+++ b/cmd/agent/app/httpserver/server.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/httpserver/server_test.go b/cmd/agent/app/httpserver/server_test.go
index bce47f829ec..cb3293742a0 100644
--- a/cmd/agent/app/httpserver/server_test.go
+++ b/cmd/agent/app/httpserver/server_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/httpserver/thrift-0.9.2/constants.go b/cmd/agent/app/httpserver/thrift-0.9.2/constants.go
index 44ddd4fd490..155d7b30d8c 100644
--- a/cmd/agent/app/httpserver/thrift-0.9.2/constants.go
+++ b/cmd/agent/app/httpserver/thrift-0.9.2/constants.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/httpserver/thrift-0.9.2/ttypes.go b/cmd/agent/app/httpserver/thrift-0.9.2/ttypes.go
index 447b60920e4..e415878aac3 100644
--- a/cmd/agent/app/httpserver/thrift-0.9.2/ttypes.go
+++ b/cmd/agent/app/httpserver/thrift-0.9.2/ttypes.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/processors/processor.go b/cmd/agent/app/processors/processor.go
index 3537b87a3d0..2ade7a29b52 100644
--- a/cmd/agent/app/processors/processor.go
+++ b/cmd/agent/app/processors/processor.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/processors/thrift_processor.go b/cmd/agent/app/processors/thrift_processor.go
index 9ec21c1bc12..068b74ffe43 100644
--- a/cmd/agent/app/processors/thrift_processor.go
+++ b/cmd/agent/app/processors/thrift_processor.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/processors/thrift_processor_test.go b/cmd/agent/app/processors/thrift_processor_test.go
index ddbf02d7f8e..6e7264f29f5 100644
--- a/cmd/agent/app/processors/thrift_processor_test.go
+++ b/cmd/agent/app/processors/thrift_processor_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/reporter/grpc/reporter.go b/cmd/agent/app/reporter/grpc/reporter.go
index 558f1664ca2..7c3432ed1a1 100644
--- a/cmd/agent/app/reporter/grpc/reporter.go
+++ b/cmd/agent/app/reporter/grpc/reporter.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/reporter/reporter.go b/cmd/agent/app/reporter/reporter.go
index 6ea9c3ba375..c6e56707816 100644
--- a/cmd/agent/app/reporter/reporter.go
+++ b/cmd/agent/app/reporter/reporter.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/reporter/reporter_test.go b/cmd/agent/app/reporter/reporter_test.go
index d0e7441e544..6529a07a6fe 100644
--- a/cmd/agent/app/reporter/reporter_test.go
+++ b/cmd/agent/app/reporter/reporter_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/reporter/tchannel/builder.go b/cmd/agent/app/reporter/tchannel/builder.go
index 6cd22078349..a5830a3ba18 100644
--- a/cmd/agent/app/reporter/tchannel/builder.go
+++ b/cmd/agent/app/reporter/tchannel/builder.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/reporter/tchannel/builder_test.go b/cmd/agent/app/reporter/tchannel/builder_test.go
index d35eccc8a89..4acdfd9c81a 100644
--- a/cmd/agent/app/reporter/tchannel/builder_test.go
+++ b/cmd/agent/app/reporter/tchannel/builder_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/reporter/tchannel/reporter.go b/cmd/agent/app/reporter/tchannel/reporter.go
index 849bfb246f7..f5c37c683c0 100644
--- a/cmd/agent/app/reporter/tchannel/reporter.go
+++ b/cmd/agent/app/reporter/tchannel/reporter.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/reporter/tchannel/reporter_test.go b/cmd/agent/app/reporter/tchannel/reporter_test.go
index 7e86bd36920..1f304470d79 100644
--- a/cmd/agent/app/reporter/tchannel/reporter_test.go
+++ b/cmd/agent/app/reporter/tchannel/reporter_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/servers/server.go b/cmd/agent/app/servers/server.go
index ee5bd22e0af..42d6f85fcf2 100644
--- a/cmd/agent/app/servers/server.go
+++ b/cmd/agent/app/servers/server.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/servers/server_test.go b/cmd/agent/app/servers/server_test.go
index 38825f4eeb8..2b6c83fe7db 100644
--- a/cmd/agent/app/servers/server_test.go
+++ b/cmd/agent/app/servers/server_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/servers/tbuffered_server.go b/cmd/agent/app/servers/tbuffered_server.go
index 476b7f9a159..652ccc350e6 100644
--- a/cmd/agent/app/servers/tbuffered_server.go
+++ b/cmd/agent/app/servers/tbuffered_server.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/servers/tbuffered_server_test.go b/cmd/agent/app/servers/tbuffered_server_test.go
index d7365c73573..dc8a1dfc643 100644
--- a/cmd/agent/app/servers/tbuffered_server_test.go
+++ b/cmd/agent/app/servers/tbuffered_server_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/servers/thriftudp/transport.go b/cmd/agent/app/servers/thriftudp/transport.go
index 1ccf97abe3f..c92fef01cbf 100644
--- a/cmd/agent/app/servers/thriftudp/transport.go
+++ b/cmd/agent/app/servers/thriftudp/transport.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/servers/thriftudp/transport_test.go b/cmd/agent/app/servers/thriftudp/transport_test.go
index c7262eb9e93..3fdaee68cbc 100644
--- a/cmd/agent/app/servers/thriftudp/transport_test.go
+++ b/cmd/agent/app/servers/thriftudp/transport_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/testutils/fixture.go b/cmd/agent/app/testutils/fixture.go
index f1bc30c023a..1ee10b73e03 100644
--- a/cmd/agent/app/testutils/fixture.go
+++ b/cmd/agent/app/testutils/fixture.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/testutils/in_memory_reporter.go b/cmd/agent/app/testutils/in_memory_reporter.go
index e75919a988f..f4ed343e8b1 100644
--- a/cmd/agent/app/testutils/in_memory_reporter.go
+++ b/cmd/agent/app/testutils/in_memory_reporter.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/testutils/in_memory_reporter_test.go b/cmd/agent/app/testutils/in_memory_reporter_test.go
index 51635e9cdb8..cf2d737fdac 100644
--- a/cmd/agent/app/testutils/in_memory_reporter_test.go
+++ b/cmd/agent/app/testutils/in_memory_reporter_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/testutils/mock_baggage_restriction_manager.go b/cmd/agent/app/testutils/mock_baggage_restriction_manager.go
index 651c255e9ff..984292dc4fd 100644
--- a/cmd/agent/app/testutils/mock_baggage_restriction_manager.go
+++ b/cmd/agent/app/testutils/mock_baggage_restriction_manager.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/testutils/mock_collector.go b/cmd/agent/app/testutils/mock_collector.go
index d20b2540f0f..bd4b9aee5ec 100644
--- a/cmd/agent/app/testutils/mock_collector.go
+++ b/cmd/agent/app/testutils/mock_collector.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/testutils/mock_collector_test.go b/cmd/agent/app/testutils/mock_collector_test.go
index f9b4d0f93be..3ef5c946389 100644
--- a/cmd/agent/app/testutils/mock_collector_test.go
+++ b/cmd/agent/app/testutils/mock_collector_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/testutils/mock_sampling_manager.go b/cmd/agent/app/testutils/mock_sampling_manager.go
index 6a89350bce9..cee9bc0a5e1 100644
--- a/cmd/agent/app/testutils/mock_sampling_manager.go
+++ b/cmd/agent/app/testutils/mock_sampling_manager.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/testutils/thriftudp_client.go b/cmd/agent/app/testutils/thriftudp_client.go
index d7cb9729290..bb5f415d45b 100644
--- a/cmd/agent/app/testutils/thriftudp_client.go
+++ b/cmd/agent/app/testutils/thriftudp_client.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/app/testutils/thriftudp_client_test.go b/cmd/agent/app/testutils/thriftudp_client_test.go
index e9c29f6e231..27d431f3b2c 100644
--- a/cmd/agent/app/testutils/thriftudp_client_test.go
+++ b/cmd/agent/app/testutils/thriftudp_client_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/agent/main.go b/cmd/agent/main.go
index faea5ff5ce2..ad6d4a9dc1c 100644
--- a/cmd/agent/main.go
+++ b/cmd/agent/main.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/all-in-one/all_in_one_test.go b/cmd/all-in-one/all_in_one_test.go
index 4dcf4956a11..b479529c69c 100644
--- a/cmd/all-in-one/all_in_one_test.go
+++ b/cmd/all-in-one/all_in_one_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/all-in-one/main.go b/cmd/all-in-one/main.go
index a06f8195a23..40b34846f48 100644
--- a/cmd/all-in-one/main.go
+++ b/cmd/all-in-one/main.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/builder/builder_options.go b/cmd/builder/builder_options.go
index b11638c40b9..01aec180cfa 100644
--- a/cmd/builder/builder_options.go
+++ b/cmd/builder/builder_options.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/builder/builder_options_test.go b/cmd/builder/builder_options_test.go
index 15500fd0837..b9276ec0def 100644
--- a/cmd/builder/builder_options_test.go
+++ b/cmd/builder/builder_options_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/builder/doc.go b/cmd/builder/doc.go
index 495b7ef9cf9..af62a4bef8c 100644
--- a/cmd/builder/doc.go
+++ b/cmd/builder/doc.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/builder/builder_flags.go b/cmd/collector/app/builder/builder_flags.go
index b3e0740acbd..9787c3b04ca 100644
--- a/cmd/collector/app/builder/builder_flags.go
+++ b/cmd/collector/app/builder/builder_flags.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/builder/span_handler_builder.go b/cmd/collector/app/builder/span_handler_builder.go
index d57b6f34b85..88779939da6 100644
--- a/cmd/collector/app/builder/span_handler_builder.go
+++ b/cmd/collector/app/builder/span_handler_builder.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/builder/span_handler_builder_test.go b/cmd/collector/app/builder/span_handler_builder_test.go
index c1cdaeef51a..813d56c6178 100644
--- a/cmd/collector/app/builder/span_handler_builder_test.go
+++ b/cmd/collector/app/builder/span_handler_builder_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/http_handler.go b/cmd/collector/app/http_handler.go
index 9c10dc3308a..de30edaa621 100644
--- a/cmd/collector/app/http_handler.go
+++ b/cmd/collector/app/http_handler.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/http_handler_test.go b/cmd/collector/app/http_handler_test.go
index 58c0cba3e6d..c5d5e8c833a 100644
--- a/cmd/collector/app/http_handler_test.go
+++ b/cmd/collector/app/http_handler_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/metrics.go b/cmd/collector/app/metrics.go
index 0a5eb0902ac..cd80c279d67 100644
--- a/cmd/collector/app/metrics.go
+++ b/cmd/collector/app/metrics.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/metrics_test.go b/cmd/collector/app/metrics_test.go
index d45918df288..198bf4fb4d0 100644
--- a/cmd/collector/app/metrics_test.go
+++ b/cmd/collector/app/metrics_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/model_consumer.go b/cmd/collector/app/model_consumer.go
index be0d0f92aff..ed66567c666 100644
--- a/cmd/collector/app/model_consumer.go
+++ b/cmd/collector/app/model_consumer.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/model_consumer_test.go b/cmd/collector/app/model_consumer_test.go
index b1d21e7fbdb..b3f05a25bfe 100644
--- a/cmd/collector/app/model_consumer_test.go
+++ b/cmd/collector/app/model_consumer_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/options.go b/cmd/collector/app/options.go
index 625b3c14bd2..6d94a6c52bc 100644
--- a/cmd/collector/app/options.go
+++ b/cmd/collector/app/options.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/options_test.go b/cmd/collector/app/options_test.go
index b4c372c0ca2..e00b3fded88 100644
--- a/cmd/collector/app/options_test.go
+++ b/cmd/collector/app/options_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/sampling/model/sampling.go b/cmd/collector/app/sampling/model/sampling.go
index f191775b71d..32193039adc 100644
--- a/cmd/collector/app/sampling/model/sampling.go
+++ b/cmd/collector/app/sampling/model/sampling.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/sanitizer/cache/cache.go b/cmd/collector/app/sanitizer/cache/cache.go
index d15c6578f59..020855d91c2 100644
--- a/cmd/collector/app/sanitizer/cache/cache.go
+++ b/cmd/collector/app/sanitizer/cache/cache.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/sanitizer/cache/mocks/ServiceAliasMappingExternalSource.go b/cmd/collector/app/sanitizer/cache/mocks/ServiceAliasMappingExternalSource.go
index 3cad69128ef..a62a84c8b74 100644
--- a/cmd/collector/app/sanitizer/cache/mocks/ServiceAliasMappingExternalSource.go
+++ b/cmd/collector/app/sanitizer/cache/mocks/ServiceAliasMappingExternalSource.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/sanitizer/cache/mocks/ServiceAliasMappingStorage.go b/cmd/collector/app/sanitizer/cache/mocks/ServiceAliasMappingStorage.go
index ef0a54f6a37..8a0bc425dc1 100644
--- a/cmd/collector/app/sanitizer/cache/mocks/ServiceAliasMappingStorage.go
+++ b/cmd/collector/app/sanitizer/cache/mocks/ServiceAliasMappingStorage.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/sanitizer/cache/service_alias.go b/cmd/collector/app/sanitizer/cache/service_alias.go
index 8e0b81c1110..f4e0f1da69a 100644
--- a/cmd/collector/app/sanitizer/cache/service_alias.go
+++ b/cmd/collector/app/sanitizer/cache/service_alias.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/sanitizer/sanitizer.go b/cmd/collector/app/sanitizer/sanitizer.go
index ad04f7a2be4..4d89af8bdd0 100644
--- a/cmd/collector/app/sanitizer/sanitizer.go
+++ b/cmd/collector/app/sanitizer/sanitizer.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/sanitizer/service_name_sanitizer.go b/cmd/collector/app/sanitizer/service_name_sanitizer.go
index 64fc679e7ae..b21e1932f51 100644
--- a/cmd/collector/app/sanitizer/service_name_sanitizer.go
+++ b/cmd/collector/app/sanitizer/service_name_sanitizer.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/sanitizer/service_name_sanitizer_test.go b/cmd/collector/app/sanitizer/service_name_sanitizer_test.go
index f357dd5272c..7f352e57b1a 100644
--- a/cmd/collector/app/sanitizer/service_name_sanitizer_test.go
+++ b/cmd/collector/app/sanitizer/service_name_sanitizer_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/sanitizer/utf8_sanitizer.go b/cmd/collector/app/sanitizer/utf8_sanitizer.go
index bd6b80d9399..013336d4325 100644
--- a/cmd/collector/app/sanitizer/utf8_sanitizer.go
+++ b/cmd/collector/app/sanitizer/utf8_sanitizer.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/sanitizer/utf8_sanitizer_test.go b/cmd/collector/app/sanitizer/utf8_sanitizer_test.go
index f1a70ba16a1..af45ea8de2d 100644
--- a/cmd/collector/app/sanitizer/utf8_sanitizer_test.go
+++ b/cmd/collector/app/sanitizer/utf8_sanitizer_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/sanitizer/zipkin/span_sanitizer.go b/cmd/collector/app/sanitizer/zipkin/span_sanitizer.go
index 7c9d4f6685c..61e36a67f1a 100644
--- a/cmd/collector/app/sanitizer/zipkin/span_sanitizer.go
+++ b/cmd/collector/app/sanitizer/zipkin/span_sanitizer.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go b/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go
index a62c5b3879c..04e63997ec5 100644
--- a/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go
+++ b/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/service_name_normalizer.go b/cmd/collector/app/service_name_normalizer.go
index f2dc6746910..e56c65db86c 100644
--- a/cmd/collector/app/service_name_normalizer.go
+++ b/cmd/collector/app/service_name_normalizer.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/service_name_normalizer_test.go b/cmd/collector/app/service_name_normalizer_test.go
index f97726e7747..f369b49074f 100644
--- a/cmd/collector/app/service_name_normalizer_test.go
+++ b/cmd/collector/app/service_name_normalizer_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/span_processor.go b/cmd/collector/app/span_processor.go
index be3f127e3d0..709d984e79a 100644
--- a/cmd/collector/app/span_processor.go
+++ b/cmd/collector/app/span_processor.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/span_processor_test.go b/cmd/collector/app/span_processor_test.go
index 40b15d667aa..ac4f7434e35 100644
--- a/cmd/collector/app/span_processor_test.go
+++ b/cmd/collector/app/span_processor_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/thrift_span_handler.go b/cmd/collector/app/thrift_span_handler.go
index d7d9173aa29..efd8957a82f 100644
--- a/cmd/collector/app/thrift_span_handler.go
+++ b/cmd/collector/app/thrift_span_handler.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/thrift_span_handler_test.go b/cmd/collector/app/thrift_span_handler_test.go
index 99bdebde60f..d520cd7bd95 100644
--- a/cmd/collector/app/thrift_span_handler_test.go
+++ b/cmd/collector/app/thrift_span_handler_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/zipkin/annotation.go b/cmd/collector/app/zipkin/annotation.go
index 76374107a4e..c4be6e087e0 100644
--- a/cmd/collector/app/zipkin/annotation.go
+++ b/cmd/collector/app/zipkin/annotation.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/zipkin/annotation_test.go b/cmd/collector/app/zipkin/annotation_test.go
index fbea09cc4e5..5f3d388dc5e 100644
--- a/cmd/collector/app/zipkin/annotation_test.go
+++ b/cmd/collector/app/zipkin/annotation_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/zipkin/http_handler.go b/cmd/collector/app/zipkin/http_handler.go
index c22821dbaf7..4883350cdc7 100644
--- a/cmd/collector/app/zipkin/http_handler.go
+++ b/cmd/collector/app/zipkin/http_handler.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/zipkin/http_handler_test.go b/cmd/collector/app/zipkin/http_handler_test.go
index 0fed2aed67f..3a29d56a13e 100644
--- a/cmd/collector/app/zipkin/http_handler_test.go
+++ b/cmd/collector/app/zipkin/http_handler_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/zipkin/json.go b/cmd/collector/app/zipkin/json.go
index 1044fcc3d32..0c3842d5058 100644
--- a/cmd/collector/app/zipkin/json.go
+++ b/cmd/collector/app/zipkin/json.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/app/zipkin/json_test.go b/cmd/collector/app/zipkin/json_test.go
index 535b541296c..bdbd6c658ca 100644
--- a/cmd/collector/app/zipkin/json_test.go
+++ b/cmd/collector/app/zipkin/json_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/collector/main.go b/cmd/collector/main.go
index a6101139288..0e7c818e7c8 100644
--- a/cmd/collector/main.go
+++ b/cmd/collector/main.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/flags/doc.go b/cmd/flags/doc.go
index a3d017a8179..a65f3a8a0cd 100644
--- a/cmd/flags/doc.go
+++ b/cmd/flags/doc.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/flags/flags.go b/cmd/flags/flags.go
index 0e9722bac93..78522f23579 100644
--- a/cmd/flags/flags.go
+++ b/cmd/flags/flags.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/query/app/flags.go b/cmd/query/app/flags.go
index 9a1bb5497a0..d6cee8cfa80 100644
--- a/cmd/query/app/flags.go
+++ b/cmd/query/app/flags.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/query/app/flags_test.go b/cmd/query/app/flags_test.go
index dcdb843c23f..b12b08fef39 100644
--- a/cmd/query/app/flags_test.go
+++ b/cmd/query/app/flags_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/query/app/grpc_handler_test.go b/cmd/query/app/grpc_handler_test.go
index 143cb0da592..0ffc1944b53 100644
--- a/cmd/query/app/grpc_handler_test.go
+++ b/cmd/query/app/grpc_handler_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2019 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/query/app/handler_archive_test.go b/cmd/query/app/handler_archive_test.go
index d6e59c92fd5..c64e9ba9d3f 100644
--- a/cmd/query/app/handler_archive_test.go
+++ b/cmd/query/app/handler_archive_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/query/app/handler_deps_test.go b/cmd/query/app/handler_deps_test.go
index 01d926f837c..48ca9ccac6a 100644
--- a/cmd/query/app/handler_deps_test.go
+++ b/cmd/query/app/handler_deps_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/query/app/handler_options.go b/cmd/query/app/handler_options.go
index aa458c5f5f0..6f164156910 100644
--- a/cmd/query/app/handler_options.go
+++ b/cmd/query/app/handler_options.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/query/app/http_handler.go b/cmd/query/app/http_handler.go
index 6d464a2251c..8110bbbbb0f 100644
--- a/cmd/query/app/http_handler.go
+++ b/cmd/query/app/http_handler.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/query/app/http_handler_test.go b/cmd/query/app/http_handler_test.go
index 1da1d04e546..444106636ec 100644
--- a/cmd/query/app/http_handler_test.go
+++ b/cmd/query/app/http_handler_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/query/app/query_parser.go b/cmd/query/app/query_parser.go
index 4e2c7ddc1a2..dbb47cd4c9e 100644
--- a/cmd/query/app/query_parser.go
+++ b/cmd/query/app/query_parser.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/query/app/query_parser_test.go b/cmd/query/app/query_parser_test.go
index a95e84e422e..a75c835be9d 100644
--- a/cmd/query/app/query_parser_test.go
+++ b/cmd/query/app/query_parser_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/query/app/querysvc/adjusters.go b/cmd/query/app/querysvc/adjusters.go
index fbcb1904a64..29fa1a3721d 100644
--- a/cmd/query/app/querysvc/adjusters.go
+++ b/cmd/query/app/querysvc/adjusters.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/query/app/static_handler.go b/cmd/query/app/static_handler.go
index 91f6176b44b..6ba79356260 100644
--- a/cmd/query/app/static_handler.go
+++ b/cmd/query/app/static_handler.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/query/app/static_handler_test.go b/cmd/query/app/static_handler_test.go
index 7117c602582..f602950d2e8 100644
--- a/cmd/query/app/static_handler_test.go
+++ b/cmd/query/app/static_handler_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmd/query/main.go b/cmd/query/main.go
index d9a78794b0b..e2e2aff7361 100644
--- a/cmd/query/main.go
+++ b/cmd/query/main.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/crossdock/main.go b/crossdock/main.go
index 03201d8fa14..fe65bcd65f8 100644
--- a/crossdock/main.go
+++ b/crossdock/main.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/crossdock/services/agent.go b/crossdock/services/agent.go
index d326a1fa809..8dde8e64bd7 100644
--- a/crossdock/services/agent.go
+++ b/crossdock/services/agent.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/crossdock/services/agent_test.go b/crossdock/services/agent_test.go
index 4d789ebabb4..06924fe49cc 100644
--- a/crossdock/services/agent_test.go
+++ b/crossdock/services/agent_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/crossdock/services/common.go b/crossdock/services/common.go
index 842fa78691e..dbea9e463a0 100644
--- a/crossdock/services/common.go
+++ b/crossdock/services/common.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/crossdock/services/common_test.go b/crossdock/services/common_test.go
index c058f237d7c..ebebf77cf57 100644
--- a/crossdock/services/common_test.go
+++ b/crossdock/services/common_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/crossdock/services/mocks/AgentService.go b/crossdock/services/mocks/AgentService.go
index ee1cc207d5d..538446fb6e8 100644
--- a/crossdock/services/mocks/AgentService.go
+++ b/crossdock/services/mocks/AgentService.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/crossdock/services/mocks/QueryService.go b/crossdock/services/mocks/QueryService.go
index 774f46c20d7..009948bef4c 100644
--- a/crossdock/services/mocks/QueryService.go
+++ b/crossdock/services/mocks/QueryService.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/crossdock/services/mocks/T.go b/crossdock/services/mocks/T.go
index 430570d0086..d466a1a9cb0 100644
--- a/crossdock/services/mocks/T.go
+++ b/crossdock/services/mocks/T.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/crossdock/services/query.go b/crossdock/services/query.go
index ca588cbf413..4df4dc36e93 100644
--- a/crossdock/services/query.go
+++ b/crossdock/services/query.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/crossdock/services/query_test.go b/crossdock/services/query_test.go
index 3cacd9f77cc..62fd3df7059 100644
--- a/crossdock/services/query_test.go
+++ b/crossdock/services/query_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/crossdock/services/tracehandler.go b/crossdock/services/tracehandler.go
index c560365f54c..01f4cbb3e66 100644
--- a/crossdock/services/tracehandler.go
+++ b/crossdock/services/tracehandler.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/crossdock/services/tracehandler_test.go b/crossdock/services/tracehandler_test.go
index 7a98bb75454..8559e7ea0ea 100644
--- a/crossdock/services/tracehandler_test.go
+++ b/crossdock/services/tracehandler_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/doc.go b/doc.go
index c63abbea56f..bf99e71e5e5 100644
--- a/doc.go
+++ b/doc.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/cmd/all.go b/examples/hotrod/cmd/all.go
index ca4f32e82bf..a64b407a44e 100644
--- a/examples/hotrod/cmd/all.go
+++ b/examples/hotrod/cmd/all.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/cmd/customer.go b/examples/hotrod/cmd/customer.go
index 5a6363521ad..ebdc5a71a42 100644
--- a/examples/hotrod/cmd/customer.go
+++ b/examples/hotrod/cmd/customer.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/cmd/driver.go b/examples/hotrod/cmd/driver.go
index 6b808cff20a..5e0aa2b5231 100644
--- a/examples/hotrod/cmd/driver.go
+++ b/examples/hotrod/cmd/driver.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/cmd/frontend.go b/examples/hotrod/cmd/frontend.go
index 7cf4f355b56..bdbbf406648 100644
--- a/examples/hotrod/cmd/frontend.go
+++ b/examples/hotrod/cmd/frontend.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/cmd/root.go b/examples/hotrod/cmd/root.go
index 01a18421a88..a16ee098d77 100644
--- a/examples/hotrod/cmd/root.go
+++ b/examples/hotrod/cmd/root.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/cmd/route.go b/examples/hotrod/cmd/route.go
index 3fdcc189135..b962de6e609 100644
--- a/examples/hotrod/cmd/route.go
+++ b/examples/hotrod/cmd/route.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/main.go b/examples/hotrod/main.go
index 70776ceb7db..f4fca45bd90 100644
--- a/examples/hotrod/main.go
+++ b/examples/hotrod/main.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 
 package main
diff --git a/examples/hotrod/pkg/delay/delay.go b/examples/hotrod/pkg/delay/delay.go
index d644eed5893..d797a687ec2 100644
--- a/examples/hotrod/pkg/delay/delay.go
+++ b/examples/hotrod/pkg/delay/delay.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/pkg/httperr/httperr.go b/examples/hotrod/pkg/httperr/httperr.go
index 2f92cd93636..d7ef283fcd7 100644
--- a/examples/hotrod/pkg/httperr/httperr.go
+++ b/examples/hotrod/pkg/httperr/httperr.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/pkg/log/factory.go b/examples/hotrod/pkg/log/factory.go
index fe8fed82166..e64e1ae48b1 100644
--- a/examples/hotrod/pkg/log/factory.go
+++ b/examples/hotrod/pkg/log/factory.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/pkg/log/logger.go b/examples/hotrod/pkg/log/logger.go
index a2e1b59455f..933bdb3d2dd 100644
--- a/examples/hotrod/pkg/log/logger.go
+++ b/examples/hotrod/pkg/log/logger.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/pkg/log/spanlogger.go b/examples/hotrod/pkg/log/spanlogger.go
index 2d0580aced3..c22234c078e 100644
--- a/examples/hotrod/pkg/log/spanlogger.go
+++ b/examples/hotrod/pkg/log/spanlogger.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/pkg/pool/pool.go b/examples/hotrod/pkg/pool/pool.go
index 6ead5a1aba9..4b709d0d857 100644
--- a/examples/hotrod/pkg/pool/pool.go
+++ b/examples/hotrod/pkg/pool/pool.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/pkg/tracing/http.go b/examples/hotrod/pkg/tracing/http.go
index 6707602bfd7..69615b6f62d 100644
--- a/examples/hotrod/pkg/tracing/http.go
+++ b/examples/hotrod/pkg/tracing/http.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/pkg/tracing/init.go b/examples/hotrod/pkg/tracing/init.go
index 796c341b8d9..e22f35373b4 100644
--- a/examples/hotrod/pkg/tracing/init.go
+++ b/examples/hotrod/pkg/tracing/init.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/pkg/tracing/mutex.go b/examples/hotrod/pkg/tracing/mutex.go
index 033deefeadc..027e250fae1 100644
--- a/examples/hotrod/pkg/tracing/mutex.go
+++ b/examples/hotrod/pkg/tracing/mutex.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/pkg/tracing/mux.go b/examples/hotrod/pkg/tracing/mux.go
index ac309f0d778..260010a6b25 100644
--- a/examples/hotrod/pkg/tracing/mux.go
+++ b/examples/hotrod/pkg/tracing/mux.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/services/config/config.go b/examples/hotrod/services/config/config.go
index 33b9838f996..3ab50393f12 100644
--- a/examples/hotrod/services/config/config.go
+++ b/examples/hotrod/services/config/config.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/services/customer/client.go b/examples/hotrod/services/customer/client.go
index ccb8f6dbb2b..8bf76fdd479 100644
--- a/examples/hotrod/services/customer/client.go
+++ b/examples/hotrod/services/customer/client.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/services/customer/database.go b/examples/hotrod/services/customer/database.go
index 2948dd440b0..896713174a1 100644
--- a/examples/hotrod/services/customer/database.go
+++ b/examples/hotrod/services/customer/database.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/services/customer/interface.go b/examples/hotrod/services/customer/interface.go
index f8bc49a8de3..4a0bc3f86e0 100644
--- a/examples/hotrod/services/customer/interface.go
+++ b/examples/hotrod/services/customer/interface.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/services/customer/server.go b/examples/hotrod/services/customer/server.go
index 1b25ad2c58c..264bfc74bf9 100644
--- a/examples/hotrod/services/customer/server.go
+++ b/examples/hotrod/services/customer/server.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/services/driver/client.go b/examples/hotrod/services/driver/client.go
index 511a5c3868b..09658b9bc03 100644
--- a/examples/hotrod/services/driver/client.go
+++ b/examples/hotrod/services/driver/client.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/services/driver/interface.go b/examples/hotrod/services/driver/interface.go
index e6487c4c851..9553ec8771f 100644
--- a/examples/hotrod/services/driver/interface.go
+++ b/examples/hotrod/services/driver/interface.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/services/driver/redis.go b/examples/hotrod/services/driver/redis.go
index 02066cebeec..cefef66bbb6 100644
--- a/examples/hotrod/services/driver/redis.go
+++ b/examples/hotrod/services/driver/redis.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/services/driver/server.go b/examples/hotrod/services/driver/server.go
index 274ceb7db07..15c8c215e1c 100644
--- a/examples/hotrod/services/driver/server.go
+++ b/examples/hotrod/services/driver/server.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/services/frontend/best_eta.go b/examples/hotrod/services/frontend/best_eta.go
index 477feff5226..5e33da7d571 100644
--- a/examples/hotrod/services/frontend/best_eta.go
+++ b/examples/hotrod/services/frontend/best_eta.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/services/frontend/server.go b/examples/hotrod/services/frontend/server.go
index 04873ede48b..79e72eadd25 100644
--- a/examples/hotrod/services/frontend/server.go
+++ b/examples/hotrod/services/frontend/server.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/services/route/client.go b/examples/hotrod/services/route/client.go
index c9368239172..91068a8baf3 100644
--- a/examples/hotrod/services/route/client.go
+++ b/examples/hotrod/services/route/client.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/services/route/interface.go b/examples/hotrod/services/route/interface.go
index 46ef091c9a4..5bbfa6341b0 100644
--- a/examples/hotrod/services/route/interface.go
+++ b/examples/hotrod/services/route/interface.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/services/route/server.go b/examples/hotrod/services/route/server.go
index a3c9fb51496..389f2470dc0 100644
--- a/examples/hotrod/services/route/server.go
+++ b/examples/hotrod/services/route/server.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/hotrod/services/route/stats.go b/examples/hotrod/services/route/stats.go
index 22a2037dd64..345af84df5e 100644
--- a/examples/hotrod/services/route/stats.go
+++ b/examples/hotrod/services/route/stats.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/adjuster/adjuster.go b/model/adjuster/adjuster.go
index 0a339be5dab..2ac9e619caf 100644
--- a/model/adjuster/adjuster.go
+++ b/model/adjuster/adjuster.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/adjuster/adjuster_test.go b/model/adjuster/adjuster_test.go
index fb290513d7b..569729a0a93 100644
--- a/model/adjuster/adjuster_test.go
+++ b/model/adjuster/adjuster_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/adjuster/bad_span_references.go b/model/adjuster/bad_span_references.go
index ad38e2ea2ec..799324e6e14 100644
--- a/model/adjuster/bad_span_references.go
+++ b/model/adjuster/bad_span_references.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/adjuster/bad_span_references_test.go b/model/adjuster/bad_span_references_test.go
index a78fb36362d..ca258c396bc 100644
--- a/model/adjuster/bad_span_references_test.go
+++ b/model/adjuster/bad_span_references_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/adjuster/clockskew.go b/model/adjuster/clockskew.go
index 42b7b7280ea..26dca7cfb4e 100644
--- a/model/adjuster/clockskew.go
+++ b/model/adjuster/clockskew.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/adjuster/clockskew_test.go b/model/adjuster/clockskew_test.go
index 5249547987c..b673552e7f4 100644
--- a/model/adjuster/clockskew_test.go
+++ b/model/adjuster/clockskew_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/adjuster/doc.go b/model/adjuster/doc.go
index 3fc18a3e9e1..3581d050463 100644
--- a/model/adjuster/doc.go
+++ b/model/adjuster/doc.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/adjuster/ip_tag.go b/model/adjuster/ip_tag.go
index 43b1c40df12..c11592ef4b7 100644
--- a/model/adjuster/ip_tag.go
+++ b/model/adjuster/ip_tag.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/adjuster/ip_tag_test.go b/model/adjuster/ip_tag_test.go
index 808ad3f680f..25ff0c4f67e 100644
--- a/model/adjuster/ip_tag_test.go
+++ b/model/adjuster/ip_tag_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/adjuster/sort_log_fields.go b/model/adjuster/sort_log_fields.go
index 235bdc46a1a..0038c3d4bd1 100644
--- a/model/adjuster/sort_log_fields.go
+++ b/model/adjuster/sort_log_fields.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/adjuster/sort_log_fields_test.go b/model/adjuster/sort_log_fields_test.go
index 52204695bbb..9251012b5fc 100644
--- a/model/adjuster/sort_log_fields_test.go
+++ b/model/adjuster/sort_log_fields_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/adjuster/span_id_deduper.go b/model/adjuster/span_id_deduper.go
index c6ade62b8db..6d1ece6af2b 100644
--- a/model/adjuster/span_id_deduper.go
+++ b/model/adjuster/span_id_deduper.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/adjuster/span_id_deduper_test.go b/model/adjuster/span_id_deduper_test.go
index 2de2943ba25..964dbfce883 100644
--- a/model/adjuster/span_id_deduper_test.go
+++ b/model/adjuster/span_id_deduper_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/doc.go b/model/converter/doc.go
index 80c92f63d3a..ebaea94338a 100644
--- a/model/converter/doc.go
+++ b/model/converter/doc.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/json/doc.go b/model/converter/json/doc.go
index b043662c0ac..547372cb96a 100644
--- a/model/converter/json/doc.go
+++ b/model/converter/json/doc.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/json/from_domain.go b/model/converter/json/from_domain.go
index b7a15f688b3..2786b63a6bc 100644
--- a/model/converter/json/from_domain.go
+++ b/model/converter/json/from_domain.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/json/from_domain_test.go b/model/converter/json/from_domain_test.go
index 6e2b85ffd98..5308efb7a81 100644
--- a/model/converter/json/from_domain_test.go
+++ b/model/converter/json/from_domain_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/json/json_span_compare_test.go b/model/converter/json/json_span_compare_test.go
index 4f83afc1504..53a943880cb 100644
--- a/model/converter/json/json_span_compare_test.go
+++ b/model/converter/json/json_span_compare_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/json/process_hashtable.go b/model/converter/json/process_hashtable.go
index 6eac447c91c..5a95af66f9e 100644
--- a/model/converter/json/process_hashtable.go
+++ b/model/converter/json/process_hashtable.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/json/process_hashtable_test.go b/model/converter/json/process_hashtable_test.go
index 32744a49415..d4a99e15859 100644
--- a/model/converter/json/process_hashtable_test.go
+++ b/model/converter/json/process_hashtable_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/thrift/doc.go b/model/converter/thrift/doc.go
index 97fb5a07201..8de9d1cb269 100644
--- a/model/converter/thrift/doc.go
+++ b/model/converter/thrift/doc.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/thrift/jaeger/doc.go b/model/converter/thrift/jaeger/doc.go
index 3f2c116cecc..26050003d63 100644
--- a/model/converter/thrift/jaeger/doc.go
+++ b/model/converter/thrift/jaeger/doc.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/thrift/jaeger/from_domain.go b/model/converter/thrift/jaeger/from_domain.go
index 87b5184e159..ecf8ae645e1 100644
--- a/model/converter/thrift/jaeger/from_domain.go
+++ b/model/converter/thrift/jaeger/from_domain.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/thrift/jaeger/from_domain_test.go b/model/converter/thrift/jaeger/from_domain_test.go
index 77661e34a51..d918014ca37 100644
--- a/model/converter/thrift/jaeger/from_domain_test.go
+++ b/model/converter/thrift/jaeger/from_domain_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/thrift/jaeger/to_domain.go b/model/converter/thrift/jaeger/to_domain.go
index 48891c64e53..d3857094cfd 100644
--- a/model/converter/thrift/jaeger/to_domain.go
+++ b/model/converter/thrift/jaeger/to_domain.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/thrift/jaeger/to_domain_test.go b/model/converter/thrift/jaeger/to_domain_test.go
index b22323876e2..1f4316bc2e0 100644
--- a/model/converter/thrift/jaeger/to_domain_test.go
+++ b/model/converter/thrift/jaeger/to_domain_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/thrift/zipkin/deserialize.go b/model/converter/thrift/zipkin/deserialize.go
index 093dfa960eb..9236c9c34af 100644
--- a/model/converter/thrift/zipkin/deserialize.go
+++ b/model/converter/thrift/zipkin/deserialize.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/thrift/zipkin/deserialize_test.go b/model/converter/thrift/zipkin/deserialize_test.go
index 075bb29d04c..51944fb4eb8 100644
--- a/model/converter/thrift/zipkin/deserialize_test.go
+++ b/model/converter/thrift/zipkin/deserialize_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/thrift/zipkin/doc.go b/model/converter/thrift/zipkin/doc.go
index 331229fe95a..7b7b461270a 100644
--- a/model/converter/thrift/zipkin/doc.go
+++ b/model/converter/thrift/zipkin/doc.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/thrift/zipkin/process_hashtable.go b/model/converter/thrift/zipkin/process_hashtable.go
index 7e1208f6117..cd75fca2b0c 100644
--- a/model/converter/thrift/zipkin/process_hashtable.go
+++ b/model/converter/thrift/zipkin/process_hashtable.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/thrift/zipkin/process_hashtable_test.go b/model/converter/thrift/zipkin/process_hashtable_test.go
index 10206da1f10..3c0dfb61fad 100644
--- a/model/converter/thrift/zipkin/process_hashtable_test.go
+++ b/model/converter/thrift/zipkin/process_hashtable_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/thrift/zipkin/to_domain.go b/model/converter/thrift/zipkin/to_domain.go
index 3da4996070b..3d1606088c5 100644
--- a/model/converter/thrift/zipkin/to_domain.go
+++ b/model/converter/thrift/zipkin/to_domain.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/converter/thrift/zipkin/to_domain_test.go b/model/converter/thrift/zipkin/to_domain_test.go
index 4ed711a1492..0a1d6667f3c 100644
--- a/model/converter/thrift/zipkin/to_domain_test.go
+++ b/model/converter/thrift/zipkin/to_domain_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/dependencies.go b/model/dependencies.go
index 00e18a9ad2b..d1a86ba0d7c 100644
--- a/model/dependencies.go
+++ b/model/dependencies.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/doc.go b/model/doc.go
index f8b6f01aa00..b44aea615a6 100644
--- a/model/doc.go
+++ b/model/doc.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/hash.go b/model/hash.go
index 9be7e8c4ccd..a37ea65a364 100644
--- a/model/hash.go
+++ b/model/hash.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/hash_test.go b/model/hash_test.go
index f72d200a097..d62e033f893 100644
--- a/model/hash_test.go
+++ b/model/hash_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/ids.go b/model/ids.go
index cc8a944be29..a814d039789 100644
--- a/model/ids.go
+++ b/model/ids.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/ids_test.go b/model/ids_test.go
index 804abd62d4f..ffdd4125709 100644
--- a/model/ids_test.go
+++ b/model/ids_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/json/doc.go b/model/json/doc.go
index d0d64edcd72..ba31238980d 100644
--- a/model/json/doc.go
+++ b/model/json/doc.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/json/model.go b/model/json/model.go
index bc4c871319f..c266c1ba71e 100644
--- a/model/json/model.go
+++ b/model/json/model.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/keyvalue.go b/model/keyvalue.go
index 6feab79a059..09fae483553 100644
--- a/model/keyvalue.go
+++ b/model/keyvalue.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/keyvalue_test.go b/model/keyvalue_test.go
index a82f6552c2b..9b218838606 100644
--- a/model/keyvalue_test.go
+++ b/model/keyvalue_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/keyvalues_test.go b/model/keyvalues_test.go
index 2c2c18d1564..438145ba2c8 100644
--- a/model/keyvalues_test.go
+++ b/model/keyvalues_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/process.go b/model/process.go
index 9e1da634414..1babaeb1823 100644
--- a/model/process.go
+++ b/model/process.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/process_test.go b/model/process_test.go
index 45f78dd83f8..d80f842312c 100644
--- a/model/process_test.go
+++ b/model/process_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/sort.go b/model/sort.go
index e9afbd6d61a..b2556d8cc4c 100644
--- a/model/sort.go
+++ b/model/sort.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/sort_test.go b/model/sort_test.go
index 28f7f943b18..af8768885ea 100644
--- a/model/sort_test.go
+++ b/model/sort_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/span.go b/model/span.go
index 62456f461d9..ea1e461e0ee 100644
--- a/model/span.go
+++ b/model/span.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/span_test.go b/model/span_test.go
index ac9fc3978b6..71acb4cfb5b 100644
--- a/model/span_test.go
+++ b/model/span_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/spanref.go b/model/spanref.go
index 25c1a01b50b..92acc21e9a3 100644
--- a/model/spanref.go
+++ b/model/spanref.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/spanref_test.go b/model/spanref_test.go
index 73f21c9ae45..240a788edfb 100644
--- a/model/spanref_test.go
+++ b/model/spanref_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/time.go b/model/time.go
index b3c841b698f..34a66a7efc4 100644
--- a/model/time.go
+++ b/model/time.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/time_test.go b/model/time_test.go
index 3d05d626602..8f0e28a2824 100644
--- a/model/time_test.go
+++ b/model/time_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/trace.go b/model/trace.go
index 81a81141bdb..fcc31b07ae3 100644
--- a/model/trace.go
+++ b/model/trace.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/model/trace_test.go b/model/trace_test.go
index d1d9ed87239..2152a22fbe0 100644
--- a/model/trace_test.go
+++ b/model/trace_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go
index 3dcf5d98987..5bd79b54b5e 100644
--- a/pkg/cache/cache.go
+++ b/pkg/cache/cache.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/cache/lru.go b/pkg/cache/lru.go
index b9f4d203edc..2881ec822b6 100644
--- a/pkg/cache/lru.go
+++ b/pkg/cache/lru.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/cache/lru_test.go b/pkg/cache/lru_test.go
index c9ec7233d94..4156e99b1b7 100644
--- a/pkg/cache/lru_test.go
+++ b/pkg/cache/lru_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/cassandra/config/config.go b/pkg/cassandra/config/config.go
index 0ce19401a27..8aba2e11680 100644
--- a/pkg/cassandra/config/config.go
+++ b/pkg/cassandra/config/config.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/cassandra/gocql/gocql.go b/pkg/cassandra/gocql/gocql.go
index 19f1ce23992..4d96eaebd2d 100644
--- a/pkg/cassandra/gocql/gocql.go
+++ b/pkg/cassandra/gocql/gocql.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/cassandra/gocql/testutils/udt.go b/pkg/cassandra/gocql/testutils/udt.go
index 04e39eb3c0e..f28da7cd5b2 100644
--- a/pkg/cassandra/gocql/testutils/udt.go
+++ b/pkg/cassandra/gocql/testutils/udt.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/cassandra/metrics/table.go b/pkg/cassandra/metrics/table.go
index c1d7c242429..9aaaf6b811b 100644
--- a/pkg/cassandra/metrics/table.go
+++ b/pkg/cassandra/metrics/table.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/cassandra/metrics/table_test.go b/pkg/cassandra/metrics/table_test.go
index 47101af70e9..70a82fb3fc0 100644
--- a/pkg/cassandra/metrics/table_test.go
+++ b/pkg/cassandra/metrics/table_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/cassandra/mocks/Iterator.go b/pkg/cassandra/mocks/Iterator.go
index 3d965122c6f..2335f7a5fd4 100644
--- a/pkg/cassandra/mocks/Iterator.go
+++ b/pkg/cassandra/mocks/Iterator.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/cassandra/mocks/Query.go b/pkg/cassandra/mocks/Query.go
index 0967dcbacfc..89221d1acd8 100644
--- a/pkg/cassandra/mocks/Query.go
+++ b/pkg/cassandra/mocks/Query.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/cassandra/mocks/Session.go b/pkg/cassandra/mocks/Session.go
index 04b6495ed96..c7e62d625e7 100644
--- a/pkg/cassandra/mocks/Session.go
+++ b/pkg/cassandra/mocks/Session.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/cassandra/session.go b/pkg/cassandra/session.go
index f598bd5a3d7..b468584330d 100644
--- a/pkg/cassandra/session.go
+++ b/pkg/cassandra/session.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 84a4ca05b0c..96290b6763d 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
index d0871981469..df53017e9b9 100644
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/discovery/discoverer.go b/pkg/discovery/discoverer.go
index f32be78e0c9..ae1780d8b33 100644
--- a/pkg/discovery/discoverer.go
+++ b/pkg/discovery/discoverer.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/discovery/discoverer_test.go b/pkg/discovery/discoverer_test.go
index e200a119a09..f146a21e214 100644
--- a/pkg/discovery/discoverer_test.go
+++ b/pkg/discovery/discoverer_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/discovery/notifier.go b/pkg/discovery/notifier.go
index d54a477a74b..fba50b71db7 100644
--- a/pkg/discovery/notifier.go
+++ b/pkg/discovery/notifier.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/discovery/notifier_test.go b/pkg/discovery/notifier_test.go
index fa02027b434..4aa5d878db5 100644
--- a/pkg/discovery/notifier_test.go
+++ b/pkg/discovery/notifier_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/discovery/peerlistmgr/options.go b/pkg/discovery/peerlistmgr/options.go
index b4c5c64ca25..861dfc7c457 100644
--- a/pkg/discovery/peerlistmgr/options.go
+++ b/pkg/discovery/peerlistmgr/options.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/discovery/peerlistmgr/options_test.go b/pkg/discovery/peerlistmgr/options_test.go
index db39b72dd5f..589ee8cc2c1 100644
--- a/pkg/discovery/peerlistmgr/options_test.go
+++ b/pkg/discovery/peerlistmgr/options_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/discovery/peerlistmgr/peer_list_mgr.go b/pkg/discovery/peerlistmgr/peer_list_mgr.go
index 466f8c9406e..7ce67ed39b2 100644
--- a/pkg/discovery/peerlistmgr/peer_list_mgr.go
+++ b/pkg/discovery/peerlistmgr/peer_list_mgr.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/discovery/peerlistmgr/peer_list_mgr_test.go b/pkg/discovery/peerlistmgr/peer_list_mgr_test.go
index c66a39f48f1..c3c0a0a3ee0 100644
--- a/pkg/discovery/peerlistmgr/peer_list_mgr_test.go
+++ b/pkg/discovery/peerlistmgr/peer_list_mgr_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/distributedlock/interface.go b/pkg/distributedlock/interface.go
index fa3e4e773da..1abf600f4c7 100644
--- a/pkg/distributedlock/interface.go
+++ b/pkg/distributedlock/interface.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/distributedlock/mocks/Lock.go b/pkg/distributedlock/mocks/Lock.go
index b633cedd7bc..eca8b097408 100644
--- a/pkg/distributedlock/mocks/Lock.go
+++ b/pkg/distributedlock/mocks/Lock.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/doc.go b/pkg/doc.go
index c4f32faedf6..321762c13af 100644
--- a/pkg/doc.go
+++ b/pkg/doc.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/es/client.go b/pkg/es/client.go
index e3a29bf2515..1a2eff51023 100644
--- a/pkg/es/client.go
+++ b/pkg/es/client.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/es/config/config.go b/pkg/es/config/config.go
index 6387a118586..eb445323075 100644
--- a/pkg/es/config/config.go
+++ b/pkg/es/config/config.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/es/wrapper/wrapper.go b/pkg/es/wrapper/wrapper.go
index bd4c409f5a5..bf05de6a798 100644
--- a/pkg/es/wrapper/wrapper.go
+++ b/pkg/es/wrapper/wrapper.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/healthcheck/handler.go b/pkg/healthcheck/handler.go
index 87b68f3c2d1..67ff079f167 100644
--- a/pkg/healthcheck/handler.go
+++ b/pkg/healthcheck/handler.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/healthcheck/handler_test.go b/pkg/healthcheck/handler_test.go
index d500e7fc922..e1c13ebbda0 100644
--- a/pkg/healthcheck/handler_test.go
+++ b/pkg/healthcheck/handler_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/healthcheck/internal_test.go b/pkg/healthcheck/internal_test.go
index f813e40c569..cfd65f9f548 100644
--- a/pkg/healthcheck/internal_test.go
+++ b/pkg/healthcheck/internal_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/metrics/builder.go b/pkg/metrics/builder.go
index 82904b01d4b..ce5dc08a953 100644
--- a/pkg/metrics/builder.go
+++ b/pkg/metrics/builder.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/metrics/builder_test.go b/pkg/metrics/builder_test.go
index fa7ee5bc699..4e507ca6691 100644
--- a/pkg/metrics/builder_test.go
+++ b/pkg/metrics/builder_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/metrics/package.go b/pkg/metrics/package.go
index 6787b5796ac..7bcb53d1219 100644
--- a/pkg/metrics/package.go
+++ b/pkg/metrics/package.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/multierror/multierror.go b/pkg/multierror/multierror.go
index 04d0d6464d7..bb1994490a1 100644
--- a/pkg/multierror/multierror.go
+++ b/pkg/multierror/multierror.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/multierror/multierror_test.go b/pkg/multierror/multierror_test.go
index 4ed6cd1b3ce..edd320515b8 100644
--- a/pkg/multierror/multierror_test.go
+++ b/pkg/multierror/multierror_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/queue/bounded_queue.go b/pkg/queue/bounded_queue.go
index 3730bbd85a8..ffe79010720 100644
--- a/pkg/queue/bounded_queue.go
+++ b/pkg/queue/bounded_queue.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/queue/bounded_queue_test.go b/pkg/queue/bounded_queue_test.go
index 1ba9bce8ef7..f54211a137b 100644
--- a/pkg/queue/bounded_queue_test.go
+++ b/pkg/queue/bounded_queue_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/recoveryhandler/zap.go b/pkg/recoveryhandler/zap.go
index d1cd3f3458e..678c179dade 100644
--- a/pkg/recoveryhandler/zap.go
+++ b/pkg/recoveryhandler/zap.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017-2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/recoveryhandler/zap_test.go b/pkg/recoveryhandler/zap_test.go
index 0957865f355..aae400de78e 100644
--- a/pkg/recoveryhandler/zap_test.go
+++ b/pkg/recoveryhandler/zap_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/testutils/logger.go b/pkg/testutils/logger.go
index 8ffc85527b9..86cb75f3498 100644
--- a/pkg/testutils/logger.go
+++ b/pkg/testutils/logger.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/testutils/logger_test.go b/pkg/testutils/logger_test.go
index df416842e22..24964d2e2aa 100644
--- a/pkg/testutils/logger_test.go
+++ b/pkg/testutils/logger_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/configurable.go b/plugin/configurable.go
index cf0b1dcc4e0..324926a24ff 100644
--- a/plugin/configurable.go
+++ b/plugin/configurable.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/doc.go b/plugin/doc.go
index 5271612d0f8..097b4f0d15e 100644
--- a/plugin/doc.go
+++ b/plugin/doc.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/pkg/distributedlock/cassandra/lock.go b/plugin/pkg/distributedlock/cassandra/lock.go
index d14c93751c1..7f0ccb7858d 100644
--- a/plugin/pkg/distributedlock/cassandra/lock.go
+++ b/plugin/pkg/distributedlock/cassandra/lock.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/pkg/distributedlock/cassandra/lock_test.go b/plugin/pkg/distributedlock/cassandra/lock_test.go
index ac3f78034fa..f466d9f7c06 100644
--- a/plugin/pkg/distributedlock/cassandra/lock_test.go
+++ b/plugin/pkg/distributedlock/cassandra/lock_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/sampling/strategystore/factory_config_test.go b/plugin/sampling/strategystore/factory_config_test.go
index 16f64aff0be..409573d5626 100644
--- a/plugin/sampling/strategystore/factory_config_test.go
+++ b/plugin/sampling/strategystore/factory_config_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/sampling/strategystore/factory_test.go b/plugin/sampling/strategystore/factory_test.go
index 889dca860e1..9425ba337ce 100644
--- a/plugin/sampling/strategystore/factory_test.go
+++ b/plugin/sampling/strategystore/factory_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/dependencystore/bootstrap.go b/plugin/storage/cassandra/dependencystore/bootstrap.go
index 01f019e60a4..7a1747de57d 100644
--- a/plugin/storage/cassandra/dependencystore/bootstrap.go
+++ b/plugin/storage/cassandra/dependencystore/bootstrap.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2019 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/dependencystore/bootstrap_test.go b/plugin/storage/cassandra/dependencystore/bootstrap_test.go
index 8017e95bdc1..34ed27dffb8 100644
--- a/plugin/storage/cassandra/dependencystore/bootstrap_test.go
+++ b/plugin/storage/cassandra/dependencystore/bootstrap_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2019 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/dependencystore/model.go b/plugin/storage/cassandra/dependencystore/model.go
index a92e6824e8f..e6bbba8cad7 100644
--- a/plugin/storage/cassandra/dependencystore/model.go
+++ b/plugin/storage/cassandra/dependencystore/model.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/dependencystore/model_test.go b/plugin/storage/cassandra/dependencystore/model_test.go
index 70a8d6af48a..330a4012ec5 100644
--- a/plugin/storage/cassandra/dependencystore/model_test.go
+++ b/plugin/storage/cassandra/dependencystore/model_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/dependencystore/storage.go b/plugin/storage/cassandra/dependencystore/storage.go
index fce4e17ba73..521704ab263 100644
--- a/plugin/storage/cassandra/dependencystore/storage.go
+++ b/plugin/storage/cassandra/dependencystore/storage.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/dependencystore/storage_test.go b/plugin/storage/cassandra/dependencystore/storage_test.go
index df185a50d2b..c16770be251 100644
--- a/plugin/storage/cassandra/dependencystore/storage_test.go
+++ b/plugin/storage/cassandra/dependencystore/storage_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/factory.go b/plugin/storage/cassandra/factory.go
index 468888fcf8b..09d3a10bf73 100644
--- a/plugin/storage/cassandra/factory.go
+++ b/plugin/storage/cassandra/factory.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/factory_test.go b/plugin/storage/cassandra/factory_test.go
index c737128226a..d301cc31d3a 100644
--- a/plugin/storage/cassandra/factory_test.go
+++ b/plugin/storage/cassandra/factory_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/options.go b/plugin/storage/cassandra/options.go
index 44f3ca66691..fcf5383c568 100644
--- a/plugin/storage/cassandra/options.go
+++ b/plugin/storage/cassandra/options.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/options_test.go b/plugin/storage/cassandra/options_test.go
index 57680f850ce..aca6b020146 100644
--- a/plugin/storage/cassandra/options_test.go
+++ b/plugin/storage/cassandra/options_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/samplingstore/storage.go b/plugin/storage/cassandra/samplingstore/storage.go
index 659d7746a41..a796c2d739e 100644
--- a/plugin/storage/cassandra/samplingstore/storage.go
+++ b/plugin/storage/cassandra/samplingstore/storage.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/samplingstore/storage_test.go b/plugin/storage/cassandra/samplingstore/storage_test.go
index e5ddabe0582..af963d4babc 100644
--- a/plugin/storage/cassandra/samplingstore/storage_test.go
+++ b/plugin/storage/cassandra/samplingstore/storage_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/savetracetest/main.go b/plugin/storage/cassandra/savetracetest/main.go
index 73c1ffe8d59..0c8256903b7 100644
--- a/plugin/storage/cassandra/savetracetest/main.go
+++ b/plugin/storage/cassandra/savetracetest/main.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/converter.go b/plugin/storage/cassandra/spanstore/dbmodel/converter.go
index ae8f1d3fe45..5d98d737f83 100644
--- a/plugin/storage/cassandra/spanstore/dbmodel/converter.go
+++ b/plugin/storage/cassandra/spanstore/dbmodel/converter.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/converter_test.go b/plugin/storage/cassandra/spanstore/dbmodel/converter_test.go
index 8572dd00e53..31145f10f87 100644
--- a/plugin/storage/cassandra/spanstore/dbmodel/converter_test.go
+++ b/plugin/storage/cassandra/spanstore/dbmodel/converter_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/cql_udt.go b/plugin/storage/cassandra/spanstore/dbmodel/cql_udt.go
index 0363d3904b1..0a8a6369005 100644
--- a/plugin/storage/cassandra/spanstore/dbmodel/cql_udt.go
+++ b/plugin/storage/cassandra/spanstore/dbmodel/cql_udt.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/cql_udt_test.go b/plugin/storage/cassandra/spanstore/dbmodel/cql_udt_test.go
index b8d9b24881f..465b08086d8 100644
--- a/plugin/storage/cassandra/spanstore/dbmodel/cql_udt_test.go
+++ b/plugin/storage/cassandra/spanstore/dbmodel/cql_udt_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/log_fields_filter.go b/plugin/storage/cassandra/spanstore/dbmodel/log_fields_filter.go
index fec9f957345..c2bd9407468 100644
--- a/plugin/storage/cassandra/spanstore/dbmodel/log_fields_filter.go
+++ b/plugin/storage/cassandra/spanstore/dbmodel/log_fields_filter.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/log_fields_filter_test.go b/plugin/storage/cassandra/spanstore/dbmodel/log_fields_filter_test.go
index 9665285d484..bf1a7b0fe8d 100644
--- a/plugin/storage/cassandra/spanstore/dbmodel/log_fields_filter_test.go
+++ b/plugin/storage/cassandra/spanstore/dbmodel/log_fields_filter_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/model.go b/plugin/storage/cassandra/spanstore/dbmodel/model.go
index ffc76b315f1..5264fb0e394 100644
--- a/plugin/storage/cassandra/spanstore/dbmodel/model.go
+++ b/plugin/storage/cassandra/spanstore/dbmodel/model.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/model_test.go b/plugin/storage/cassandra/spanstore/dbmodel/model_test.go
index e9bd824f946..93fb80a1ebd 100644
--- a/plugin/storage/cassandra/spanstore/dbmodel/model_test.go
+++ b/plugin/storage/cassandra/spanstore/dbmodel/model_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/tag_filter.go b/plugin/storage/cassandra/spanstore/dbmodel/tag_filter.go
index abda48a98b2..710cc29afc8 100644
--- a/plugin/storage/cassandra/spanstore/dbmodel/tag_filter.go
+++ b/plugin/storage/cassandra/spanstore/dbmodel/tag_filter.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/tag_filter_test.go b/plugin/storage/cassandra/spanstore/dbmodel/tag_filter_test.go
index b07818ea683..d284dfe1c7a 100644
--- a/plugin/storage/cassandra/spanstore/dbmodel/tag_filter_test.go
+++ b/plugin/storage/cassandra/spanstore/dbmodel/tag_filter_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/unique_ids.go b/plugin/storage/cassandra/spanstore/dbmodel/unique_ids.go
index dbb067fa435..0e43d28b72a 100644
--- a/plugin/storage/cassandra/spanstore/dbmodel/unique_ids.go
+++ b/plugin/storage/cassandra/spanstore/dbmodel/unique_ids.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/unique_ids_test.go b/plugin/storage/cassandra/spanstore/dbmodel/unique_ids_test.go
index b5175b48484..ab0882824ce 100644
--- a/plugin/storage/cassandra/spanstore/dbmodel/unique_ids_test.go
+++ b/plugin/storage/cassandra/spanstore/dbmodel/unique_ids_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/unique_tags.go b/plugin/storage/cassandra/spanstore/dbmodel/unique_tags.go
index ccdc9a4de8b..191a64db948 100644
--- a/plugin/storage/cassandra/spanstore/dbmodel/unique_tags.go
+++ b/plugin/storage/cassandra/spanstore/dbmodel/unique_tags.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/unique_tags_test.go b/plugin/storage/cassandra/spanstore/dbmodel/unique_tags_test.go
index e8900a1e070..28269e70ca3 100644
--- a/plugin/storage/cassandra/spanstore/dbmodel/unique_tags_test.go
+++ b/plugin/storage/cassandra/spanstore/dbmodel/unique_tags_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/matchers_test.go b/plugin/storage/cassandra/spanstore/matchers_test.go
index e633c8e1de7..73250ffffc2 100644
--- a/plugin/storage/cassandra/spanstore/matchers_test.go
+++ b/plugin/storage/cassandra/spanstore/matchers_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/operation_names.go b/plugin/storage/cassandra/spanstore/operation_names.go
index 5cc4204bbb7..de73cf4347e 100644
--- a/plugin/storage/cassandra/spanstore/operation_names.go
+++ b/plugin/storage/cassandra/spanstore/operation_names.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/operation_names_test.go b/plugin/storage/cassandra/spanstore/operation_names_test.go
index 1c7daa29cd2..ca8357542f8 100644
--- a/plugin/storage/cassandra/spanstore/operation_names_test.go
+++ b/plugin/storage/cassandra/spanstore/operation_names_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/reader.go b/plugin/storage/cassandra/spanstore/reader.go
index 59e09b6cf38..f89026d480e 100644
--- a/plugin/storage/cassandra/spanstore/reader.go
+++ b/plugin/storage/cassandra/spanstore/reader.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/reader_test.go b/plugin/storage/cassandra/spanstore/reader_test.go
index e08bfc07e65..5f60eeff361 100644
--- a/plugin/storage/cassandra/spanstore/reader_test.go
+++ b/plugin/storage/cassandra/spanstore/reader_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/service_names.go b/plugin/storage/cassandra/spanstore/service_names.go
index 455fc2685e3..c4dc4a67d0e 100644
--- a/plugin/storage/cassandra/spanstore/service_names.go
+++ b/plugin/storage/cassandra/spanstore/service_names.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/service_names_test.go b/plugin/storage/cassandra/spanstore/service_names_test.go
index 8e8ce8b4d40..380340ead4a 100644
--- a/plugin/storage/cassandra/spanstore/service_names_test.go
+++ b/plugin/storage/cassandra/spanstore/service_names_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/writer.go b/plugin/storage/cassandra/spanstore/writer.go
index 94d9168731f..c73ee1a6940 100644
--- a/plugin/storage/cassandra/spanstore/writer.go
+++ b/plugin/storage/cassandra/spanstore/writer.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/writer_options.go b/plugin/storage/cassandra/spanstore/writer_options.go
index 068559e4c46..41a329aeb20 100644
--- a/plugin/storage/cassandra/spanstore/writer_options.go
+++ b/plugin/storage/cassandra/spanstore/writer_options.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/writer_options_test.go b/plugin/storage/cassandra/spanstore/writer_options_test.go
index 0c3585fff8b..efe73ee782e 100644
--- a/plugin/storage/cassandra/spanstore/writer_options_test.go
+++ b/plugin/storage/cassandra/spanstore/writer_options_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/cassandra/spanstore/writer_test.go b/plugin/storage/cassandra/spanstore/writer_test.go
index 652f2e182f9..dc080bcb376 100644
--- a/plugin/storage/cassandra/spanstore/writer_test.go
+++ b/plugin/storage/cassandra/spanstore/writer_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/dependencystore/schema.go b/plugin/storage/es/dependencystore/schema.go
index d429992e116..e901d1b240f 100644
--- a/plugin/storage/es/dependencystore/schema.go
+++ b/plugin/storage/es/dependencystore/schema.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/dependencystore/storage.go b/plugin/storage/es/dependencystore/storage.go
index 9821722444f..464de9393cb 100644
--- a/plugin/storage/es/dependencystore/storage.go
+++ b/plugin/storage/es/dependencystore/storage.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/dependencystore/storage_test.go b/plugin/storage/es/dependencystore/storage_test.go
index 44f5909a0cc..784edcca7e5 100644
--- a/plugin/storage/es/dependencystore/storage_test.go
+++ b/plugin/storage/es/dependencystore/storage_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/factory.go b/plugin/storage/es/factory.go
index 2321fffdc38..a4ca1f645cf 100644
--- a/plugin/storage/es/factory.go
+++ b/plugin/storage/es/factory.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/factory_test.go b/plugin/storage/es/factory_test.go
index 01ef6b9bff2..960652c2c2e 100644
--- a/plugin/storage/es/factory_test.go
+++ b/plugin/storage/es/factory_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/options.go b/plugin/storage/es/options.go
index 29552bec572..42308a39ee4 100644
--- a/plugin/storage/es/options.go
+++ b/plugin/storage/es/options.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/options_test.go b/plugin/storage/es/options_test.go
index e94cd529e6c..10ca2e2e01e 100644
--- a/plugin/storage/es/options_test.go
+++ b/plugin/storage/es/options_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/spanstore/dbmodel/from_domain.go b/plugin/storage/es/spanstore/dbmodel/from_domain.go
index 3e65b7482d6..e156b7550e8 100644
--- a/plugin/storage/es/spanstore/dbmodel/from_domain.go
+++ b/plugin/storage/es/spanstore/dbmodel/from_domain.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/spanstore/dbmodel/from_domain_test.go b/plugin/storage/es/spanstore/dbmodel/from_domain_test.go
index c7ad08f6012..e7cb8f2aa0c 100644
--- a/plugin/storage/es/spanstore/dbmodel/from_domain_test.go
+++ b/plugin/storage/es/spanstore/dbmodel/from_domain_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/spanstore/dbmodel/json_span_compare_test.go b/plugin/storage/es/spanstore/dbmodel/json_span_compare_test.go
index 779ff980aab..6d44120865e 100644
--- a/plugin/storage/es/spanstore/dbmodel/json_span_compare_test.go
+++ b/plugin/storage/es/spanstore/dbmodel/json_span_compare_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/spanstore/dbmodel/model.go b/plugin/storage/es/spanstore/dbmodel/model.go
index 2d4692ee692..e2b0e01970e 100644
--- a/plugin/storage/es/spanstore/dbmodel/model.go
+++ b/plugin/storage/es/spanstore/dbmodel/model.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/spanstore/dbmodel/to_domain.go b/plugin/storage/es/spanstore/dbmodel/to_domain.go
index 01d3d4d08eb..a9e19579d27 100644
--- a/plugin/storage/es/spanstore/dbmodel/to_domain.go
+++ b/plugin/storage/es/spanstore/dbmodel/to_domain.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/spanstore/dbmodel/to_domain_test.go b/plugin/storage/es/spanstore/dbmodel/to_domain_test.go
index e4b1010877d..70fcc752bec 100644
--- a/plugin/storage/es/spanstore/dbmodel/to_domain_test.go
+++ b/plugin/storage/es/spanstore/dbmodel/to_domain_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/spanstore/reader.go b/plugin/storage/es/spanstore/reader.go
index 0c631eb4fc1..0989f59fb06 100644
--- a/plugin/storage/es/spanstore/reader.go
+++ b/plugin/storage/es/spanstore/reader.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/spanstore/reader_test.go b/plugin/storage/es/spanstore/reader_test.go
index 6cbebca2998..65caff3c1a8 100644
--- a/plugin/storage/es/spanstore/reader_test.go
+++ b/plugin/storage/es/spanstore/reader_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/spanstore/service_operation.go b/plugin/storage/es/spanstore/service_operation.go
index de7baef047d..704a2f3d82a 100644
--- a/plugin/storage/es/spanstore/service_operation.go
+++ b/plugin/storage/es/spanstore/service_operation.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/spanstore/service_operation_test.go b/plugin/storage/es/spanstore/service_operation_test.go
index c4ce56cc2ab..9427834f356 100644
--- a/plugin/storage/es/spanstore/service_operation_test.go
+++ b/plugin/storage/es/spanstore/service_operation_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/spanstore/writer.go b/plugin/storage/es/spanstore/writer.go
index 499c8362e45..40cad8e3ce6 100644
--- a/plugin/storage/es/spanstore/writer.go
+++ b/plugin/storage/es/spanstore/writer.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/es/spanstore/writer_test.go b/plugin/storage/es/spanstore/writer_test.go
index 6cd2e18777d..19c37b59a97 100644
--- a/plugin/storage/es/spanstore/writer_test.go
+++ b/plugin/storage/es/spanstore/writer_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/factory.go b/plugin/storage/factory.go
index 394efc8e303..68d30f7a9f2 100644
--- a/plugin/storage/factory.go
+++ b/plugin/storage/factory.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/factory_config.go b/plugin/storage/factory_config.go
index 89a24b73169..72ad9558de7 100644
--- a/plugin/storage/factory_config.go
+++ b/plugin/storage/factory_config.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/factory_config_test.go b/plugin/storage/factory_config_test.go
index 39c5f3ac777..369de9e741b 100644
--- a/plugin/storage/factory_config_test.go
+++ b/plugin/storage/factory_config_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/factory_test.go b/plugin/storage/factory_test.go
index 3ca80c0b741..163cba94bd4 100644
--- a/plugin/storage/factory_test.go
+++ b/plugin/storage/factory_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/integration/cassandra_test.go b/plugin/storage/integration/cassandra_test.go
index aaeb8f10c80..6089d70a536 100644
--- a/plugin/storage/integration/cassandra_test.go
+++ b/plugin/storage/integration/cassandra_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2019 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/integration/domain_trace_compare_test.go b/plugin/storage/integration/domain_trace_compare_test.go
index 41cffc5c441..d295fccfaab 100644
--- a/plugin/storage/integration/domain_trace_compare_test.go
+++ b/plugin/storage/integration/domain_trace_compare_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/integration/elasticsearch_test.go b/plugin/storage/integration/elasticsearch_test.go
index d8285c8661b..c29ee698f6b 100644
--- a/plugin/storage/integration/elasticsearch_test.go
+++ b/plugin/storage/integration/elasticsearch_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/integration/grpc_test.go b/plugin/storage/integration/grpc_test.go
index 6edbea3da08..4c3200eee4a 100644
--- a/plugin/storage/integration/grpc_test.go
+++ b/plugin/storage/integration/grpc_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/integration/integration_test.go b/plugin/storage/integration/integration_test.go
index 47de8477dd6..147f01ef0f0 100644
--- a/plugin/storage/integration/integration_test.go
+++ b/plugin/storage/integration/integration_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/integration/memstore_test.go b/plugin/storage/integration/memstore_test.go
index 4d813dd382a..4c497748821 100644
--- a/plugin/storage/integration/memstore_test.go
+++ b/plugin/storage/integration/memstore_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2018 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/memory/factory.go b/plugin/storage/memory/factory.go
index 06afa32ba95..f423c9be225 100644
--- a/plugin/storage/memory/factory.go
+++ b/plugin/storage/memory/factory.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/memory/factory_test.go b/plugin/storage/memory/factory_test.go
index 9f48c3506b2..bb7868486d8 100644
--- a/plugin/storage/memory/factory_test.go
+++ b/plugin/storage/memory/factory_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/memory/memory.go b/plugin/storage/memory/memory.go
index e205294f15e..e5727642985 100644
--- a/plugin/storage/memory/memory.go
+++ b/plugin/storage/memory/memory.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugin/storage/memory/memory_test.go b/plugin/storage/memory/memory_test.go
index 58b0be8302d..ac3efc16454 100644
--- a/plugin/storage/memory/memory_test.go
+++ b/plugin/storage/memory/memory_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/scripts/updateLicense.py b/scripts/updateLicense.py
index 84cbae02e36..0f577862380 100644
--- a/scripts/updateLicense.py
+++ b/scripts/updateLicense.py
@@ -40,12 +40,15 @@ def update_go_license(name, force=False):
 
     found = False
     changed = False
+    jaeger = False
     for i, line in enumerate(lines[:5]):
         m = COPYRIGHT_RE.search(line)
         if not m:
             continue
 
         found = True
+        jaeger = 'Jaeger' in line
+
         year = int(m.group(1))
         if year == CURRENT_YEAR:
             break
@@ -58,12 +61,21 @@ def update_go_license(name, force=False):
         # changed = True
         break
 
-    if not found:
+    # print('found=%s, changed=%s, jaeger=%s' % (found, changed, jaeger))
+
+    def replace(header_lines):
         if 'Code generated by' in lines[0]:
-            lines[1:1] = ['\n'] + LICENSE_BLOB_LINES_GO + ['\n']
+            lines[1:1] = ['\n'] + header_lines
         else:
-            lines[0:0] = LICENSE_BLOB_LINES_GO + ['\n']
+            lines[0:0] = header_lines
+
+    if not found:
+        replace(LICENSE_BLOB_LINES_GO + ['\n'])
         changed = True
+    else:
+        if not jaeger:
+            replace(LICENSE_BLOB_LINES_GO[0])
+            changed = True
 
     if changed:
         with open(name, 'w') as f:
diff --git a/storage/dependencystore/interface.go b/storage/dependencystore/interface.go
index f8f9036033a..20054b97f6a 100644
--- a/storage/dependencystore/interface.go
+++ b/storage/dependencystore/interface.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/storage/dependencystore/mocks/Reader.go b/storage/dependencystore/mocks/Reader.go
index a7c27bd4c3e..a5711f8c359 100644
--- a/storage/dependencystore/mocks/Reader.go
+++ b/storage/dependencystore/mocks/Reader.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/storage/doc.go b/storage/doc.go
index 6f448a92df3..241fbcfc482 100644
--- a/storage/doc.go
+++ b/storage/doc.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/storage/factory.go b/storage/factory.go
index 25d0bda1dbf..c8c2bbd996c 100644
--- a/storage/factory.go
+++ b/storage/factory.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/storage/samplingstore/interface.go b/storage/samplingstore/interface.go
index cbfb8b1e92a..8d5498454aa 100644
--- a/storage/samplingstore/interface.go
+++ b/storage/samplingstore/interface.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/storage/samplingstore/mocks/Store.go b/storage/samplingstore/mocks/Store.go
index 3270df5f30a..2455300d37d 100644
--- a/storage/samplingstore/mocks/Store.go
+++ b/storage/samplingstore/mocks/Store.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/storage/spanstore/composite.go b/storage/spanstore/composite.go
index 4c4d7caefda..b1b6516de76 100644
--- a/storage/spanstore/composite.go
+++ b/storage/spanstore/composite.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/storage/spanstore/composite_test.go b/storage/spanstore/composite_test.go
index dada4c768e5..34fdd40bc44 100644
--- a/storage/spanstore/composite_test.go
+++ b/storage/spanstore/composite_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/storage/spanstore/interface.go b/storage/spanstore/interface.go
index df642efece2..63610817da9 100644
--- a/storage/spanstore/interface.go
+++ b/storage/spanstore/interface.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/storage/spanstore/metrics/decorator.go b/storage/spanstore/metrics/decorator.go
index 7db75e47501..fcf614d93f6 100644
--- a/storage/spanstore/metrics/decorator.go
+++ b/storage/spanstore/metrics/decorator.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/storage/spanstore/metrics/decorator_test.go b/storage/spanstore/metrics/decorator_test.go
index c3eede09d9d..4f0ea790a0c 100644
--- a/storage/spanstore/metrics/decorator_test.go
+++ b/storage/spanstore/metrics/decorator_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/storage/spanstore/metrics/write_metrics.go b/storage/spanstore/metrics/write_metrics.go
index f05ff25fcc2..abf9ffa97d5 100644
--- a/storage/spanstore/metrics/write_metrics.go
+++ b/storage/spanstore/metrics/write_metrics.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/storage/spanstore/metrics/write_metrics_test.go b/storage/spanstore/metrics/write_metrics_test.go
index c3f7497e7fb..752253b8fe1 100644
--- a/storage/spanstore/metrics/write_metrics_test.go
+++ b/storage/spanstore/metrics/write_metrics_test.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/storage/spanstore/mocks/Reader.go b/storage/spanstore/mocks/Reader.go
index 15eaf0559f8..0ce7ecc64c9 100644
--- a/storage/spanstore/mocks/Reader.go
+++ b/storage/spanstore/mocks/Reader.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/storage/spanstore/mocks/Writer.go b/storage/spanstore/mocks/Writer.go
index 4ce968960c6..2407e39fe43 100644
--- a/storage/spanstore/mocks/Writer.go
+++ b/storage/spanstore/mocks/Writer.go
@@ -1,3 +1,4 @@
+// Copyright (c) 2019 The Jaeger Authors.
 // Copyright (c) 2017 Uber Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");