Using wire

Author: LikeTheSalad

opamp-client/build.gradle.kts

@@ -5,7 +5,7 @@ import groovy.json.JsonSlurper
 plugins {
   id("otel.java-conventions")
   id("de.undercouch.download") version "5.6.0"
-  id("com.google.protobuf") version "0.9.4"
+  id("com.squareup.wire") version "5.3.1"
 }
 
 description = "Client implementation of the OpAMP spec."
@@ -16,14 +16,6 @@ java {
   targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-sourceSets {
-  main {
-    proto {
-      srcDir("opamp-spec/proto")
-    }
-  }
-}
-
 tasks.withType<JavaCompile>().configureEach {
   with(options) {
     // Suppressing warnings about the usage of deprecated methods.
@@ -32,16 +24,7 @@ tasks.withType<JavaCompile>().configureEach {
   }
 }
 
-val protobufVersion = "4.28.2"
-
-protobuf {
-  protoc {
-    artifact = "com.google.protobuf:protoc:$protobufVersion"
-  }
-}
-
 dependencies {
-  implementation("com.google.protobuf:protobuf-java:$protobufVersion")
   annotationProcessor("com.google.auto.value:auto-value")
   compileOnly("com.google.auto.value:auto-value-annotations")
 }
@@ -52,7 +35,8 @@ val opampReleaseInfo = tasks.register<Download>("opampLastReleaseInfo") {
   dest(project.layout.buildDirectory.file("opamp/release.json"))
 }
 
-tasks.register<DownloadOpampProtos>("opampProtoDownload", download).configure {
+val opampProtos = tasks.register<DownloadOpampProtos>("opampProtoDownload", download)
+opampProtos.configure {
   group = "opamp"
   dependsOn(opampReleaseInfo)
   lastReleaseInfoJson.set {
@@ -62,6 +46,13 @@ tasks.register<DownloadOpampProtos>("opampProtoDownload", download).configure {
   downloadedZipFile.set(project.layout.buildDirectory.file("intermediate/$name/release.zip"))
 }
 
+wire {
+  java {}
+  sourcePath {
+    srcDir(opampProtos)
+  }
+}
+
 abstract class DownloadOpampProtos @Inject constructor(
   private val download: DownloadExtension,
   private val archiveOps: ArchiveOperations,

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/OpampClient.java

@@ -6,7 +6,9 @@
 package io.opentelemetry.opamp.client.internal;
 
 import io.opentelemetry.opamp.client.internal.response.MessageData;
-import opamp.proto.Opamp;
+import opamp.proto.AgentDescription;
+import opamp.proto.RemoteConfigStatus;
+import opamp.proto.ServerErrorResponse;
 
 public interface OpampClient {
 
@@ -42,14 +44,14 @@ public interface OpampClient {
    *
    * @param agentDescription The new agent description.
    */
-  void setAgentDescription(Opamp.AgentDescription agentDescription);
+  void setAgentDescription(AgentDescription agentDescription);
 
   /**
    * Sets the current remote config status which will be sent in the next agent to server request.
    *
    * @param remoteConfigStatus The new remote config status.
    */
-  void setRemoteConfigStatus(Opamp.RemoteConfigStatus remoteConfigStatus);
+  void setRemoteConfigStatus(RemoteConfigStatus remoteConfigStatus);
 
   interface Callbacks {
     /**
@@ -81,17 +83,16 @@ interface Callbacks {
      * @param client The relevant {@link OpampClient} instance.
      * @param errorResponse The error returned by the Server.
      */
-    void onErrorResponse(OpampClient client, Opamp.ServerErrorResponse errorResponse);
+    void onErrorResponse(OpampClient client, ServerErrorResponse errorResponse);
 
     /**
      * Called when the Agent receives a message that needs processing. See {@link MessageData}
      * definition for the data that may be available for processing. During onMessage execution the
      * {@link OpampClient} functions that change the status of the client may be called, e.g. if
-     * RemoteConfig is processed then {@link
-     * #setRemoteConfigStatus(opamp.proto.Opamp.RemoteConfigStatus)} should be called to reflect the
-     * processing result. These functions may also be called after onMessage returns. This is
-     * advisable if processing can take a long time. In that case returning quickly is preferable to
-     * avoid blocking the {@link OpampClient}.
+     * RemoteConfig is processed then {@link #setRemoteConfigStatus(opamp.proto.RemoteConfigStatus)}
+     * should be called to reflect the processing result. These functions may also be called after
+     * onMessage returns. This is advisable if processing can take a long time. In that case
+     * returning quickly is preferable to avoid blocking the {@link OpampClient}.
      *
      * @param client The relevant {@link OpampClient} instance.
      * @param messageData The server response data that needs processing.

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/response/MessageData.java

@@ -8,7 +8,7 @@
 import com.google.auto.value.AutoValue;
 import io.opentelemetry.opamp.client.internal.OpampClient;
 import javax.annotation.Nullable;
-import opamp.proto.Opamp;
+import opamp.proto.AgentRemoteConfig;
 
 /**
  * Data class provided in {@link OpampClient.Callbacks#onMessage(OpampClient, MessageData)} with
@@ -17,15 +17,15 @@
 @AutoValue
 public abstract class MessageData {
   @Nullable
-  public abstract Opamp.AgentRemoteConfig getRemoteConfig();
+  public abstract AgentRemoteConfig getRemoteConfig();
 
   public static Builder builder() {
     return new AutoValue_MessageData.Builder();
   }
 
   @AutoValue.Builder
   public abstract static class Builder {
-    public abstract Builder setRemoteConfig(Opamp.AgentRemoteConfig remoteConfig);
+    public abstract Builder setRemoteConfig(AgentRemoteConfig remoteConfig);
 
     public abstract MessageData build();
   }