Fix egg logging and make sure PROD doesn't drop the database. (#122)

* WIP

* Fix logging issues.

---------

Co-authored-by: Ben Evans <benjamin.john.evans@gmail.com>

Author: aslicerh

events/src/main/java/com/redhat/runtimes/inventory/events/ArchiveAnnouncement.java

@@ -43,7 +43,7 @@ public class ArchiveAnnouncement {
 
   public ArchiveAnnouncement() {}
 
-  // The is_runtimes  field in the platform_metadata in stage
+  // For egg uploads, we identify them via the is_runtimes field in the platform_metadata
   public boolean isRuntimes() {
     if (platformMetadata == null) {
       return false;
@@ -52,6 +52,19 @@ public boolean isRuntimes() {
     return isRuntimes == "true" ? true : false;
   }
 
+  // For egg we need to look in the platform_metadata for the URL
+  public String getUrl() {
+    if (platformMetadata == null) {
+      return url;
+    }
+    return String.valueOf(platformMetadata.get("url"));
+  }
+
+  @JsonProperty("url")
+  public void setUrl(String url) {
+    this.url = url;
+  }
+
   ////////////////////////////////////////////////////////////////////////
 
   @JsonProperty("version")
@@ -114,16 +127,6 @@ public void setRequestId(String requestId) {
     this.requestId = requestId;
   }
 
-  @JsonProperty("url")
-  public String getUrl() {
-    return url;
-  }
-
-  @JsonProperty("url")
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
   @JsonProperty("content_type")
   public String getContentType() {
     return contentType;

events/src/main/java/com/redhat/runtimes/inventory/events/EventConsumer.java

@@ -85,7 +85,7 @@ public CompletionStage<Void> processMainFlow(Message<String> message) {
       // Parse JSON using Jackson
       var announce = jsonParser.fromJsonString(payload);
       if (announce.getContentType().equals(VALID_CONTENT_TYPE)) {
-        Log.infof("Processing our Kafka message %s", payload);
+        Log.debugf("Processing our Kafka message %s", payload);
 
         // Get data back from S3
         Log.debugf("Processed message URL: %s", announce.getUrl());
@@ -148,9 +148,8 @@ public CompletionStage<Void> processEggFlow(Message<String> message) {
 
       // Parse JSON using Jackson
       var announce = jsonParser.fromJsonString(payload);
-      // FIXME
       if (VALID_CONTENT_TYPE.equals(announce.getContentType()) || announce.isRuntimes()) {
-        Log.infof("Processing our Kafka message from egg %s", payload);
+        Log.debugf("Processing our Kafka message from egg %s", payload);
 
         var url = announce.getUrl();
         // FIXME I think that we'll need to do more JSON spelunking to get the S3 URL

events/src/main/resources/application.properties

@@ -27,24 +27,16 @@ mp.messaging.incoming.egg.connector=smallrye-kafka
 mp.messaging.incoming.egg.topic=platform.inventory.events
 mp.messaging.incoming.egg.group.id=runtimes-java-general
 
-# configure your datasource
-#quarkus.datasource.db-kind=postgresql
-#quarkus.datasource.username=postgres
-#quarkus.datasource.password=postgres
-#quarkus.datasource.jdbc.url=jdbc:postgresql://127.0.0.1:5432/runtimes
-#quarkus.datasource.jdbc.driver=io.opentelemetry.instrumentation.jdbc.OpenTelemetryDriver
-
 # Verbose logging of SQL statements - disable in production
 quarkus.hibernate-orm.log.sql=false
 quarkus.hibernate-orm.dialect=org.hibernate.dialect.PostgreSQLDialect
 quarkus.hibernate-orm.physical-naming-strategy=com.redhat.runtimes.inventory.models.SnakeCasePhysicalNamingStrategy
 
-# Do we need this in staging?
+# Do we need this only in staging?
 quarkus.flyway.migrate-at-start=true
-# Flyway must NOT clean the DB when the 'prod' profile is active ?
-%stage.quarkus.flyway.clean-at-start=true
-# FIXME: Does this option allow us to change the 1.0.0 schema?
-#%test.quarkus.flyway.migrate-at-start=true
+# Flyway must NOT drop & recreate the DB when the 'prod' profile is active
+%stage.quarkus.flyway.clean-at-start=false
+%prod.quarkus.flyway.clean-at-start=false
 
 %stage.quarkus.hibernate-orm.database.generation=none
 %stage.quarkus.hibernate-orm.sql-load-script=no-file
@@ -56,7 +48,7 @@ quarkus.http.access-log.category=access_log
 quarkus.http.access-log.pattern=combined
 quarkus.log.category."com.redhat.cloud.notifications".level=INFO
 
-%test.quarkus.http.access-log.category=info
+%prod.quarkus.http.access-log.category=info
 
 # IT User service
 # these entries are needed because of a bug in quarkus: https://github.com/quarkusio/quarkus/issues/8384
@@ -86,7 +78,8 @@ quarkus.log.cloudwatch.log-group=placeholder
 quarkus.log.cloudwatch.access-key-id=placeholder
 quarkus.log.cloudwatch.access-key-secret=placeholder
 
-quarkus.log.category."com.redhat.cloud.notifications.health.KafkaConsumedTotalChecker".level=DEBUG
+%stage.quarkus.log.category."com.redhat.cloud.notifications.health.KafkaConsumedTotalChecker".level=DEBUG
+%prod.quarkus.log.category."com.redhat.cloud.notifications.health.KafkaConsumedTotalChecker".level=INFO
 
 quarkus.rest-client.ob.url=https://bridge.acme.org
 quarkus.rest-client.kc.url=https://keycloak.acme.org

rest/src/main/resources/application.properties

@@ -24,7 +24,7 @@ quarkus.http.access-log.category=access_log
 quarkus.http.access-log.pattern=combined
 quarkus.log.category."com.redhat.cloud.notifications".level=INFO
 
-%test.quarkus.http.access-log.category=info
+%prod.quarkus.http.access-log.category=info
 
 # IT User service
 # these entries are needed because of a bug in quarkus: https://github.com/quarkusio/quarkus/issues/8384
@@ -54,7 +54,8 @@ quarkus.log.cloudwatch.log-group=placeholder
 quarkus.log.cloudwatch.access-key-id=placeholder
 quarkus.log.cloudwatch.access-key-secret=placeholder
 
-quarkus.log.category."com.redhat.cloud.notifications.health.KafkaConsumedTotalChecker".level=DEBUG
+%stage.quarkus.log.category."com.redhat.cloud.notifications.health.KafkaConsumedTotalChecker".level=DEBUG
+%prod.quarkus.log.category."com.redhat.cloud.notifications.health.KafkaConsumedTotalChecker".level=INFO
 
 quarkus.rest-client.ob.url=https://bridge.acme.org
 quarkus.rest-client.kc.url=https://keycloak.acme.org