From 5509b8fd25eef8ec92d8d2afa1389969e26df95b Mon Sep 17 00:00:00 2001
From: yifeizhuang <zivy@google.com>
Date: Tue, 10 Sep 2024 11:23:53 -0700
Subject: [PATCH] sync

---
 opentelemetry/build.gradle                                  | 6 +-----
 .../main/java/io/grpc/opentelemetry/GrpcOpenTelemetry.java  | 2 +-
 .../grpc/opentelemetry/OpenTelemetryTracingModuleTest.java  | 6 +++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/opentelemetry/build.gradle b/opentelemetry/build.gradle
index b554f9f9c98..00d913c280d 100644
--- a/opentelemetry/build.gradle
+++ b/opentelemetry/build.gradle
@@ -7,8 +7,6 @@ plugins {
 
 description = 'gRPC: OpenTelemetry'
 
-test.testLogging.showStandardStreams(true)
-
 dependencies {
     api project(':grpc-api')
     implementation libraries.guava,
@@ -21,9 +19,7 @@ dependencies {
             testFixtures(project(':grpc-core')),
             testFixtures(project(':grpc-api')),
             libraries.opentelemetry.sdk.testing,
-            libraries.assertj.core
-    testImplementation project(path: ':grpc-api')
-    // opentelemetry.sdk.testing uses compileOnly for assertj
+            libraries.assertj.core // opentelemetry.sdk.testing uses compileOnly for assertj
 
     annotationProcessor libraries.auto.value
 
diff --git a/opentelemetry/src/main/java/io/grpc/opentelemetry/GrpcOpenTelemetry.java b/opentelemetry/src/main/java/io/grpc/opentelemetry/GrpcOpenTelemetry.java
index 723f16a1acb..e95ff580689 100644
--- a/opentelemetry/src/main/java/io/grpc/opentelemetry/GrpcOpenTelemetry.java
+++ b/opentelemetry/src/main/java/io/grpc/opentelemetry/GrpcOpenTelemetry.java
@@ -90,8 +90,8 @@ private GrpcOpenTelemetry(Builder builder) {
     this.optionalLabels = ImmutableList.copyOf(builder.optionalLabels);
     this.openTelemetryMetricsModule = new OpenTelemetryMetricsModule(
         STOPWATCH_SUPPLIER, resource, optionalLabels, builder.plugins);
-    this.sink = new OpenTelemetryMetricSink(meter, enableMetrics, disableDefault, optionalLabels);
     this.openTelemetryTracingModule = new OpenTelemetryTracingModule(openTelemetrySdk);
+    this.sink = new OpenTelemetryMetricSink(meter, enableMetrics, disableDefault, optionalLabels);
   }
 
   @VisibleForTesting
diff --git a/opentelemetry/src/test/java/io/grpc/opentelemetry/OpenTelemetryTracingModuleTest.java b/opentelemetry/src/test/java/io/grpc/opentelemetry/OpenTelemetryTracingModuleTest.java
index a0c0674f309..89e79d55d25 100644
--- a/opentelemetry/src/test/java/io/grpc/opentelemetry/OpenTelemetryTracingModuleTest.java
+++ b/opentelemetry/src/test/java/io/grpc/opentelemetry/OpenTelemetryTracingModuleTest.java
@@ -703,8 +703,7 @@ public void onComplete() {
     when(handler.startCall(any(), any())).thenReturn(getContextListener);
     ServerCall<Integer, Integer> call = new NoopServerCall<>();
     Metadata metadata = new Metadata();
-    ServerCall.Listener<Integer> listener =
-       interceptor.interceptCall(call, metadata, handler);
+    ServerCall.Listener<Integer> listener = interceptor.interceptCall(call, metadata, handler);
     verify(handler).startCall(same(call), same(metadata));
     listener.onMessage(1);
     assertEquals(callbackSpan.get(), Span.getInvalid());
@@ -718,7 +717,8 @@ public void onComplete() {
     assertEquals(callbackSpan.get(), Span.getInvalid());
 
     Span parentSpan = tracerRule.spanBuilder("parent-span").startSpan();
-    io.grpc.Context context = io.grpc.Context.current().withValue(tracingModule.otelSpan, parentSpan);
+    io.grpc.Context context = io.grpc.Context.current().withValue(
+        tracingModule.otelSpan, parentSpan);
     io.grpc.Context previous = context.attach();
     try {
       listener = interceptor.interceptCall(call, metadata, handler);