Merge branch '1.13.x' into 1.14.x

Author: marcingrzejszczak

.github/workflows/post-release-workflow.yml

@@ -1,112 +1,28 @@
-name: Post Release Workflow
+name: Post Release Tasks
 
 on:
-  workflow_dispatch: # Enables manual trigger
+  workflow_dispatch:
+    inputs:
+      github_ref_name:
+        description: "Current release tag in this train (e.g., v1.15.3)"
+        required: true
+      previous_ref_name:
+        description: "Previous release tag in this train (e.g., v1.14.8)"
+        required: false
 
 jobs:
-  generate-release-notes:
-    name: Generate Release Notes
+  post_release:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Check out the repository
-        uses: actions/checkout@v3
-
-      - name: Download Changelog Generator
-        run: |
-          curl -L -o github-changelog-generator.jar https://github.com/spring-io/github-changelog-generator/releases/download/v0.0.11/github-changelog-generator.jar
-
-      - name: Generate release notes
-        id: generate_notes
-        run: |
-          java -jar github-changelog-generator.jar \
-            ${GITHUB_REF_NAME#v} \
-            changelog.md \
-            --changelog.repository="${{ github.repository }}" \
-            --github.token="${{ secrets.GITHUB_TOKEN }}"
-
-      - name: Run script to process Markdown file
-        run: python .github/workflows/process_changelog.py
-
-      - name: Update release text
-        run: |
-          echo -e "::Info::Original changelog\n\n"
-          cat changelog.md
-          
-          echo -e "\n\n"
-          echo -e "::Info::Processed changelog\n\n"
-          cat changelog-output.md
-          gh release edit ${{ github.ref_name }} --notes-file changelog-output.md
-        env:
-          GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-
-  close-milestone:
-    name: Close Milestone
-    runs-on: ubuntu-latest
-    needs: generate-release-notes
-    steps:
-      - name: Close milestone
-        run: |
-          # Extract version without 'v' prefix
-          milestone_name=${GITHUB_REF_NAME#v}
-          
-          echo "Closing milestone: $milestone_name"
-          
-          # List milestones and find the ID
-          milestone_id=$(gh api "/repos/${{ github.repository }}/milestones?state=open" \
-            --jq ".[] | select(.title == \"$milestone_name\").number")
-          
-          if [ -z "$milestone_id" ]; then
-            echo "::error::Milestone '$milestone_name' not found"
-            exit 1
-          fi
-          
-          # Close the milestone
-          gh api --method PATCH "/repos/${{ github.repository }}/milestones/$milestone_id" \
-            -f state=closed
-          
-          echo "Successfully closed milestone: $milestone_name"
-        env:
-          GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-
-  notify:
-    name: Send Notifications
-    runs-on: ubuntu-latest
-    needs: close-milestone
-
-    steps:
-      - name: Announce Release on `Spring-Releases` space
-        run: |
-          milestone_name=${GITHUB_REF_NAME#v}
-          curl --location --request POST '${{ secrets.SPRING_RELEASE_GCHAT_WEBHOOK_URL }}' \
-          --header 'Content-Type: application/json' \
-          --data-raw '{ text: "${{ github.event.repository.name }}-announcing ${milestone_name}"}'
-
-      - name: Post on Bluesky
-        env:
-          BSKY_IDENTIFIER: ${{ secrets.BLUESKY_HANDLE }}
-          BSKY_PASSWORD: ${{ secrets.BLUESKY_PASSWORD }}
-        run: |
-          # First get the session token
-          SESSION_TOKEN=$(curl -s -X POST https://bsky.social/xrpc/com.atproto.server.createSession \
-            -H "Content-Type: application/json" \
-            -d "{\"identifier\":\"$BSKY_IDENTIFIER\",\"password\":\"$BSKY_PASSWORD\"}" | \
-            jq -r .accessJwt)
-
-          # Create post content
-          VERSION=${GITHUB_REF_NAME#v}
-          POST_TEXT="${{ github.event.repository.name }} ${VERSION} has been released!\n\nCheck out the changelog: https://github.com/${GITHUB_REPOSITORY}/releases/tag/${GITHUB_REF_NAME}"
-
-          # Create the post
-          curl -X POST https://bsky.social/xrpc/com.atproto.repo.createRecord \
-            -H "Content-Type: application/json" \
-            -H "Authorization: Bearer ${SESSION_TOKEN}" \
-            -d "{
-              \"repo\": \"$BSKY_IDENTIFIER\",
-              \"collection\": \"app.bsky.feed.post\",
-              \"record\": {
-                \"\$type\": \"app.bsky.feed.post\",
-                \"text\": \"$POST_TEXT\",
-                \"createdAt\": \"$(date -u +"%Y-%m-%dT%H:%M:%S.000Z")\"
-              }
-            }"
+      - uses: actions/checkout@v4
+
+      - name: Run Post Release Tasks
+        uses: marcingrzejszczak/[email protected]
+        with:
+          gh_token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
+          github_ref_name: ${{ github.event.inputs.github_ref_name }}
+          previous_ref_name: ${{ github.event.inputs.previous_ref_name }}
+          spring_release_gchat_webhook_url: ${{ secrets.SPRING_RELEASE_GCHAT_WEBHOOK_URL }}
+          bluesky_handle: ${{ secrets.BLUESKY_HANDLE }}
+          bluesky_password: ${{ secrets.BLUESKY_PASSWORD }}

.github/workflows/process_changelog.py

@@ -171,20 +171,23 @@ void shouldTrackPercentilesWhenDynatraceSummaryInstrumentsNotUsed() throws Throw
         DistributionSummary distributionSummary = DistributionSummary.builder("my.ds")
             .publishPercentiles(trackedPercentiles)
             .register(registry);
-        CountDownLatch lttCountDownLatch = new CountDownLatch(1);
         LongTaskTimer longTaskTimer = LongTaskTimer.builder("my.ltt")
             .publishPercentiles(trackedPercentiles)
             .register(registry);
 
         timer.record(Duration.ofMillis(100));
         distributionSummary.record(100);
 
+        CountDownLatch lttCountDownLatch1 = new CountDownLatch(1);
+        CountDownLatch lttCountDownLatch2 = new CountDownLatch(1);
+
         ExecutorService executorService = Executors.newSingleThreadExecutor();
         executorService.submit(() -> longTaskTimer.record(() -> {
             clock.add(Duration.ofMillis(100));
+            lttCountDownLatch1.countDown();
 
             try {
-                assertThat(lttCountDownLatch.await(300, MILLISECONDS)).isTrue();
+                assertThat(lttCountDownLatch2.await(300, MILLISECONDS)).isTrue();
             }
             catch (InterruptedException e) {
                 throw new RuntimeException(e);
@@ -193,9 +196,10 @@ void shouldTrackPercentilesWhenDynatraceSummaryInstrumentsNotUsed() throws Throw
 
         clock.add(dynatraceConfig.step());
 
+        assertThat(lttCountDownLatch1.await(100, MILLISECONDS)).isTrue();
         registry.publish();
         // release long task timer
-        lttCountDownLatch.countDown();
+        lttCountDownLatch2.countDown();
 
         verify(httpClient).send(
                 assertArg((request -> assertThat(request.getEntity()).asString()

implementations/micrometer-registry-dynatrace/src/test/java/io/micrometer/dynatrace/DynatraceMeterRegistryTest.java

@@ -21,6 +21,7 @@ dependencies {
     testImplementation project(":micrometer-test")
 
     testImplementation libs.httpcomponents.client
+    testImplementation 'org.awaitility:awaitility'
 }
 
 java {

micrometer-jetty12/build.gradle

@@ -16,15 +16,19 @@
 package io.micrometer.jetty12.client;
 
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
+import io.micrometer.core.instrument.LongTaskTimer;
 import io.micrometer.core.instrument.observation.DefaultMeterObservationHandler;
 import io.micrometer.observation.ObservationRegistry;
 import io.micrometer.observation.tck.TestObservationRegistry;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.time.Duration;
+
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 
 class JettyClientMetricsWithObservationTest extends JettyClientMetricsTest {
 
@@ -47,13 +51,31 @@ protected void addInstrumentingListener() {
 
     @Test
     void activeTimer(WireMockRuntimeInfo wmRuntimeInfo) throws Exception {
-        stubFor(get("/ok").willReturn(ok()));
+        stubFor(get("/ok").willReturn(ok().withFixedDelay(100)));
+
+        Thread thread = new Thread(() -> {
+            try {
+                httpClient.GET("http://localhost:" + wmRuntimeInfo.getHttpPort() + "/ok");
+            }
+            catch (Exception ex) {
+                throw new RuntimeException(ex);
+            }
+        });
+        thread.start();
+
+        await().atMost(Duration.ofMillis(100))
+            .pollDelay(Duration.ofMillis(10))
+            .pollInterval(Duration.ofMillis(10))
+            .untilAsserted(() -> {
+                LongTaskTimer longTaskTimer = registry.find("jetty.client.requests.active")
+                    .tags("uri", "/ok", "method", "GET")
+                    .longTaskTimer();
+                assertThat(longTaskTimer).isNotNull();
+                assertThat(longTaskTimer.activeTasks()).isOne();
+            });
+
+        thread.join();
 
-        httpClient.GET("http://localhost:" + wmRuntimeInfo.getHttpPort() + "/ok");
-        assertThat(registry.get("jetty.client.requests.active")
-            .tags("uri", "/ok", "method", "GET")
-            .longTaskTimer()
-            .activeTasks()).isOne();
         httpClient.stop();
 
         assertThat(singleRequestLatch.await(10, SECONDS)).isTrue();