From a46953c90b6ae9e8556d633a464de15ef6475304 Mon Sep 17 00:00:00 2001
From: Andriy Redko <drreta@gmail.com>
Date: Mon, 9 Dec 2024 17:27:30 -0500
Subject: [PATCH] Update to Brave 6 / Zipkin 3 (#64)

Signed-off-by: Andriy Redko <drreta@gmail.com>
---
 .github/CONTRIBUTING.md                       | 15 ++------
 .settings.xml                                 | 13 +------
 build-bin/git/login_git                       | 13 +------
 build-bin/git/version_from_trigger_tag        | 13 +------
 build-bin/gpg/configure_gpg                   | 13 +------
 build-bin/maven/maven_deploy                  | 13 +------
 build-bin/maven/maven_go_offline              | 13 +------
 build-bin/maven/maven_opts                    | 13 +------
 build-bin/maven/maven_release                 | 13 +------
 exporter-sender-kafka/pom.xml                 | 15 ++------
 .../sender/kafka/KafkaSenderExporter.java     | 21 +++--------
 .../sender/kafka/KafkaSenderExporterTest.java | 15 ++------
 exporter-sender-okhttp/pom.xml                | 15 ++------
 .../sender/okhttp/SenderOkHttpExporter.java   | 19 +++-------
 exporter/pom.xml                              | 15 ++------
 .../AsyncZipkinSpanHandlerExporter.java       | 19 +++-------
 .../brave/exporter/HttpTracingExporter.java   | 13 +------
 .../exporter/MessagingTracingExporter.java    | 13 +------
 .../brave/exporter/RpcTracingExporter.java    | 13 +------
 .../brave/exporter/TracingExporter.java       | 13 +------
 .../URLConnectionSenderExporter.java          | 20 +++-------
 features/pom.xml                              | 15 ++------
 features/src/main/resources/features.xml      | 13 +------
 itests/pom.xml                                | 17 ++-------
 .../java/io/zipkin/brave/itests/ITBrave.java  | 28 +++++---------
 itests/src/test/resources/exam.properties     | 13 +------
 itests/src/test/resources/logback.xml         | 13 +------
 pom.xml                                       | 37 +++++++++++--------
 src/etc/header.txt                            | 13 +------
 29 files changed, 107 insertions(+), 352 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index db00d03..e535842 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -17,17 +17,8 @@ If you are adding a new file it should have a header like below. This
 can be automatically added by running `./mvnw com.mycila:license-maven-plugin:format`.
 
 ```
-/**
- * Copyright 2019 The OpenZipkin Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+/*
+ * Copyright The OpenZipkin Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
  ```
diff --git a/.settings.xml b/.settings.xml
index 93f3548..ab04d7f 100644
--- a/.settings.xml
+++ b/.settings.xml
@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2020 The OpenZipkin Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-    in compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software distributed under the License
-    is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-    or implied. See the License for the specific language governing permissions and limitations under
-    the License.
+    Copyright The OpenZipkin Authors
+    SPDX-License-Identifier: Apache-2.0
 
 -->
 <settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/build-bin/git/login_git b/build-bin/git/login_git
index 825e849..423d770 100755
--- a/build-bin/git/login_git
+++ b/build-bin/git/login_git
@@ -1,16 +1,7 @@
 #!/bin/sh
 #
-# Copyright 2016-2020 The OpenZipkin Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Copyright The OpenZipkin Authors
+# SPDX-License-Identifier: Apache-2.0
 #
 
 set -ue
diff --git a/build-bin/git/version_from_trigger_tag b/build-bin/git/version_from_trigger_tag
index 0867185..799a3fc 100755
--- a/build-bin/git/version_from_trigger_tag
+++ b/build-bin/git/version_from_trigger_tag
@@ -1,16 +1,7 @@
 #!/bin/sh
 #
-# Copyright 2016-2020 The OpenZipkin Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Copyright The OpenZipkin Authors
+# SPDX-License-Identifier: Apache-2.0
 #
 
 set -ue
diff --git a/build-bin/gpg/configure_gpg b/build-bin/gpg/configure_gpg
index ba87048..d6ce539 100755
--- a/build-bin/gpg/configure_gpg
+++ b/build-bin/gpg/configure_gpg
@@ -1,16 +1,7 @@
 #!/bin/sh
 #
-# Copyright 2016-2020 The OpenZipkin Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Copyright The OpenZipkin Authors
+# SPDX-License-Identifier: Apache-2.0
 #
 
 set -ue
diff --git a/build-bin/maven/maven_deploy b/build-bin/maven/maven_deploy
index b43578e..c90d2fc 100755
--- a/build-bin/maven/maven_deploy
+++ b/build-bin/maven/maven_deploy
@@ -1,16 +1,7 @@
 #!/bin/sh
 #
-# Copyright 2016-2020 The OpenZipkin Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Copyright The OpenZipkin Authors
+# SPDX-License-Identifier: Apache-2.0
 #
 
 set -ue
diff --git a/build-bin/maven/maven_go_offline b/build-bin/maven/maven_go_offline
index d8cc858..1ce8258 100755
--- a/build-bin/maven/maven_go_offline
+++ b/build-bin/maven/maven_go_offline
@@ -1,16 +1,7 @@
 #!/bin/sh
 #
-# Copyright 2016-2020 The OpenZipkin Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Copyright The OpenZipkin Authors
+# SPDX-License-Identifier: Apache-2.0
 #
 
 # This is a go-offline that properly works with multi-module builds
diff --git a/build-bin/maven/maven_opts b/build-bin/maven/maven_opts
index 0bf0670..901f6ac 100755
--- a/build-bin/maven/maven_opts
+++ b/build-bin/maven/maven_opts
@@ -1,16 +1,7 @@
 #!/bin/sh
 #
-# Copyright 2016-2020 The OpenZipkin Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Copyright The OpenZipkin Authors
+# SPDX-License-Identifier: Apache-2.0
 #
 
 # This script checks each variable value, so it isn't important to fail on unbound (set -u)
diff --git a/build-bin/maven/maven_release b/build-bin/maven/maven_release
index 8c8446e..df4cdf6 100755
--- a/build-bin/maven/maven_release
+++ b/build-bin/maven/maven_release
@@ -1,16 +1,7 @@
 #!/bin/sh
 #
-# Copyright 2016-2020 The OpenZipkin Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Copyright The OpenZipkin Authors
+# SPDX-License-Identifier: Apache-2.0
 #
 
 set -ue
diff --git a/exporter-sender-kafka/pom.xml b/exporter-sender-kafka/pom.xml
index 155c120..e9baf69 100644
--- a/exporter-sender-kafka/pom.xml
+++ b/exporter-sender-kafka/pom.xml
@@ -1,24 +1,15 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright 2016-2020 The OpenZipkin Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-    in compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software distributed under the License
-    is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-    or implied. See the License for the specific language governing permissions and limitations under
-    the License.
+    Copyright The OpenZipkin Authors
+    SPDX-License-Identifier: Apache-2.0
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>io.zipkin.brave.karaf</groupId>
     <artifactId>brave-karaf-parent</artifactId>
-    <version>0.2.7-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/exporter-sender-kafka/src/main/java/io/zipkin/brave/exporter/sender/kafka/KafkaSenderExporter.java b/exporter-sender-kafka/src/main/java/io/zipkin/brave/exporter/sender/kafka/KafkaSenderExporter.java
index 7b4e300..dff129c 100644
--- a/exporter-sender-kafka/src/main/java/io/zipkin/brave/exporter/sender/kafka/KafkaSenderExporter.java
+++ b/exporter-sender-kafka/src/main/java/io/zipkin/brave/exporter/sender/kafka/KafkaSenderExporter.java
@@ -1,15 +1,6 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Copyright The OpenZipkin Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package io.zipkin.brave.exporter.sender.kafka;
 
@@ -24,8 +15,8 @@
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.metatype.annotations.Designate;
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
-import zipkin2.codec.Encoding;
-import zipkin2.reporter.Sender;
+import zipkin2.reporter.Encoding;
+import zipkin2.reporter.BytesMessageSender;
 import zipkin2.reporter.kafka.KafkaSender;
 
 @Component(
@@ -37,7 +28,7 @@
 public class KafkaSenderExporter {
 
   private static final String OVERRIDE_PREFIX = "kafka.";
-  private ServiceRegistration<Sender> reg;
+  private ServiceRegistration<BytesMessageSender> reg;
   private KafkaSender sender;
 
   @Activate
@@ -49,7 +40,7 @@ public void activate(Config config, BundleContext context, Map<String, String> p
         .overrides(getOverrides(properties))
         .topic(config.topic())
         .build();
-    reg = context.registerService(Sender.class, sender, new Hashtable<String, String>(properties));
+    reg = context.registerService(BytesMessageSender.class, sender, new Hashtable<String, String>(properties));
   }
 
   private HashMap<String, String> getOverrides(Map<String, String> properties) {
diff --git a/exporter-sender-kafka/src/test/java/io/zipkin/brave/exporter/sender/kafka/KafkaSenderExporterTest.java b/exporter-sender-kafka/src/test/java/io/zipkin/brave/exporter/sender/kafka/KafkaSenderExporterTest.java
index 92b495d..e6f74b0 100644
--- a/exporter-sender-kafka/src/test/java/io/zipkin/brave/exporter/sender/kafka/KafkaSenderExporterTest.java
+++ b/exporter-sender-kafka/src/test/java/io/zipkin/brave/exporter/sender/kafka/KafkaSenderExporterTest.java
@@ -1,15 +1,6 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Copyright The OpenZipkin Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package io.zipkin.brave.exporter.sender.kafka;
 
@@ -18,7 +9,7 @@
 import java.util.Map;
 import org.junit.Test;
 import org.osgi.framework.BundleContext;
-import zipkin2.codec.Encoding;
+import zipkin2.reporter.Encoding;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
diff --git a/exporter-sender-okhttp/pom.xml b/exporter-sender-okhttp/pom.xml
index 43514d9..cff9612 100644
--- a/exporter-sender-okhttp/pom.xml
+++ b/exporter-sender-okhttp/pom.xml
@@ -1,24 +1,15 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright 2016-2020 The OpenZipkin Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-    in compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software distributed under the License
-    is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-    or implied. See the License for the specific language governing permissions and limitations under
-    the License.
+    Copyright The OpenZipkin Authors
+    SPDX-License-Identifier: Apache-2.0
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>io.zipkin.brave.karaf</groupId>
     <artifactId>brave-karaf-parent</artifactId>
-    <version>0.2.7-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/exporter-sender-okhttp/src/main/java/io/zipkin/brave/exporter/sender/okhttp/SenderOkHttpExporter.java b/exporter-sender-okhttp/src/main/java/io/zipkin/brave/exporter/sender/okhttp/SenderOkHttpExporter.java
index b906cf4..ed41c31 100644
--- a/exporter-sender-okhttp/src/main/java/io/zipkin/brave/exporter/sender/okhttp/SenderOkHttpExporter.java
+++ b/exporter-sender-okhttp/src/main/java/io/zipkin/brave/exporter/sender/okhttp/SenderOkHttpExporter.java
@@ -1,15 +1,6 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Copyright The OpenZipkin Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package io.zipkin.brave.exporter.sender.okhttp;
 
@@ -23,7 +14,7 @@
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.metatype.annotations.Designate;
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
-import zipkin2.reporter.Sender;
+import zipkin2.reporter.BytesMessageSender;
 import zipkin2.reporter.okhttp3.OkHttpSender;
 
 @Component(
@@ -34,7 +25,7 @@
 @Designate(ocd = SenderOkHttpExporter.Config.class)
 public class SenderOkHttpExporter {
 
-  private ServiceRegistration<Sender> reg;
+  private ServiceRegistration<BytesMessageSender> reg;
   private OkHttpSender sender;
 
   @ObjectClassDefinition(name = "Zipkin Sender OkHttp") @interface Config {
@@ -52,7 +43,7 @@ public void activate(Config config, BundleContext context, Map<String, String> p
         .compressionEnabled(config.compressionEnabled())
         .messageMaxBytes(config.messageMaxBytes())
         .build();
-    reg = context.registerService(Sender.class, sender, new Hashtable<>(properties));
+    reg = context.registerService(BytesMessageSender.class, sender, new Hashtable<>(properties));
   }
 
   @Deactivate
diff --git a/exporter/pom.xml b/exporter/pom.xml
index fcd34ee..6fc4c14 100644
--- a/exporter/pom.xml
+++ b/exporter/pom.xml
@@ -1,24 +1,15 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright 2016-2020 The OpenZipkin Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-    in compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software distributed under the License
-    is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-    or implied. See the License for the specific language governing permissions and limitations under
-    the License.
+    Copyright The OpenZipkin Authors
+    SPDX-License-Identifier: Apache-2.0
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>io.zipkin.brave.karaf</groupId>
     <artifactId>brave-karaf-parent</artifactId>
-    <version>0.2.7-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/exporter/src/main/java/io/zipkin/brave/exporter/AsyncZipkinSpanHandlerExporter.java b/exporter/src/main/java/io/zipkin/brave/exporter/AsyncZipkinSpanHandlerExporter.java
index 931b2e8..607a979 100644
--- a/exporter/src/main/java/io/zipkin/brave/exporter/AsyncZipkinSpanHandlerExporter.java
+++ b/exporter/src/main/java/io/zipkin/brave/exporter/AsyncZipkinSpanHandlerExporter.java
@@ -1,15 +1,6 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Copyright The OpenZipkin Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package io.zipkin.brave.exporter;
 
@@ -22,7 +13,8 @@
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Reference;
-import zipkin2.reporter.Sender;
+
+import zipkin2.reporter.BytesMessageSender;
 import zipkin2.reporter.brave.AsyncZipkinSpanHandler;
 
 @Component(
@@ -30,10 +22,9 @@
     name = "io.zipkin.brave.asynczipkinspanhandler"
 )
 public class AsyncZipkinSpanHandlerExporter {
-  @Reference Sender sender;
+  @Reference BytesMessageSender sender;
 
   private AsyncZipkinSpanHandler zipkinSpanHandler;
-  @SuppressWarnings("rawtypes")
   private ServiceRegistration<SpanHandler> reg;
 
   @Activate public void activate(BundleContext context, Map<String, String> properties) {
diff --git a/exporter/src/main/java/io/zipkin/brave/exporter/HttpTracingExporter.java b/exporter/src/main/java/io/zipkin/brave/exporter/HttpTracingExporter.java
index c4db443..372ec5d 100644
--- a/exporter/src/main/java/io/zipkin/brave/exporter/HttpTracingExporter.java
+++ b/exporter/src/main/java/io/zipkin/brave/exporter/HttpTracingExporter.java
@@ -1,15 +1,6 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Copyright The OpenZipkin Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package io.zipkin.brave.exporter;
 
diff --git a/exporter/src/main/java/io/zipkin/brave/exporter/MessagingTracingExporter.java b/exporter/src/main/java/io/zipkin/brave/exporter/MessagingTracingExporter.java
index 58082c3..a925a1e 100644
--- a/exporter/src/main/java/io/zipkin/brave/exporter/MessagingTracingExporter.java
+++ b/exporter/src/main/java/io/zipkin/brave/exporter/MessagingTracingExporter.java
@@ -1,15 +1,6 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Copyright The OpenZipkin Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package io.zipkin.brave.exporter;
 
diff --git a/exporter/src/main/java/io/zipkin/brave/exporter/RpcTracingExporter.java b/exporter/src/main/java/io/zipkin/brave/exporter/RpcTracingExporter.java
index 1ba7122..f3a4673 100644
--- a/exporter/src/main/java/io/zipkin/brave/exporter/RpcTracingExporter.java
+++ b/exporter/src/main/java/io/zipkin/brave/exporter/RpcTracingExporter.java
@@ -1,15 +1,6 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Copyright The OpenZipkin Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package io.zipkin.brave.exporter;
 
diff --git a/exporter/src/main/java/io/zipkin/brave/exporter/TracingExporter.java b/exporter/src/main/java/io/zipkin/brave/exporter/TracingExporter.java
index 8ec74ce..5b21502 100644
--- a/exporter/src/main/java/io/zipkin/brave/exporter/TracingExporter.java
+++ b/exporter/src/main/java/io/zipkin/brave/exporter/TracingExporter.java
@@ -1,15 +1,6 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Copyright The OpenZipkin Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package io.zipkin.brave.exporter;
 
diff --git a/exporter/src/main/java/io/zipkin/brave/exporter/sender/urlconnection/URLConnectionSenderExporter.java b/exporter/src/main/java/io/zipkin/brave/exporter/sender/urlconnection/URLConnectionSenderExporter.java
index 4ed5370..4c9cff9 100644
--- a/exporter/src/main/java/io/zipkin/brave/exporter/sender/urlconnection/URLConnectionSenderExporter.java
+++ b/exporter/src/main/java/io/zipkin/brave/exporter/sender/urlconnection/URLConnectionSenderExporter.java
@@ -1,15 +1,6 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Copyright The OpenZipkin Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package io.zipkin.brave.exporter.sender.urlconnection;
 
@@ -23,7 +14,8 @@
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.metatype.annotations.Designate;
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
-import zipkin2.reporter.Sender;
+
+import zipkin2.reporter.BytesMessageSender;
 import zipkin2.reporter.urlconnection.URLConnectionSender;
 
 @Component(
@@ -34,7 +26,7 @@
 @Designate(ocd = URLConnectionSenderExporter.Config.class)
 public class URLConnectionSenderExporter {
 
-  private ServiceRegistration<Sender> reg;
+  private ServiceRegistration<BytesMessageSender> reg;
   private URLConnectionSender sender;
 
   @Activate
@@ -45,7 +37,7 @@ public void activate(Config config, BundleContext context, Map<String, String> p
         .connectTimeout(config.connectTimeout())
         .messageMaxBytes(config.messageMaxBytes())
         .build();
-    reg = context.registerService(Sender.class, sender, new Hashtable<String, String>(properties));
+    reg = context.registerService(BytesMessageSender.class, sender, new Hashtable<String, String>(properties));
   }
 
   @Deactivate public void deactive() {
diff --git a/features/pom.xml b/features/pom.xml
index 93260dc..74c7672 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2024 The OpenZipkin Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-    in compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software distributed under the License
-    is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-    or implied. See the License for the specific language governing permissions and limitations under
-    the License.
+    Copyright The OpenZipkin Authors
+    SPDX-License-Identifier: Apache-2.0
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -19,7 +10,7 @@
   <parent>
     <groupId>io.zipkin.brave.karaf</groupId>
     <artifactId>brave-karaf-parent</artifactId>
-    <version>0.2.7-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>brave-features</artifactId>
   <packaging>pom</packaging>
diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index d317fd9..751be90 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2020 The OpenZipkin Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-    in compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software distributed under the License
-    is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-    or implied. See the License for the specific language governing permissions and limitations under
-    the License.
+    Copyright The OpenZipkin Authors
+    SPDX-License-Identifier: Apache-2.0
 
 -->
 <features name="brave" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
diff --git a/itests/pom.xml b/itests/pom.xml
index ffbc3ff..93a9f6b 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2024 The OpenZipkin Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-    in compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software distributed under the License
-    is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-    or implied. See the License for the specific language governing permissions and limitations under
-    the License.
+    Copyright The OpenZipkin Authors
+    SPDX-License-Identifier: Apache-2.0
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -19,13 +10,13 @@
   <parent>
     <groupId>io.zipkin.brave.karaf</groupId>
     <artifactId>brave-karaf-parent</artifactId>
-    <version>0.2.7-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>brave-itests</artifactId>
 
   <properties>
     <pax-exam.version>4.13.5</pax-exam.version>
-    <karaf.version>4.3.10</karaf.version>
+    <karaf.version>4.4.6</karaf.version>
     <main.basedir>${project.basedir}/..</main.basedir>
   </properties>
 
diff --git a/itests/src/test/java/io/zipkin/brave/itests/ITBrave.java b/itests/src/test/java/io/zipkin/brave/itests/ITBrave.java
index 9392974..70f87bb 100644
--- a/itests/src/test/java/io/zipkin/brave/itests/ITBrave.java
+++ b/itests/src/test/java/io/zipkin/brave/itests/ITBrave.java
@@ -1,15 +1,6 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Copyright The OpenZipkin Authors
+ * SPDX-License-Identifier: Apache-2.0
  */
 package io.zipkin.brave.itests;
 
@@ -38,7 +29,8 @@
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
-import zipkin2.reporter.Sender;
+
+import zipkin2.reporter.BytesMessageSender;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -89,23 +81,23 @@ public class ITBrave {
   }
 
   @Test public void checkSenderUrlConnection() {
-    ServiceReference<Sender> ref =
-        getSingle(Sender.class, "(component.name=io.zipkin.sender.urlconnection)");
+    ServiceReference<BytesMessageSender> ref =
+        getSingle(BytesMessageSender.class, "(component.name=io.zipkin.sender.urlconnection)");
 
     assertPropertyEquals(ref, "endpoint", "http://localhost:9411/api/v2/spans");
     assertPropertyEquals(ref, "connectTimeout", 10000);
   }
 
   @Test public void checkSenderKafka() {
-    ServiceReference<Sender> ref =
-        getSingle(Sender.class, "(component.name=io.zipkin.sender.kafka)");
+    ServiceReference<BytesMessageSender> ref =
+        getSingle(BytesMessageSender.class, "(component.name=io.zipkin.sender.kafka)");
 
     assertPropertyEquals(ref, "topic", "zipkin");
   }
 
   @Test public void checkSenderOkHttp() {
-    ServiceReference<Sender> ref =
-        getSingle(Sender.class, "(component.name=io.zipkin.sender.okhttp)");
+    ServiceReference<BytesMessageSender> ref =
+        getSingle(BytesMessageSender.class, "(component.name=io.zipkin.sender.okhttp)");
 
     assertPropertyEquals(ref, "endpoint", "http://localhost:9411/api/v2/spans");
   }
diff --git a/itests/src/test/resources/exam.properties b/itests/src/test/resources/exam.properties
index 10b85f9..2f5ac0b 100644
--- a/itests/src/test/resources/exam.properties
+++ b/itests/src/test/resources/exam.properties
@@ -1,15 +1,6 @@
 #
-# Copyright 2016-2019 The OpenZipkin Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Copyright The OpenZipkin Authors
+# SPDX-License-Identifier: Apache-2.0
 #
 
 pax.exam.logging = none
diff --git a/itests/src/test/resources/logback.xml b/itests/src/test/resources/logback.xml
index 445e61e..ab51567 100644
--- a/itests/src/test/resources/logback.xml
+++ b/itests/src/test/resources/logback.xml
@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2019 The OpenZipkin Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-    in compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software distributed under the License
-    is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-    or implied. See the License for the specific language governing permissions and limitations under
-    the License.
+    Copyright The OpenZipkin Authors
+    SPDX-License-Identifier: Apache-2.0
 
 -->
 <configuration>
diff --git a/pom.xml b/pom.xml
index 8f495d1..2659131 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2024 The OpenZipkin Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-    in compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software distributed under the License
-    is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-    or implied. See the License for the specific language governing permissions and limitations under
-    the License.
+    Copyright The OpenZipkin Authors
+    SPDX-License-Identifier: Apache-2.0
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -19,7 +10,7 @@
 
   <groupId>io.zipkin.brave.karaf</groupId>
   <artifactId>brave-karaf-parent</artifactId>
-  <version>0.2.7-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -56,8 +47,8 @@
     <main.signature.artifact>java18</main.signature.artifact>
 
     <zipkin.version>2.27.1</zipkin.version>
-    <zipkin-reporter.version>2.17.2</zipkin-reporter.version>
-    <brave.version>5.18.1</brave.version>
+    <zipkin-reporter.version>3.4.3</zipkin-reporter.version>
+    <brave.version>6.0.3</brave.version>
 
     <assertj.version>3.26.3</assertj.version>
     <junit.version>4.13.2</junit.version>
@@ -362,7 +353,7 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>[11,16)</version>
+                  <version>[11,12),[17,18),[21,22)</version>
                 </requireJavaVersion>
               </rules>
             </configuration>
@@ -380,19 +371,33 @@
           <mapping>
             <!-- Don't use javadoc style as this makes code formatters break it by adding tags! -->
             <java>SLASHSTAR_STYLE</java>
+            <!-- build-bin/docker -->
+            <configure_docker>SCRIPT_STYLE</configure_docker>
+            <configure_docker_push>SCRIPT_STYLE</configure_docker_push>
+            <docker_arch>SCRIPT_STYLE</docker_arch>
+            <docker_args>SCRIPT_STYLE</docker_args>
+            <docker_block_on_health>SCRIPT_STYLE</docker_block_on_health>
+            <docker_build>SCRIPT_STYLE</docker_build>
+            <docker_push>SCRIPT_STYLE</docker_push>
+            <docker_test_image>SCRIPT_STYLE</docker_test_image>
             <!-- build-bin/git -->
             <login_git>SCRIPT_STYLE</login_git>
             <version_from_trigger_tag>SCRIPT_STYLE</version_from_trigger_tag>
             <!-- build-bin/gpg -->
             <configure_gpg>SCRIPT_STYLE</configure_gpg>
             <!-- build-bin/maven -->
+            <maven_build>SCRIPT_STYLE</maven_build>
+            <maven_build_or_unjar>SCRIPT_STYLE</maven_build_or_unjar>
             <maven_deploy>SCRIPT_STYLE</maven_deploy>
             <maven_go_offline>SCRIPT_STYLE</maven_go_offline>
             <maven_release>SCRIPT_STYLE</maven_release>
             <maven_opts>SCRIPT_STYLE</maven_opts>
+            <maven_unjar>SCRIPT_STYLE</maven_unjar>
           </mapping>
           <excludes>
             <exclude>.gitignore</exclude>
+            <exclude>.dockerignore</exclude>
+            <exclude>.editorconfig</exclude>
             <exclude>.mvn/**</exclude>
             <exclude>mvnw*</exclude>
             <exclude>etc/header.txt</exclude>
@@ -518,7 +523,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
+            <version>3.2.4</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/src/etc/header.txt b/src/etc/header.txt
index 308c88f..fe602a3 100644
--- a/src/etc/header.txt
+++ b/src/etc/header.txt
@@ -1,11 +1,2 @@
-Copyright ${license.git.copyrightYears} The OpenZipkin Authors
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-in compliance with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License
-is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-or implied. See the License for the specific language governing permissions and limitations under
-the License.
\ No newline at end of file
+Copyright The OpenZipkin Authors
+SPDX-License-Identifier: Apache-2.0