Remove armeria-brave module

brave/brave/build.gradle

@@ -1,3 +1,10 @@
 dependencies {
-    api project(':brave5')
+    api project(':brave6')
+    // Brave 5.x depended on zipkin-reporter-brave, but Brave 6.x has no
+    // dependencies. We add back dependencies that allow ZipkinSpanHandler to
+    // compile. This allows people to migrate without managing these
+    // dependencies on their own. Those who want a dependency-free integration
+    // can use armeria-brave6.
+    api libs.zipkin.reporter.brave // For AsyncZipkinSpanHandler (native Brave)
+    api libs.zipkin // For ZipkinSpanHandler (uses Zipkin core types)
 }

brave/brave/src/test/java/com/linecorp/armeria/brave/CompilationTest.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2024 LINE Corporation
+ *
+ * LINE Corporation licenses this file to you 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:
+ *
+ *   https://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.
+ */
+package com.linecorp.armeria.brave;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import brave.handler.MutableSpan;
+import brave.handler.SpanHandler;
+import brave.handler.SpanHandler.Cause;
+import brave.propagation.TraceContext;
+import zipkin2.reporter.BytesMessageSender;
+import zipkin2.reporter.Encoding;
+import zipkin2.reporter.Reporter;
+import zipkin2.reporter.brave.AsyncZipkinSpanHandler;
+import zipkin2.reporter.brave.ZipkinSpanHandler;
+
+/**
+ * This tests that zipkin-reporter-brave types work without adding any explicit
+ * dependencies.
+ */
+@MockitoSettings(strictness = Strictness.LENIENT)
+class CompilationTest {
+
+    TraceContext context = TraceContext.newBuilder().traceId(1).spanId(1).build();
+    MutableSpan span = new MutableSpan();
+    @Mock
+    BytesMessageSender sender;
+
+    @Test
+    void zipkinSpanHandler() {
+        final SpanHandler handler = ZipkinSpanHandler.create(Reporter.NOOP);
+        assertThat(handler.begin(context, span, null)).isTrue();
+        assertThat(handler.end(context, span, Cause.FINISHED)).isTrue();
+    }
+
+    @Test
+    void asyncZipkinSpanHandler() {
+        when(sender.encoding()).thenReturn(Encoding.JSON);
+
+        try (AsyncZipkinSpanHandler handler = AsyncZipkinSpanHandler.newBuilder(sender).build()) {
+            assertThat(handler.begin(context, span, null)).isTrue();
+            assertThat(handler.end(context, span, Cause.FINISHED)).isTrue();
+        }
+    }
+}

dependencies.toml

@@ -9,7 +9,7 @@ assertj = "3.25.2"
 awaitility = "4.2.0"
 blockhound = "1.0.8.RELEASE"
 bouncycastle = "1.70"
-brave5 = "5.18.0"
+brave5 = "5.18.1"
 brave6 = "6.0.0"
 brotli4j = "1.15.0"
 bucket4j = "7.6.0"
@@ -159,6 +159,8 @@ tomcat8 = "8.5.98"
 tomcat9 = "9.0.85"
 tomcat10 = "10.1.18"
 xml-apis = "1.4.01"
+zipkin = "3.0.6"
+zipkin-reporter = "3.2.1"
 # Ensure that we use the same ZooKeeper version as what Curator depends on.
 # See: https://github.com/apache/curator/blob/master/pom.xml
 #      (Switch to the right tag to find out the right version.)
@@ -1364,6 +1366,14 @@ version.ref = "java-websocket"
 module = "xml-apis:xml-apis"
 version.ref = "xml-apis"
 
+[libraries.zipkin]
+module = "io.zipkin.zipkin2:zipkin"
+version.ref = "zipkin"
+
+[libraries.zipkin-reporter-brave]
+module = "io.zipkin.reporter2:zipkin-reporter-brave"
+version.ref = "zipkin-reporter"
+
 [libraries.zookeeper]
 module = "org.apache.zookeeper:zookeeper"
 version.ref = "zookeeper"