Skip to content

Commit 6041789

Browse files
jkemmingjkemming
committed
Merge remote-tracking branch 'upstream/main' into micrometer-metricsgh-1441 
2 parents 12548ef + c69180d commit 6041789

File tree

916 files changed

+52738
-10687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

916 files changed

+52738
-10687
lines changed

Diff for: ‎.circleci/config.yml

+9-25
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,27 @@ executors:
55
working_directory: ~/micrometer
66
environment:
77
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
8+
resource_class: medium+
89
docker:
9-
- image: cimg/openjdk:20.0.1
10+
- image: cimg/openjdk:21.0.2
1011
circle-jdk17-executor:
1112
working_directory: ~/micrometer
1213
environment:
1314
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
15+
resource_class: medium+
1416
docker:
15-
- image: cimg/openjdk:17.0.7
16-
circle-jdk8-executor:
17-
working_directory: ~/micrometer
18-
environment:
19-
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
20-
docker:
21-
- image: cimg/openjdk:8.0.362
17+
- image: cimg/openjdk:17.0.10
2218
circle-jdk11-executor:
2319
working_directory: ~/micrometer
2420
environment:
2521
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
22+
resource_class: medium+
2623
docker:
27-
- image: cimg/openjdk:11.0.19
24+
- image: cimg/openjdk:11.0.22
2825
machine-executor:
2926
working_directory: ~/micrometer
3027
machine:
31-
image: ubuntu-2204:2023.04.2
28+
image: ubuntu-2204:2024.01.1
3229

3330
commands:
3431
gradlew-build:
@@ -69,11 +66,7 @@ jobs:
6966
- gradlew-build
7067
- run: ./gradlew shenandoahTest
7168
- run: ./gradlew zgcTest
72-
73-
build-jdk8:
74-
executor: circle-jdk8-executor
75-
steps:
76-
- gradlew-build
69+
- run: ./gradlew zgcGenerationalTest
7770

7871
build-jdk11:
7972
executor: circle-jdk11-executor
@@ -97,7 +90,7 @@ jobs:
9790
- checkout
9891
- restore_cache:
9992
key: gradle-dependencies-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum ".circleci/config.yml" }}
100-
- deploy:
93+
- run:
10194
name: Deployment
10295
command: sh ./gradle/deploy.sh
10396

@@ -106,14 +99,12 @@ workflows:
10699
build_prs_deploy_snapshots:
107100
jobs:
108101
- build
109-
- build-jdk8
110102
- build-jdk11
111103
- build-jdk17
112104
- docker-tests
113105
- deploy:
114106
requires:
115107
- build
116-
- build-jdk8
117108
- build-jdk11
118109
- build-jdk17
119110
- docker-tests
@@ -130,12 +121,6 @@ workflows:
130121
ignore: /.*/
131122
tags:
132123
only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
133-
- build-jdk8:
134-
filters:
135-
branches:
136-
ignore: /.*/
137-
tags:
138-
only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
139124
- build-jdk11:
140125
filters:
141126
branches:
@@ -157,7 +142,6 @@ workflows:
157142
- deploy:
158143
requires:
159144
- build
160-
- build-jdk8
161145
- build-jdk11
162146
- build-jdk17
163147
- docker-tests

Diff for: ‎.github/ISSUE_TEMPLATE/bug_report.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Bug report
33
about: Report a bug in Micrometer
44
title: ''
5-
labels: bug
5+
labels: 'waiting-for-triage'
66
assignees: ''
77

88
---
@@ -12,7 +12,7 @@ A clear and concise description of what the bug is.
1212

1313
**Environment**
1414
<!-- In what environment did the bug happen? -->
15-
<!-- If you are not using the latest patch version of a supported Micrometer line, please upgrade to see if the issue happens on the latest patch version for that line (e.g. 1.6.x). See https://micrometer.io/docs/support -->
15+
<!-- If you are not using the latest patch version of a supported Micrometer line, please upgrade to see if the issue happens on the latest patch version for that line (e.g. 1.6.x). See https://micrometer.io/support/ -->
1616
- Micrometer version [e.g. 1.7.1]
1717
- Micrometer registry [e.g. prometheus]
1818
- OS: [e.g. macOS]

Diff for: ‎.github/ISSUE_TEMPLATE/enhancement-request.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Enhancement request
33
about: Request an enhancement for Micrometer
44
title: ''
5-
labels: enhancement
5+
labels: 'waiting-for-triage'
66
assignees: ''
77

88
---

Diff for: ‎.github/dependabot.yml

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
target-branch: "1.9.x" # oldest supported branch
6+
schedule:
7+
interval: "weekly"
8+
- package-ecosystem: gradle
9+
directory: "/"
10+
schedule:
11+
interval: monthly
12+
target-branch: "1.9.x"
13+
milestone: 136
14+
ignore:
15+
# metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
16+
# in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
17+
# <=1.5.11 or 1.5.18 doesn't break with Micrometer, but open metrics won't be correct necessarily.
18+
- dependency-name: "com.netflix.hystrix:hystrix-core"
19+
# only upgrade patch versions
20+
- dependency-name: "*"
21+
update-types:
22+
- version-update:semver-major
23+
- version-update:semver-minor
24+
open-pull-requests-limit: 10
25+
- package-ecosystem: gradle
26+
directory: "/"
27+
schedule:
28+
interval: monthly
29+
target-branch: "1.11.x"
30+
milestone: 206
31+
ignore:
32+
# metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
33+
# in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
34+
# <=1.5.11 or 1.5.18 doesn't break with Micrometer, but open metrics won't be correct necessarily.
35+
- dependency-name: "com.netflix.hystrix:hystrix-core"
36+
# only upgrade patch versions
37+
- dependency-name: "*"
38+
update-types:
39+
- version-update:semver-major
40+
- version-update:semver-minor
41+
open-pull-requests-limit: 10
42+
- package-ecosystem: gradle
43+
directory: "/"
44+
schedule:
45+
interval: monthly
46+
target-branch: "1.12.x"
47+
milestone: 211
48+
ignore:
49+
# metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
50+
# in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
51+
# <=1.5.11 or 1.5.18 doesn't break with Micrometer, but open metrics won't be correct necessarily.
52+
- dependency-name: "com.netflix.hystrix:hystrix-core"
53+
# only upgrade patch versions
54+
- dependency-name: "*"
55+
update-types:
56+
- version-update:semver-major
57+
- version-update:semver-minor
58+
open-pull-requests-limit: 10
59+
- package-ecosystem: gradle
60+
directory: "/"
61+
schedule:
62+
interval: monthly
63+
target-branch: "main"
64+
milestone: 185
65+
ignore:
66+
# metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
67+
# in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
68+
# <=1.5.11 or 1.5.18 doesn't break with Micrometer, but open metrics won't be correct necessarily.
69+
- dependency-name: "com.netflix.hystrix:hystrix-core"
70+
# upgrade minor and patch versions on main
71+
- dependency-name: "*"
72+
update-types:
73+
- version-update:semver-major
74+
open-pull-requests-limit: 10

Diff for: ‎.github/workflows/close-stale-issues.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: 'Close stale issues and PRs'
2+
on:
3+
schedule:
4+
- cron: '30 1 * * *'
5+
workflow_dispatch:
6+
7+
jobs:
8+
stale:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/stale@v9
12+
with:
13+
stale-issue-message: 'If you would like us to look at this issue, please provide the requested information. If the information is not provided within the next 7 days this issue will be closed.'
14+
stale-pr-message: 'If you would like us to look at this PR, please provide the requested information. If the information is not provided within the next 7 days this PR will be closed.'
15+
close-issue-message: 'Closing due to lack of requested feedback. If you would like us to look at this issue, please provide the requested information and we will re-open.'
16+
close-pr-message: 'Closing due to lack of requested feedback. If you would like us to look at this, please provide the requested information and we will re-open.'
17+
close-issue-label: 'closed-as-inactive'
18+
days-before-stale: 7
19+
days-before-close: 7
20+
stale-issue-label: 'feedback-reminder'
21+
stale-pr-label: 'feedback-reminder'
22+
only-labels: 'waiting for feedback'
23+
exempt-issue-labels: 'feedback-provided'
24+
exempt-pr-labels: 'feedback-provided'
25+
exempt-all-milestones: true
26+
operations-per-run: 300

Diff for: ‎.github/workflows/deploy-docs.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Deploy Docs
2+
on:
3+
push:
4+
branches: [ main, '[0-9]+.[0-9]+.x' ]
5+
tags: 'v[0-9]+.[0-9]+.[0-9]+'
6+
repository_dispatch:
7+
types: request-build-reference # legacy
8+
#schedule:
9+
#- cron: '0 10 * * *' # Once per day at 10am UTC
10+
workflow_dispatch:
11+
permissions:
12+
actions: write
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v4
19+
with:
20+
ref: docs-build
21+
fetch-depth: 1
22+
- name: Dispatch (partial build)
23+
if: github.ref_type == 'branch'
24+
env:
25+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }}
27+
- name: Dispatch (full build)
28+
if: github.ref_type == 'tag'
29+
env:
30+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD)

Diff for: ‎.github/workflows/gradle-wrapper-validation.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v4
13-
- uses: gradle/wrapper-validation-action@v1
13+
- uses: gradle/wrapper-validation-action@v2

Diff for: ‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ build/
22
.gradle/
33
out/
44

5+
code/
6+
57
*.iml
68
*.ipr
79
*.iws

Diff for: ‎CONTRIBUTING.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Contributions come in various forms and are not limited to code changes.
1414
The Micrometer community benefits from contributions in all forms.
1515

1616
For example, those with Micrometer knowledge and experience can contribute by:
17-
* [Contributing documentation](https://github.com/micrometer-metrics/micrometer-docs/)
17+
* [Contributing documentation](https://github.com/micrometer-metrics/micrometer/tree/main/docs/)
1818
* Answering [Stackoverflow questions](https://stackoverflow.com/tags/micrometer)
1919
* Answering questions on the [Micrometer slack](https://slack.micrometer.io)
2020
* Share Micrometer knowledge in other ways (e.g. presentations, blogs)
@@ -32,7 +32,8 @@ You can use a Git client to clone the source code to your local machine.
3232

3333
## Building
3434

35-
Micrometer requires JDK 8 or later to build.
35+
Micrometer targets Java 8 but requires JDK 11 or later to build.
36+
If you are not running Gradle with JDK 11 or later and Gradle cannot detect an existing JDK 17 installation, it will download one.
3637

3738
The Gradle wrapper is provided and should be used for building with a consistent version of Gradle.
3839

Diff for: ‎README.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@
44
[![Apache 2.0](https://img.shields.io/github/license/micrometer-metrics/micrometer.svg)](https://www.apache.org/licenses/LICENSE-2.0)
55
[![Maven Central](https://img.shields.io/maven-central/v/io.micrometer/micrometer-core.svg)](https://search.maven.org/artifact/io.micrometer/micrometer-core)
66
[![Javadocs](https://www.javadoc.io/badge/io.micrometer/micrometer-core.svg)](https://www.javadoc.io/doc/io.micrometer/micrometer-core)
7-
[![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.micrometer.io/)
7+
[![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.micrometer.io/)
88

99
An application metrics facade for the most popular monitoring tools. Instrument your code with dimensional metrics with a
1010
vendor neutral interface and decide on the monitoring backend at the last minute.
1111

1212
More info and the user manual are available on [micrometer.io](https://micrometer.io).
1313

14-
Micrometer is the instrumentation library underpinning Spring Boot 2's metrics collection.
14+
Micrometer is the instrumentation library underpinning Spring Boot 2's or later metrics collection.
15+
16+
Micrometer artifacts work with Java 8 or later. We're releasing a [multi-release JAR](https://docs.oracle.com/javase/9/docs/specs/jar/jar.html#multi-release-jar-files) with support for JDK-version specific features (e.g. JDK 11's `HttpClient` instrumentation).
1517

1618
## Supported versions
1719

18-
See [Micrometer's support policy](https://micrometer.io/docs/support).
20+
See [Micrometer's support policy](https://micrometer.io/support/).
1921

2022
## Join the discussion
2123

Diff for: ‎benchmarks/benchmarks-core/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
plugins {
2-
id "me.champeau.jmh" version "0.7.1"
2+
id "me.champeau.jmh" version "0.7.2"
33
}
44

55
dependencies {
66
jmh project(':micrometer-core')
77
jmh project(':micrometer-registry-prometheus')
88

9-
jmh 'io.dropwizard.metrics5:metrics-core:latest.release'
10-
jmh 'io.prometheus:simpleclient_common:latest.release'
9+
jmh libs.dropwizardMetricsCore5
10+
jmh libs.prometheusClient
1111

1212
jmh 'io.dropwizard.metrics:metrics-core'
1313
jmh 'com.google.guava:guava'
1414

15-
jmh 'org.openjdk.jmh:jmh-core:latest.release'
15+
jmh libs.jmhCore
1616

1717
jmh 'ch.qos.logback:logback-classic'
1818

1919
// Nebula doesn't like having jmhAnnotationProcessor without jmh so we just add it twice.
20-
jmh 'org.openjdk.jmh:jmh-generator-annprocess:latest.release'
21-
jmhAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:latest.release'
20+
jmh libs.jmhAnnotationProcessor
21+
jmhAnnotationProcessor libs.jmhAnnotationProcessor
2222
}
2323

2424
jmh {

0 commit comments

Comments
 (0)