Updating client impl tests to avoid service mock

Author: LikeTheSalad

dependencyManagement/build.gradle.kts

@@ -17,6 +17,7 @@ dependencies {
   api(enforcedPlatform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}"))
   api(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.19.1"))
   api(enforcedPlatform("com.google.protobuf:protobuf-bom:4.31.1"))
+  api(enforcedPlatform("com.squareup.okhttp3:okhttp-bom:5.1.0"))
 
   constraints {
     api("io.opentelemetry.semconv:opentelemetry-semconv:${semconvVersion}")
@@ -44,7 +45,6 @@ dependencies {
 
     api("com.google.code.findbugs:annotations:3.0.1u2")
     api("com.google.code.findbugs:jsr305:3.0.2")
-    api("com.squareup.okhttp3:okhttp:5.0.0")
     api("com.uber.nullaway:nullaway:0.12.7")
     api("org.assertj:assertj-core:3.27.3")
     api("org.awaitility:awaitility:4.3.0")

opamp-client/build.gradle.kts

@@ -18,6 +18,8 @@ dependencies {
   compileOnly("com.google.auto.value:auto-value-annotations")
   testImplementation("org.mockito:mockito-inline")
   testImplementation("com.google.protobuf:protobuf-java-util")
+  testImplementation("com.squareup.okhttp3:mockwebserver3")
+  testImplementation("com.squareup.okhttp3:mockwebserver3-junit5")
 }
 
 val opampProtos = tasks.register<DownloadOpampProtos>("opampProtoDownload", download)

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/connectivity/http/OkHttpSender.java

@@ -8,14 +8,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.CompletableFuture;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.RequestBody;
 import okio.BufferedSink;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public final class OkHttpSender implements HttpSender {
   private final OkHttpClient client;
@@ -51,17 +51,12 @@ public CompletableFuture<Response> send(BodyWriter writer, int contentLength) {
         .enqueue(
             new Callback() {
               @Override
-              public void onResponse(@NotNull Call call, @NotNull okhttp3.Response response) {
-                if (response.isSuccessful() && response.body() != null) {
-                  future.complete(new OkHttpResponse(response));
-                } else {
-                  future.completeExceptionally(
-                      new HttpErrorException(response.code(), response.message()));
-                }
+              public void onResponse(@Nonnull Call call, @Nonnull okhttp3.Response response) {
+                future.complete(new OkHttpResponse(response));
               }
 
               @Override
-              public void onFailure(@NotNull Call call, @NotNull IOException e) {
+              public void onFailure(@Nonnull Call call, @Nonnull IOException e) {
                 future.completeExceptionally(e);
               }
             });
@@ -73,9 +68,6 @@ private static class OkHttpResponse implements Response {
     private final okhttp3.Response response;
 
     private OkHttpResponse(okhttp3.Response response) {
-      if (response.body() == null) {
-        throw new IllegalStateException("null response body not expected");
-      }
       this.response = response;
     }
 
@@ -128,7 +120,7 @@ public long contentLength() {
     }
 
     @Override
-    public void writeTo(@NotNull BufferedSink bufferedSink) throws IOException {
+    public void writeTo(@Nonnull BufferedSink bufferedSink) throws IOException {
       writer.writeTo(bufferedSink.outputStream());
     }
   }

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImpl.java

@@ -111,7 +111,7 @@ private OpampClientImpl(
   }
 
   @Override
-  public void start(Callbacks callbacks) {
+  public void start(@Nonnull Callbacks callbacks) {
     if (hasStopped.get()) {
       throw new IllegalStateException("The client cannot start after it has been stopped.");
     }
@@ -137,15 +137,15 @@ public void stop() {
   }
 
   @Override
-  public void setAgentDescription(AgentDescription agentDescription) {
+  public void setAgentDescription(@Nonnull AgentDescription agentDescription) {
     if (!state.agentDescription.get().equals(agentDescription)) {
       state.agentDescription.set(agentDescription);
       addFieldAndSend(Field.AGENT_DESCRIPTION);
     }
   }
 
   @Override
-  public void setRemoteConfigStatus(RemoteConfigStatus remoteConfigStatus) {
+  public void setRemoteConfigStatus(@Nonnull RemoteConfigStatus remoteConfigStatus) {
     if (!state.remoteConfigStatus.get().equals(remoteConfigStatus)) {
       state.remoteConfigStatus.set(remoteConfigStatus);
       addFieldAndSend(Field.REMOTE_CONFIG_STATUS);