diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 21746752..e4be09c1 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -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' diff --git a/applications/sink/analytics-sink/src/test/java/org/springframework/cloud/stream/app/sink/analytics/AnalyticsSinkTests.java b/applications/sink/analytics-sink/src/test/java/org/springframework/cloud/stream/app/sink/analytics/AnalyticsSinkTests.java index d27a7341..c218e7e0 100644 --- a/applications/sink/analytics-sink/src/test/java/org/springframework/cloud/stream/app/sink/analytics/AnalyticsSinkTests.java +++ b/applications/sink/analytics-sink/src/test/java/org/springframework/cloud/stream/app/sink/analytics/AnalyticsSinkTests.java @@ -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 { } diff --git a/applications/stream-applications-core/pom.xml b/applications/stream-applications-core/pom.xml index efde66ab..ca7826a5 100644 --- a/applications/stream-applications-core/pom.xml +++ b/applications/stream-applications-core/pom.xml @@ -17,7 +17,7 @@ 5.0.1-SNAPSHOT - 5.0.0 + 5.0.1-SNAPSHOT 1.5.2 1.0.14 1.0.14 diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml index e465a5b1..a225eeef 100644 --- a/stream-applications-build/pom.xml +++ b/stream-applications-build/pom.xml @@ -35,8 +35,8 @@ 0.0.10 true 0.0.35 - 3.3.0 - 6.1.8 + 3.3.1 + 6.1.10 2023.0.2 4.1.2 4.1.2