move observation to the core module

core/build.gradle

@@ -156,6 +156,18 @@ dependencies {
     optionalImplementation libs.brotli4j.osx
     optionalImplementation libs.brotli4j.osx.aarch64
     optionalImplementation libs.brotli4j.windows
+
+    // for testing the observation API with tracing
+    testImplementation (libs.micrometer.tracing.integration.test) {
+        exclude group: "org.mockito"
+    }
+    if (project.ext.targetJavaVersion >= 11) {
+        testImplementation project(':thrift0.18')
+    } else {
+        testImplementation project(':thrift0.17')
+    }
+    testImplementation libs.brave.context.slf4j
+    testImplementation libs.brave.instrumentation.http.tests
 }
 
 if (!rootProject.hasProperty('noWeb')) {

observation/src/main/java/com/linecorp/armeria/client/observation/HttpClientContext.java → core/src/main/java/com/linecorp/armeria/client/observation/HttpClientContext.java

@@ -22,14 +22,13 @@
 import com.linecorp.armeria.common.annotation.UnstableApi;
 import com.linecorp.armeria.common.logging.RequestLog;
 
-import io.micrometer.observation.Observation;
 import io.micrometer.observation.Observation.Context;
 import io.micrometer.observation.ObservationConvention;
 import io.micrometer.observation.ObservationHandler;
 import io.micrometer.observation.transport.RequestReplySenderContext;
 
 /**
- * A {@link Observation.Context} which may be used in conjunction with {@link MicrometerObservationClient}
+ * A {@link Context} which may be used in conjunction with {@link MicrometerObservationClient}
  * to implement custom {@link ObservationConvention}s or {@link ObservationHandler}s.
  * <pre>{@code
  * ObservationConvention<HttpClientContext> convention = ...

observation/src/main/java/com/linecorp/armeria/server/observation/HttpServerContext.java → core/src/main/java/com/linecorp/armeria/server/observation/HttpServerContext.java

@@ -21,14 +21,13 @@
 import com.linecorp.armeria.common.logging.RequestLog;
 import com.linecorp.armeria.server.ServiceRequestContext;
 
-import io.micrometer.observation.Observation;
 import io.micrometer.observation.Observation.Context;
 import io.micrometer.observation.ObservationConvention;
 import io.micrometer.observation.ObservationHandler;
 import io.micrometer.observation.transport.RequestReplyReceiverContext;
 
 /**
- * A {@link Observation.Context} which may be used in conjunction with {@link MicrometerObservationService}
+ * A {@link Context} which may be used in conjunction with {@link MicrometerObservationService}
  * to implement custom {@link ObservationConvention}s or {@link ObservationHandler}s.
  * <pre>{@code
  * ObservationConvention<HttpServerContext> convention = ...

observation/src/test/java/com/linecorp/armeria/client/observation/MicrometerObservationClientIntegrationTest.java → core/src/test/java/com/linecorp/armeria/client/observation/MicrometerObservationClientIntegrationTest.java

@@ -35,9 +35,9 @@
 import com.linecorp.armeria.common.HttpMethod;
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.HttpResponse;
-import com.linecorp.armeria.common.MicrometerObservationRegistryUtils;
 import com.linecorp.armeria.common.SessionProtocol;
 import com.linecorp.armeria.common.util.SafeCloseable;
+import com.linecorp.armeria.internal.common.observation.MicrometerObservationRegistryUtils;
 import com.linecorp.armeria.server.ServiceRequestContext;
 
 import brave.propagation.CurrentTraceContext;

observation/src/test/java/com/linecorp/armeria/client/observation/MicrometerObservationClientTest.java → core/src/test/java/com/linecorp/armeria/client/observation/MicrometerObservationClientTest.java

@@ -17,7 +17,7 @@
 package com.linecorp.armeria.client.observation;
 
 import static com.linecorp.armeria.client.observation.MicrometerObservationClient.newDecorator;
-import static com.linecorp.armeria.common.MicrometerObservationRegistryUtils.observationRegistry;
+import static com.linecorp.armeria.internal.common.observation.MicrometerObservationRegistryUtils.observationRegistry;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
@@ -52,10 +52,9 @@
 import com.linecorp.armeria.common.RpcResponse;
 import com.linecorp.armeria.common.SessionProtocol;
 import com.linecorp.armeria.common.annotation.Nullable;
-import com.linecorp.armeria.common.brave.HelloService;
-import com.linecorp.armeria.common.brave.SpanCollector;
 import com.linecorp.armeria.common.logging.RequestLog;
 import com.linecorp.armeria.common.util.SafeCloseable;
+import com.linecorp.armeria.internal.common.observation.SpanCollector;
 
 import brave.Span.Kind;
 import brave.Tracing;
@@ -235,7 +234,7 @@ private static RequestLog testRemoteInvocation(Tracing tracing, @Nullable String
                 .of(RequestHeaders.of(HttpMethod.POST, "/hello/armeria",
                     HttpHeaderNames.SCHEME, "http",
                     HttpHeaderNames.AUTHORITY, "foo.com"));
-        final RpcRequest rpcReq = RpcRequest.of(HelloService.Iface.class,
+        final RpcRequest rpcReq = RpcRequest.of(Object.class,
                                                 "hello", "Armeria");
         final HttpResponse res = HttpResponse.of(HttpStatus.OK);
         final RpcResponse rpcRes = RpcResponse.of("Hello, Armeria!");

core/src/test/java/com/linecorp/armeria/internal/common/observation/MicrometerObservationRegistryUtils.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2023 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.internal.common.observation;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import brave.Tracing;
+import brave.http.HttpTracing;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.observation.DefaultMeterObservationHandler;
+import io.micrometer.core.instrument.observation.MeterObservationHandler;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.micrometer.observation.ObservationHandler;
+import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.tracing.brave.bridge.BraveBaggageManager;
+import io.micrometer.tracing.brave.bridge.BraveCurrentTraceContext;
+import io.micrometer.tracing.brave.bridge.BravePropagator;
+import io.micrometer.tracing.brave.bridge.BraveTracer;
+import io.micrometer.tracing.handler.DefaultTracingObservationHandler;
+import io.micrometer.tracing.handler.PropagatingReceiverTracingObservationHandler;
+import io.micrometer.tracing.handler.PropagatingSenderTracingObservationHandler;
+import io.micrometer.tracing.handler.TracingObservationHandler;
+
+public final class MicrometerObservationRegistryUtils {
+
+    public static ObservationRegistry observationRegistry(HttpTracing httpTracing) {
+        return observationRegistry(httpTracing.tracing());
+    }
+
+    public static ObservationRegistry observationRegistry(Tracing tracing) {
+        final BraveCurrentTraceContext braveCurrentTraceContext = new BraveCurrentTraceContext(
+                tracing.currentTraceContext());
+        final BravePropagator bravePropagator = new BravePropagator(tracing);
+        final BraveTracer braveTracer = new BraveTracer(tracing.tracer(), braveCurrentTraceContext,
+                                                        new BraveBaggageManager());
+        final List<TracingObservationHandler<?>> tracingHandlers =
+                Arrays.asList(new PropagatingSenderTracingObservationHandler<>(braveTracer, bravePropagator),
+                              new PropagatingReceiverTracingObservationHandler<>(braveTracer, bravePropagator),
+                              new DefaultTracingObservationHandler(braveTracer));
+
+        final MeterRegistry meterRegistry = new SimpleMeterRegistry();
+        final List<MeterObservationHandler<?>> meterHandlers = Collections.singletonList(
+                new DefaultMeterObservationHandler(meterRegistry));
+
+        final ObservationRegistry observationRegistry = ObservationRegistry.create();
+        observationRegistry.observationConfig().observationHandler(
+                new ObservationHandler.CompositeObservationHandler.FirstMatchingCompositeObservationHandler(
+                        tracingHandlers));
+        observationRegistry.observationConfig().observationHandler(
+                new ObservationHandler.CompositeObservationHandler.FirstMatchingCompositeObservationHandler(
+                        meterHandlers));
+        return observationRegistry;
+    }
+
+    private MicrometerObservationRegistryUtils() {}
+}

observation/src/test/java/com/linecorp/armeria/common/brave/SpanCollector.java → core/src/test/java/com/linecorp/armeria/internal/common/observation/SpanCollector.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.linecorp.armeria.common.brave;
+package com.linecorp.armeria.internal.common.observation;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedTransferQueue;

observation/src/test/java/com/linecorp/armeria/it/CustomObservationTest.java → core/src/test/java/com/linecorp/armeria/internal/common/observation/it/CustomObservationTest.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.linecorp.armeria.it;
+package com.linecorp.armeria.internal.common.observation.it;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
@@ -34,8 +34,8 @@
 import com.linecorp.armeria.client.observation.HttpClientContext;
 import com.linecorp.armeria.client.observation.MicrometerObservationClient;
 import com.linecorp.armeria.common.HttpResponse;
-import com.linecorp.armeria.common.MicrometerObservationRegistryUtils;
-import com.linecorp.armeria.common.brave.SpanCollector;
+import com.linecorp.armeria.internal.common.observation.MicrometerObservationRegistryUtils;
+import com.linecorp.armeria.internal.common.observation.SpanCollector;
 import com.linecorp.armeria.server.HttpService;
 import com.linecorp.armeria.server.ServerBuilder;
 import com.linecorp.armeria.server.observation.HttpServerContext;

observation/src/test/java/com/linecorp/armeria/server/observation/MicrometerObservationServiceTest.java → core/src/test/java/com/linecorp/armeria/server/observation/MicrometerObservationServiceTest.java

@@ -39,16 +39,15 @@
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.HttpResponse;
 import com.linecorp.armeria.common.HttpStatus;
-import com.linecorp.armeria.common.MicrometerObservationRegistryUtils;
 import com.linecorp.armeria.common.RequestHeaders;
 import com.linecorp.armeria.common.ResponseHeaders;
 import com.linecorp.armeria.common.RpcRequest;
 import com.linecorp.armeria.common.RpcResponse;
-import com.linecorp.armeria.common.brave.HelloService;
-import com.linecorp.armeria.common.brave.SpanCollector;
 import com.linecorp.armeria.common.logging.RequestLog;
 import com.linecorp.armeria.common.logging.RequestLogBuilder;
 import com.linecorp.armeria.common.util.SafeCloseable;
+import com.linecorp.armeria.internal.common.observation.MicrometerObservationRegistryUtils;
+import com.linecorp.armeria.internal.common.observation.SpanCollector;
 import com.linecorp.armeria.server.HttpService;
 import com.linecorp.armeria.server.ServiceRequestContext;
 import com.linecorp.armeria.server.TransientHttpService;
@@ -228,7 +227,7 @@ private static RequestLog testServiceInvocation(SpanHandler spanHandler,
                                                                  HttpHeaderNames.SCHEME, "http",
                                                                  HttpHeaderNames.AUTHORITY, "foo.com"));
         final ServiceRequestContext ctx = ServiceRequestContext.builder(req).build();
-        final RpcRequest rpcReq = RpcRequest.of(HelloService.Iface.class, "hello", "trustin");
+        final RpcRequest rpcReq = RpcRequest.of(Object.class, "hello", "trustin");
         final HttpResponse res = HttpResponse.of(HttpStatus.OK);
         final RpcResponse rpcRes = RpcResponse.of("Hello, trustin!");
         final RequestLogBuilder logBuilder = ctx.logBuilder();

observation/src/test/java/com/linecorp/armeria/server/observation/SpanPropagationTest.java → core/src/test/java/com/linecorp/armeria/server/observation/SpanPropagationTest.java

@@ -35,7 +35,7 @@
 import com.linecorp.armeria.client.logging.LoggingClient;
 import com.linecorp.armeria.client.observation.MicrometerObservationClient;
 import com.linecorp.armeria.common.HttpResponse;
-import com.linecorp.armeria.common.MicrometerObservationRegistryUtils;
+import com.linecorp.armeria.internal.common.observation.MicrometerObservationRegistryUtils;
 import com.linecorp.armeria.server.ServerBuilder;
 import com.linecorp.armeria.server.logging.LoggingService;
 import com.linecorp.armeria.testing.junit5.server.ServerExtension;

settings.gradle

@@ -55,7 +55,6 @@ includeWithFlags ':kotlin',                              'java', 'publish', 'rel
 includeWithFlags ':logback',                             'java', 'publish', 'relocate'
 includeWithFlags ':logback13',                           'java', 'publish', 'relocate', 'no_aggregation'
 includeWithFlags ':oauth2',                              'java', 'publish', 'relocate'
-includeWithFlags ':observation',                         'java', 'publish', 'relocate'
 includeWithFlags ':protobuf',                            'java', 'publish', 'relocate'
 includeWithFlags ':reactor3',                            'java', 'publish', 'relocate'
 includeWithFlags ':resilience4j2',                       'java17', 'publish', 'relocate'

thrift/thrift0.13/build.gradle

@@ -15,6 +15,13 @@ dependencies {
     testImplementation libs.dropwizard.metrics.core
     testImplementation libs.micrometer.prometheus
     testImplementation libs.prometheus
+
+    // micrometer tracing
+    testImplementation (libs.micrometer.tracing.integration.test) {
+        exclude group: "org.mockito"
+    }
+//    testImplementation libs.brave.context.slf4j
+    testImplementation libs.brave.instrumentation.http.tests
 }
 
 // Use the old compiler.

observation/src/test/java/com/linecorp/armeria/it/brave/BraveIntegrationTest.java → thrift/thrift0.13/src/test/java/com/linecorp/armeria/it/observation/BraveIntegrationTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package com.linecorp.armeria.it.brave;
+package com.linecorp.armeria.it.observation;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
@@ -61,10 +61,7 @@
 import com.linecorp.armeria.common.HttpResponse;
 import com.linecorp.armeria.common.HttpStatus;
 import com.linecorp.armeria.common.MediaType;
-import com.linecorp.armeria.common.MicrometerObservationRegistryUtils;
 import com.linecorp.armeria.common.RequestContext;
-import com.linecorp.armeria.common.brave.HelloService;
-import com.linecorp.armeria.common.brave.HelloService.AsyncIface;
 import com.linecorp.armeria.common.thrift.ThriftFuture;
 import com.linecorp.armeria.internal.testing.BlockingUtils;
 import com.linecorp.armeria.server.AbstractHttpService;
@@ -73,6 +70,8 @@
 import com.linecorp.armeria.server.ServiceRequestContext;
 import com.linecorp.armeria.server.observation.MicrometerObservationService;
 import com.linecorp.armeria.server.thrift.THttpService;
+import com.linecorp.armeria.service.test.thrift.main.HelloService;
+import com.linecorp.armeria.service.test.thrift.main.HelloService.AsyncIface;
 import com.linecorp.armeria.testing.junit5.server.ServerExtension;
 
 import brave.ScopedSpan;

observation/src/test/java/com/linecorp/armeria/common/MicrometerObservationRegistryUtils.java → thrift/thrift0.13/src/test/java/com/linecorp/armeria/it/observation/MicrometerObservationRegistryUtils.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.linecorp.armeria.common;
+package com.linecorp.armeria.it.observation;
 
 import java.util.Arrays;
 import java.util.Collections;