Adjust properites + metadata

Author: skjolber

azure/logbook-spring-boot-autoconfigure-azure/src/main/java/no/entur/logging/cloud/azure/logbook/spring/LogbookAzureAutoConfiguration.java

@@ -1,13 +1,23 @@
 package no.entur.logging.cloud.azure.logbook.spring;
 
 import no.entur.logging.cloud.spring.logbook.LogbookLoggingAutoConfiguration;
+import no.entur.logging.cloud.spring.logbook.LogbookLoggingCloudProperties;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
 @Configuration
 @AutoConfigureBefore(LogbookLoggingAutoConfiguration.class)
-@PropertySource(value = "classpath:logbook.azure.properties", ignoreResourceNotFound = false)
 public class LogbookAzureAutoConfiguration {
 
+    @Bean
+    public LogbookLoggingCloudProperties logbookCloudConfiguration() {
+        LogbookLoggingCloudProperties c = new LogbookLoggingCloudProperties();
+        // subtract a few kb for headers and other wrapping
+        c.setMaxBodySize(16384 - 2 * 1024);
+        c.setMaxSize(16384);
+        return c;
+    }
+
 }

azure/logbook-spring-boot-autoconfigure-azure/src/main/resources/logbook.azure.properties

@@ -2,12 +2,24 @@
 
 import no.entur.logging.cloud.spring.grpc.ecosystem.RequestResponseGrpcEcosystemAutoConfiguration;
 import no.entur.logging.cloud.spring.rr.grpc.AbstractRequestResponseGrpcSinkAutoConfiguration;
+import no.entur.logging.cloud.spring.rr.grpc.GrpcLoggingCloudProperties;
+import no.entur.logging.cloud.spring.rr.grpc.RequestResponseGrpcAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
 @Configuration
-@PropertySource(value = "classpath:request-response.azure.properties", ignoreResourceNotFound = false)
-@AutoConfigureBefore(RequestResponseGrpcEcosystemAutoConfiguration.class)
-public class RequestResponseAzureGrpcEcosystemAutoConfiguration extends AbstractRequestResponseGrpcSinkAutoConfiguration {
-}
+@AutoConfigureBefore(RequestResponseGrpcAutoConfiguration.class)
+public class RequestResponseAzureGrpcEcosystemAutoConfiguration {
+
+    @Bean
+    public GrpcLoggingCloudProperties grpcLoggingCloudProperties() {
+        GrpcLoggingCloudProperties c = new GrpcLoggingCloudProperties();
+        // subtract a few kb for headers and other wrapping
+        c.setMaxBodySize(16384 - 2 * 1024);
+        c.setMaxSize(16384);
+        return c;
+    }
+
+}

azure/request-response-spring-boot-starter-azure-grpc-ecosystem/src/main/java/no/entur/logging/cloud/azure/spring/grpc/ecosystem/RequestResponseAzureGrpcEcosystemAutoConfiguration.java

@@ -2,13 +2,24 @@
 
 import no.entur.logging.cloud.spring.grpc.lognet.RequestResponseGrpcLognetAutoConfiguration;
 import no.entur.logging.cloud.spring.rr.grpc.AbstractRequestResponseGrpcSinkAutoConfiguration;
+import no.entur.logging.cloud.spring.rr.grpc.GrpcLoggingCloudProperties;
+import no.entur.logging.cloud.spring.rr.grpc.RequestResponseGrpcAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
 @Configuration
-@PropertySource(value = "classpath:request-response.azure.properties", ignoreResourceNotFound = false)
-@AutoConfigureBefore(RequestResponseGrpcLognetAutoConfiguration.class)
-public class RequestResponseAzureGrpcLognetAutoConfiguration extends AbstractRequestResponseGrpcSinkAutoConfiguration {
+@AutoConfigureBefore(RequestResponseGrpcAutoConfiguration.class)
+public class RequestResponseAzureGrpcLognetAutoConfiguration {
+
+    @Bean
+    public GrpcLoggingCloudProperties grpcLoggingCloudProperties() {
+        GrpcLoggingCloudProperties c = new GrpcLoggingCloudProperties();
+        // subtract a few kb for headers and other wrapping
+        c.setMaxBodySize(16384 - 2 * 1024);
+        c.setMaxSize(16384);
+        return c;
+    }
 
 }

azure/request-response-spring-boot-starter-azure-grpc-ecosystem/src/main/resources/request-response.azure.properties

@@ -1,13 +1,21 @@
 package no.entur.logging.cloud.spring.logbook.gcp;
 
 import no.entur.logging.cloud.spring.logbook.LogbookLoggingAutoConfiguration;
+import no.entur.logging.cloud.spring.logbook.LogbookLoggingCloudProperties;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
 
 @Configuration
 @AutoConfigureBefore(LogbookLoggingAutoConfiguration.class)
-@PropertySource(value = "classpath:logbook.gcp.properties", ignoreResourceNotFound = false)
 public class LogbookGcpAutoConfiguration {
 
+    @Bean
+    public LogbookLoggingCloudProperties logbookCloudConfiguration() {
+        LogbookLoggingCloudProperties c = new LogbookLoggingCloudProperties();
+        // subtract a few kb for headers and other wrapping
+        c.setMaxBodySize(131072 - 2 * 1024);
+        c.setMaxSize(131072);
+        return c;
+    }
 }

azure/request-response-spring-boot-starter-azure-grpc-lognet/src/main/java/no/entur/logging/cloud/azure/spring/grpc/lognet/RequestResponseAzureGrpcLognetAutoConfiguration.java

@@ -2,13 +2,23 @@
 
 import no.entur.logging.cloud.spring.grpc.ecosystem.RequestResponseGrpcEcosystemAutoConfiguration;
 import no.entur.logging.cloud.spring.rr.grpc.AbstractRequestResponseGrpcSinkAutoConfiguration;
+import no.entur.logging.cloud.spring.rr.grpc.GrpcLoggingCloudProperties;
 import no.entur.logging.cloud.spring.rr.grpc.RequestResponseGrpcAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
 @Configuration
-@PropertySource(value = "classpath:request-response.gcp.properties", ignoreResourceNotFound = false)
 @AutoConfigureBefore(RequestResponseGrpcAutoConfiguration.class)
-public class RequestResponseGcpGrpcEcosystemAutoConfiguration extends AbstractRequestResponseGrpcSinkAutoConfiguration {
+public class RequestResponseGcpGrpcEcosystemAutoConfiguration {
+
+    @Bean
+    public GrpcLoggingCloudProperties grpcLoggingCloudProperties() {
+        GrpcLoggingCloudProperties c = new GrpcLoggingCloudProperties();
+        // subtract a few kb for headers and other wrapping
+        c.setMaxBodySize(131072 - 2 * 1024);
+        c.setMaxSize(131072);
+        return c;
+    }
 }