Remove discovery and reporting-client from sample & skeleton

CHANGES

@@ -15,6 +15,11 @@ Platform 3.27
     package private configuration attributes. The configuration classes
     and their configuration getters and setters must be made public.
 
+* Sample and skeleton servers
+
+  We removed discovery and switched from reporting-client to reporting-prometheus
+  in both the sample and skeleton servers.
+
 * Library Upgrades
 
   - ByteBuddy to 1.15.11 (was 1.12.9)

jmx/pom.xml

@@ -24,7 +24,7 @@
 
         <dependency>
             <groupId>com.proofpoint.platform</groupId>
-            <artifactId>discovery</artifactId>
+            <artifactId>node</artifactId>
         </dependency>
 
         <dependency>

sample-server/etc/config.properties

@@ -1,3 +1 @@
 node.environment=test
-testing.discovery.static=true
-service-balancer.reporting.uri=https://pulse-int-ingest.lab.ppops.net

sample-server/pom.xml

@@ -79,11 +79,6 @@
             <artifactId>bootstrap</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.proofpoint.platform</groupId>
-            <artifactId>discovery</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.proofpoint.platform</groupId>
             <artifactId>log</artifactId>
@@ -116,7 +111,7 @@
 
         <dependency>
             <groupId>com.proofpoint.platform</groupId>
-            <artifactId>reporting-client</artifactId>
+            <artifactId>reporting-prometheus</artifactId>
         </dependency>
 
         <dependency>

sample-server/src/main/java/com/proofpoint/platform/sample/Main.java

@@ -17,8 +17,6 @@
 
 import com.google.inject.Injector;
 import com.proofpoint.audit.AuditLogModule;
-import com.proofpoint.discovery.client.DiscoveryModule;
-import com.proofpoint.discovery.client.announce.Announcer;
 import com.proofpoint.http.server.HttpServerModule;
 import com.proofpoint.jaxrs.JaxrsModule;
 import com.proofpoint.jmx.JmxHttpModule;
@@ -27,8 +25,8 @@
 import com.proofpoint.log.LogJmxModule;
 import com.proofpoint.log.Logger;
 import com.proofpoint.node.NodeModule;
-import com.proofpoint.reporting.ReportingClientModule;
 import com.proofpoint.reporting.ReportingModule;
+import com.proofpoint.reporting.ReportingPrometheusModule;
 import org.weakref.jmx.guice.MBeanModule;
 
 import static com.proofpoint.bootstrap.Bootstrap.bootstrapApplication;
@@ -47,7 +45,6 @@ public static void main(String[] args)
             Injector injector = bootstrapApplication("sample-server")
                     .withModules(
                             new NodeModule(),
-                            new DiscoveryModule(),
                             new HttpServerModule(),
                             new JsonModule(),
                             new JaxrsModule(),
@@ -57,12 +54,10 @@ public static void main(String[] args)
                             new LogJmxModule(),
                             new AuditLogModule(),
                             new ReportingModule(),
-                            new ReportingClientModule(),
+                            new ReportingPrometheusModule(),
                             new MainModule()
                     )
                     .initialize();
-
-            injector.getInstance(Announcer.class).start();
         }
         catch (Throwable e) {
             log.error(e);

sample-server/src/main/java/com/proofpoint/platform/sample/MainModule.java

@@ -22,7 +22,6 @@
 import com.google.inject.Scopes;
 
 import static com.proofpoint.configuration.ConfigBinder.bindConfig;
-import static com.proofpoint.discovery.client.DiscoveryBinder.discoveryBinder;
 import static com.proofpoint.jaxrs.JaxrsBinder.jaxrsBinder;
 import static com.proofpoint.reporting.HealthBinder.healthBinder;
 import static com.proofpoint.reporting.ReportBinder.reportBinder;
@@ -43,8 +42,6 @@ public void configure(Binder binder)
         jaxrsBinder(binder).bind(PersonResource.class).withApplicationPrefix();
 
         bindConfig(binder).bind(StoreConfig.class);
-
-        discoveryBinder(binder).bindHttpAnnouncement("person");
     }
 
     @Provides

skeleton-server/etc/config.properties

@@ -1,5 +1,3 @@
 node.environment=test
-testing.discovery.static=true
-service-balancer.reporting.uri=https://pulse-int-ingest.lab.ppops.net
 http-server.http.enabled=true
 http-server.https.enabled=false

skeleton-server/pom.xml

@@ -49,11 +49,6 @@
             <artifactId>bootstrap</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.proofpoint.platform</groupId>
-            <artifactId>discovery</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.proofpoint.platform</groupId>
             <artifactId>log</artifactId>
@@ -86,7 +81,7 @@
 
         <dependency>
             <groupId>com.proofpoint.platform</groupId>
-            <artifactId>reporting-client</artifactId>
+            <artifactId>reporting-prometheus</artifactId>
         </dependency>
 
         <dependency>

skeleton-server/src/main/java/com/proofpoint/platform/skeleton/Main.java

@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.inject.Injector;
 import com.proofpoint.audit.AuditLogModule;
-import com.proofpoint.discovery.client.DiscoveryModule;
 import com.proofpoint.discovery.client.announce.Announcer;
 import com.proofpoint.http.server.HttpServerModule;
 import com.proofpoint.jaxrs.JaxrsModule;
@@ -28,8 +27,8 @@
 import com.proofpoint.log.LogJmxModule;
 import com.proofpoint.log.Logger;
 import com.proofpoint.node.NodeModule;
-import com.proofpoint.reporting.ReportingClientModule;
 import com.proofpoint.reporting.ReportingModule;
+import com.proofpoint.reporting.ReportingPrometheusModule;
 import org.weakref.jmx.guice.MBeanModule;
 
 import static com.proofpoint.bootstrap.Bootstrap.bootstrapApplication;
@@ -48,7 +47,6 @@ public static void main(String[] args)
             Injector injector = bootstrapApplication("skeleton")
                     .withModules(
                             new NodeModule(),
-                            new DiscoveryModule(),
                             new HttpServerModule(),
                             new JsonModule(),
                             new JaxrsModule(),
@@ -58,7 +56,7 @@ public static void main(String[] args)
                             new LogJmxModule(),
                             new AuditLogModule(),
                             new ReportingModule(),
-                            new ReportingClientModule(),
+                            new ReportingPrometheusModule(),
                             new MainModule()
                     )
                     .withApplicationDefaults(ImmutableMap.<String, String>builder()

skeleton-server/src/main/java/com/proofpoint/platform/skeleton/MainModule.java

@@ -18,8 +18,6 @@
 import com.google.inject.Binder;
 import com.google.inject.Module;
 
-import static com.proofpoint.discovery.client.DiscoveryBinder.discoveryBinder;
-
 public class MainModule
         implements Module
 {
@@ -28,7 +26,5 @@ public void configure(Binder binder)
     {
         binder.requireExplicitBindings();
         binder.disableCircularProxies();
-
-        discoveryBinder(binder).bindHttpAnnouncement("skeleton");
     }
 }