fix analytics sink test (#552)
* Update Spring Functions Catalog to 5.0.1-SNAPSHOT * Update Spring Boot to 3.3.1 Update Spring Framework to 6.1.10 * Fix AnalyticsSinkTests * Fix AnalyticsSinkTests * Disable Maven Threads. * Disable Maven Threads.
This commit is contained in:
Corneil du Plessis
committed by
GitHub
GitHub
parent
b2800d3d07
commit
935b0564bc
21
.github/workflows/ci-pr.yml
vendored
21
.github/workflows/ci-pr.yml
vendored
@@ -6,7 +6,7 @@ on:
|
||||
env:
|
||||
MAIN_PATH: 'build-dir'
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
MAVEN_THREADS: 'true'
|
||||
MAVEN_THREADS: 'false'
|
||||
jobs:
|
||||
build:
|
||||
if: github.repository == 'spring-cloud/stream-applications'
|
||||
@@ -84,29 +84,14 @@ jobs:
|
||||
done
|
||||
set +e
|
||||
if [ "$FOLDERS" != "" ]; then
|
||||
echo "::info ::install $FOLDERS and dependents"
|
||||
echo "::debug ::MAVEN:./mvnw $MAVEN_OPTS -amd -pl $FOLDERS install"
|
||||
echo "::notice::install $FOLDERS and dependents"
|
||||
echo "::debug::MAVEN:./mvnw $MAVEN_OPTS -amd -pl $FOLDERS install"
|
||||
./mvnw $MAVEN_OPTS -amd -pl $FOLDERS install
|
||||
RC=$?
|
||||
if ((RC!=0)); then
|
||||
exit $RC
|
||||
fi
|
||||
fi
|
||||
PWD=$(pwd)
|
||||
# Build any applications that was compiled but don't deploy to artifactory.
|
||||
PROCESSORS=$(find ./applications/processor -name target -exec $PWD/parent-dir.sh '{}' \;)
|
||||
SINKS=$(find ./applications/sink -name target -exec $PWD/parent-dir.sh '{}' \;)
|
||||
SOURCES=$(find ./applications/source -name target -exec $PWD/parent-dir.sh '{}' \;)
|
||||
# true as 3rd argument ensures that jars aren't deployed and containers aren't built.
|
||||
for appdir in $PROCESSORS; do
|
||||
./build-app.sh . "./$appdir" true
|
||||
done
|
||||
for appdir in $SOURCES; do
|
||||
./build-app.sh . "./$appdir" true
|
||||
done
|
||||
for appdir in $SINKS; do
|
||||
./build-app.sh . "./$appdir" true
|
||||
done
|
||||
- name: 'Configure: Install Trivy'
|
||||
uses: ./.github/actions/install-trivy
|
||||
- name: 'Action: Trivy scan'
|
||||
|
||||
@@ -19,10 +19,12 @@ package org.springframework.cloud.stream.app.sink.analytics;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
import io.micrometer.core.instrument.Counter;
|
||||
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
|
||||
import io.micrometer.core.instrument.MeterRegistry;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.boot.WebApplicationType;
|
||||
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
|
||||
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.builder.SpringApplicationBuilder;
|
||||
import org.springframework.cloud.fn.consumer.analytics.AnalyticsConsumerConfiguration;
|
||||
@@ -45,17 +47,20 @@ public class AnalyticsSinkTests {
|
||||
TestChannelBinderConfiguration.getCompleteConfiguration(AnalyticsSinkTestApplication.class))
|
||||
.web(WebApplicationType.NONE)
|
||||
.run("--spring.cloud.function.definition=byteArrayTextToString|analyticsConsumer",
|
||||
"--management.defaults.metrics.export.enabled=true",
|
||||
"--analytics.meter-type=counter",
|
||||
"--analytics.name=counter666",
|
||||
"--analytics.amount-expression=payload.length()",
|
||||
"--analytics.tag.expression.foo='bar'")) {
|
||||
|
||||
SimpleMeterRegistry meterRegistry = context.getBean(SimpleMeterRegistry.class);
|
||||
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
|
||||
|
||||
String message = "hello world message";
|
||||
InputDestination source = context.getBean(InputDestination.class);
|
||||
source.send(new GenericMessage<>(message.getBytes(StandardCharsets.UTF_8)));
|
||||
|
||||
Counter counter = meterRegistry.find("counter666").counter();
|
||||
Counter counter = meterRegistry.counter("counter666", "foo", "bar");
|
||||
assertThat(counter).as("counter:counter666").isNotNull();
|
||||
assertThat(counter.count()).isEqualTo(message.length());
|
||||
assertThat(counter.getId().getTag("foo")).isEqualTo("bar");
|
||||
}
|
||||
@@ -63,6 +68,7 @@ public class AnalyticsSinkTests {
|
||||
|
||||
@SpringBootApplication
|
||||
@Import({ AnalyticsConsumerConfiguration.class})
|
||||
@ImportAutoConfiguration({MetricsAutoConfiguration.class})
|
||||
public static class AnalyticsSinkTestApplication {
|
||||
}
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
<properties>
|
||||
<stream-apps-core.version>5.0.1-SNAPSHOT</stream-apps-core.version>
|
||||
<java-functions.version>5.0.0</java-functions.version>
|
||||
<java-functions.version>5.0.1-SNAPSHOT</java-functions.version>
|
||||
<prometheus-rsocket.version>1.5.2</prometheus-rsocket.version>
|
||||
<spring-cloud-dataflow-apps-generator-plugin.version>1.0.14</spring-cloud-dataflow-apps-generator-plugin.version>
|
||||
<spring-cloud-dataflow-apps-docs-plugin.version>1.0.14</spring-cloud-dataflow-apps-docs-plugin.version>
|
||||
|
||||
@@ -35,8 +35,8 @@
|
||||
<nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
|
||||
<disable.nohttp.checks>true</disable.nohttp.checks>
|
||||
<spring-javaformat-checkstyle.version>0.0.35</spring-javaformat-checkstyle.version>
|
||||
<spring-boot.version>3.3.0</spring-boot.version>
|
||||
<spring.version>6.1.8</spring.version>
|
||||
<spring-boot.version>3.3.1</spring-boot.version>
|
||||
<spring.version>6.1.10</spring.version>
|
||||
<spring-cloud.version>2023.0.2</spring-cloud.version>
|
||||
<spring-cloud-starters.version>4.1.2</spring-cloud-starters.version>
|
||||
<spring-cloud-function.version>4.1.2</spring-cloud-function.version>
|
||||
|
||||
Reference in New Issue
Block a user