Added support of @MeterTag annotation on method level

.circleci/config.yml

@@ -1,31 +1,38 @@
 version: 2.1
 
 executors:
+  circle-jdk23-executor:
+    working_directory: ~/micrometer
+    environment:
+      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
+    resource_class: medium+
+    docker:
+      - image: cimg/openjdk:23.0.1
   circle-jdk-executor:
     working_directory: ~/micrometer
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     resource_class: medium+
     docker:
-      - image: cimg/openjdk:21.0.2
+      - image: cimg/openjdk:21.0.5
   circle-jdk17-executor:
     working_directory: ~/micrometer
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     resource_class: medium+
     docker:
-      - image: cimg/openjdk:17.0.11
+      - image: cimg/openjdk:17.0.13
   circle-jdk11-executor:
     working_directory: ~/micrometer
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     resource_class: medium+
     docker:
-      - image: cimg/openjdk:11.0.22
+      - image: cimg/openjdk:11.0.25
   machine-executor:
     working_directory: ~/micrometer
     machine:
-      image: ubuntu-2204:2024.05.1
+      image: ubuntu-2404:2024.08.1
 
 commands:
   gradlew-build:
@@ -60,6 +67,11 @@ commands:
           path: ~/micrometer/test-results/
 
 jobs:
+  build-jdk23:
+    executor: circle-jdk23-executor
+    steps:
+      - gradlew-build
+
   build:
     executor: circle-jdk-executor
     steps:
@@ -107,13 +119,17 @@ workflows:
       - build
       - build-jdk11
       - build-jdk17
+      - build-jdk23
       - concurrency-tests
       - docker-tests
       - deploy:
+          context:
+            - deploy
           requires:
             - build
             - build-jdk11
             - build-jdk17
+            - build-jdk23
             - concurrency-tests
             - docker-tests
           filters:
@@ -141,6 +157,12 @@ workflows:
               ignore: /.*/
             tags:
               only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
+      - build-jdk23:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
       - concurrency-tests:
           filters:
             branches:
@@ -154,10 +176,13 @@ workflows:
             tags:
               only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
       - deploy:
+          context:
+            - deploy
           requires:
             - build
             - build-jdk11
             - build-jdk17
+            - build-jdk23
             - concurrency-tests
             - docker-tests
           filters:

.github/dco.yml

@@ -0,0 +1,2 @@
+require:
+  members: false

.github/dependabot.yml

@@ -26,8 +26,8 @@ updates:
     directory: "/"
     schedule:
       interval: monthly
-    target-branch: "1.12.x"
-    milestone: 211
+    target-branch: "1.13.x"
+    milestone: 233
     ignore:
       # metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
       # in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
@@ -43,8 +43,8 @@ updates:
     directory: "/"
     schedule:
       interval: monthly
-    target-branch: "1.13.x"
-    milestone: 233
+    target-branch: "1.14.x"
+    milestone: 250
     ignore:
       # metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
       # in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.

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

@@ -0,0 +1,112 @@
+name: Post Release Workflow
+
+on:
+  workflow_dispatch: # Enables manual trigger
+
+jobs:
+  generate-release-notes:
+    name: Generate Release Notes
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out the repository
+        uses: actions/checkout@v4
+
+      - 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")\"
+              }
+            }"

.github/workflows/process_changelog.py

@@ -0,0 +1,148 @@
+import re
+import subprocess
+
+input_file = "changelog.md"
+output_file = "changelog-output.md"
+
+def fetch_test_and_optional_dependencies():
+    # Fetch the list of all subprojects
+    result = subprocess.run(
+        ["./gradlew", "projects"],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        text=True,
+    )
+    subprojects = []
+    for line in result.stdout.splitlines():
+        match = re.match(r".*Project (':.+')", line)
+        if match:
+            subprojects.append(match.group(1).strip("'"))
+
+    print(f"Found the following subprojects\n\n {subprojects}\n\n")
+    test_optional_dependencies = set()
+    implementation_dependencies = set()
+
+    print("Will fetch non transitive dependencies for all subprojects...")
+    # Run dependencies task for all subprojects in a single Gradle command
+    if subprojects:
+        dependencies_command = ["./gradlew"] + [f"{subproject}:dependencies" for subproject in subprojects]
+        result = subprocess.run(
+            dependencies_command,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+        )
+        in_test_section = False
+        in_optional_section = False
+        in_implementation_section = False
+
+        for line in result.stdout.splitlines():
+            if "project :" in line:
+                continue
+
+            # Detect gradle plugin
+            if "classpath" in line:
+                in_optional_section = True
+                continue
+
+            # Detect test dependencies section
+            if "testCompileClasspath" in line or "testImplementation" in line:
+                in_test_section = True
+                continue
+            if "runtimeClasspath" in line or line.strip() == "":
+                in_test_section = False
+
+            # Detect optional dependencies section
+            if "compileOnly" in line:
+                in_optional_section = True
+                continue
+            if line.strip() == "":
+                in_optional_section = False
+
+            # Detect implementation dependencies section
+            if "implementation" in line or "compileClasspath" in line:
+                in_implementation_section = True
+                continue
+            if line.strip() == "":
+                in_implementation_section = False
+
+            # Parse dependencies explicitly declared with +--- or \---
+            match = re.match(r"[\\+|\\\\]--- ([^:]+):([^:]+):([^ ]+)", line)
+            if match:
+                group_id, artifact_id, _ = match.groups()
+                dependency_key = f"{group_id}:{artifact_id}"
+                if in_test_section or in_optional_section:
+                    test_optional_dependencies.add(dependency_key)
+                if in_implementation_section:
+                    implementation_dependencies.add(dependency_key)
+
+    # Remove dependencies from test/optional if they are also in implementation
+    final_exclusions = test_optional_dependencies - implementation_dependencies
+
+    print(f"Dependencies in either test or optional scope to be excluded from changelog processing:\n\n{final_exclusions}\n\n")
+    return final_exclusions
+
+def process_dependency_upgrades(lines, exclude_dependencies):
+    dependencies = {}
+    regex = re.compile(r"- Bump (.+?) from ([\d\.]+) to ([\d\.]+) \[(#[\d]+)\]\((.+)\)")
+    for line in lines:
+        match = regex.match(line)
+        if match:
+            unit, old_version, new_version, pr_number, link = match.groups()
+            if unit not in exclude_dependencies:
+                if unit not in dependencies:
+                    dependencies[unit] = {"lowest": old_version, "highest": new_version, "pr_number": pr_number, "link": link}
+                else:
+                    dependencies[unit]["lowest"] = min(dependencies[unit]["lowest"], old_version)
+                    dependencies[unit]["highest"] = max(dependencies[unit]["highest"], new_version)
+    sorted_units = sorted(dependencies.keys())
+    return [f"- Bump {unit} from {dependencies[unit]['lowest']} to {dependencies[unit]['highest']} [{dependencies[unit]['pr_number']}]({dependencies[unit]['link']})" for unit in sorted_units]
+
+with open(input_file, "r") as file:
+    lines = file.readlines()
+
+# Fetch test and optional dependencies from all projects
+print("Fetching test and optional dependencies from the project and its subprojects...")
+exclude_dependencies = fetch_test_and_optional_dependencies()
+
+# Step 1: Copy all content until the hammer line
+header = []
+dependency_lines = []
+footer = []
+in_dependency_section = False
+
+print("Parsing changelog until the dependency upgrades section...")
+
+for line in lines:
+    if line.startswith("## :hammer: Dependency Upgrades"):
+        in_dependency_section = True
+        header.append(line)
+        header.append("\n")
+        break
+    header.append(line)
+
+print("Parsing dependency upgrade section...")
+
+# Step 2: Parse dependency upgrades
+if in_dependency_section:
+    for line in lines[len(header):]:
+        if line.startswith("## :heart: Contributors"):
+            break
+        dependency_lines.append(line)
+
+print("Parsing changelog to find everything after the dependency upgrade section...")
+# Find the footer starting from the heart line
+footer_start_index = next((i for i, line in enumerate(lines) if line.startswith("## :heart: Contributors")), None)
+if footer_start_index is not None:
+    footer = lines[footer_start_index:]
+
+print("Processing the dependency upgrades section...")
+processed_dependencies = process_dependency_upgrades(dependency_lines, exclude_dependencies)
+
+print("Writing output...")
+# Step 3: Write the output file
+with open(output_file, "w") as file:
+    file.writelines(header)
+    file.writelines(f"{line}\n" for line in processed_dependencies)
+    file.writelines("\n")
+    file.writelines(footer)

.gitignore

@@ -18,3 +18,8 @@ bin/
 .vscode
 .DS_Store
 .java-version
+
+# jcstress
+generated/
+results/
+jcstress-results-*.bin.gz