Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support of @MeterTag annotation on method level #5587

Conversation

MarinaMoiseenko
Copy link
Contributor

Fixes #3058.

@jonatan-ivanov, @shakuzen please take a look, These are changes discussed in #3058.

dependabot bot and others added 30 commits November 7, 2024 09:13
…icrometer-metrics#5620)

Bumps [com.amazonaws:aws-java-sdk-cloudwatch](https://github.com/aws/aws-sdk-java) from 1.12.773 to 1.12.777.
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](aws/aws-sdk-java@1.12.773...1.12.777)

---
updated-dependencies:
- dependency-name: com.amazonaws:aws-java-sdk-cloudwatch
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ter-metrics#5621)

Bumps [com.signalfx.public:signalfx-java](https://github.com/signalfx/signalfx-java) from 1.0.46 to 1.0.47.
- [Release notes](https://github.com/signalfx/signalfx-java/releases)
- [Commits](signalfx/signalfx-java@v1.0.46...v1.0.47)

---
updated-dependencies:
- dependency-name: com.signalfx.public:signalfx-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
micrometer-metrics#5622)

Bumps [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) from 2.17.2 to 2.17.3.
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps `testcontainers` from 1.20.2 to 1.20.3.

Updates `org.testcontainers:junit-jupiter` from 1.20.2 to 1.20.3
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.20.2...1.20.3)

Updates `org.testcontainers:kafka` from 1.20.2 to 1.20.3
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.20.2...1.20.3)

Updates `org.testcontainers:postgresql` from 1.20.2 to 1.20.3
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.20.2...1.20.3)

Updates `org.testcontainers:mongodb` from 1.20.2 to 1.20.3
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.20.2...1.20.3)

Updates `org.testcontainers:testcontainers` from 1.20.2 to 1.20.3
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.20.2...1.20.3)

---
updated-dependencies:
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.testcontainers:kafka
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.testcontainers:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.testcontainers:mongodb
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.testcontainers:testcontainers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.11.2 to 5.11.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.11.2...r5.11.3)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
micrometer-metrics#5627)

Bumps [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) from 2.18.0 to 2.18.1.
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ics#5634)

Bumps com.google.auth:google-auth-library-oauth2-http from 1.28.0 to 1.29.0.

---
updated-dependencies:
- dependency-name: com.google.auth:google-auth-library-oauth2-http
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…icrometer-metrics#5628)

Bumps [com.google.cloud:google-cloud-monitoring](https://github.com/googleapis/google-cloud-java) from 3.53.0 to 3.54.0.
- [Release notes](https://github.com/googleapis/google-cloud-java/releases)
- [Changelog](https://github.com/googleapis/google-cloud-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/google-cloud-java/commits)

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-monitoring
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…er-metrics#5638)

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.48.0 to 26.50.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](googleapis/java-cloud-bom@v26.48.0...v26.50.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…icrometer-metrics#5637)

Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.4 to 5.4.1.
- [Changelog](https://github.com/apache/httpcomponents-client/blob/rel/v5.4.1/RELEASE_NOTES.txt)
- [Commits](apache/httpcomponents-client@rel/v5.4...rel/v5.4.1)

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents.client5:httpclient5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps `activemq-artemis` from 2.37.0 to 2.38.0.

Updates `org.apache.activemq:artemis-jakarta-client` from 2.37.0 to 2.38.0

Updates `org.apache.activemq:artemis-junit-5` from 2.37.0 to 2.38.0

---
updated-dependencies:
- dependency-name: org.apache.activemq:artemis-jakarta-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.activemq:artemis-junit-5
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps `spring6` from 6.1.13 to 6.1.14.

Updates `org.springframework:spring-aop` from 6.1.13 to 6.1.14
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](spring-projects/spring-framework@v6.1.13...v6.1.14)

Updates `org.springframework:spring-context` from 6.1.13 to 6.1.14
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](spring-projects/spring-framework@v6.1.13...v6.1.14)

---
updated-dependencies:
- dependency-name: org.springframework:spring-aop
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.springframework:spring-context
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…icrometer-metrics#5630)

Bumps [com.netflix.spectator:spectator-reg-atlas](https://github.com/Netflix/spectator) from 1.7.21 to 1.8.1.
- [Release notes](https://github.com/Netflix/spectator/releases)
- [Changelog](https://github.com/Netflix/spectator/blob/main/CHANGELOG.md)
- [Commits](Netflix/spectator@v1.7.21...v1.8.1)

---
updated-dependencies:
- dependency-name: com.netflix.spectator:spectator-reg-atlas
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…eter-metrics#5631)

Bumps software.amazon.awssdk:cloudwatch from 2.28.19 to 2.29.6.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:cloudwatch
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump org.jooq:jooq from 3.14.16 to 3.19.14

Bumps org.jooq:jooq from 3.14.16 to 3.19.14.

---
updated-dependencies:
- dependency-name: org.jooq:jooq
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Do not upgrade jooq 3.14

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jonatan Ivanov <[email protected]>
…-metrics#5625)

* Bump ch.qos.logback:logback-classic from 1.2.13 to 1.5.12

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.2.13 to 1.5.12.
- [Commits](qos-ch/logback@v_1.2.13...v_1.5.12)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Do not upgrade logback 1.2

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jonatan Ivanov <[email protected]>
Bumps org.hsqldb:hsqldb from 2.7.3 to 2.7.4.

---
updated-dependencies:
- dependency-name: org.hsqldb:hsqldb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump org.jooq:jooq from 3.14.16 to 3.19.15

Bumps org.jooq:jooq from 3.14.16 to 3.19.15.

---
updated-dependencies:
- dependency-name: org.jooq:jooq
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Do not upgrade jooq 3.14

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jonatan Ivanov <[email protected]>
…ter-metrics#5645)

Bumps software.amazon.awssdk:cloudwatch from 2.29.6 to 2.29.7.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:cloudwatch
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps org.hsqldb:hsqldb from 2.7.3 to 2.7.4.

---
updated-dependencies:
- dependency-name: org.hsqldb:hsqldb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [io.prometheus:prometheus-metrics-bom](https://github.com/prometheus/client_java) from 1.3.1 to 1.3.3.
- [Release notes](https://github.com/prometheus/client_java/releases)
- [Commits](prometheus/client_java@v1.3.1...v1.3.3)

---
updated-dependencies:
- dependency-name: io.prometheus:prometheus-metrics-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
The Prometheus Java Client used to let users to use colons (":")
in the metric names. Apparently, this should have not been allowed.

See the docs: https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels
"Metric names may contain ASCII letters, digits, underscores,
and colons. It must match the regex [a-zA-Z_:][a-zA-Z0-9_:]*.
Note: The colons are reserved for user defined recording rules.
They should not be used by exporters or direct instrumentation."

So even if metric names can contain colons (":"),
exporters (like the Prometheus Java Client or Micrometer)
should not use it. The Prometheus Java Client replaces colons (":")
to underscores ("_") starting from 1.3.3.

See prometheus/client_java#974
See prometheus/client_java#975
See micrometer-metrics#5649
marcingrzejszczak and others added 27 commits January 13, 2025 12:20
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Updates our contributing documentation to mention the use of DCO now and removes mention of the CLA we will no longer use.

Disables the DCO check for org members who are all employed by Broadcom.
Signed-off-by: Tommy Ludwig <[email protected]>
…ics#5809)

Make clear that dynamic implementations are not supported and point users at how to implement such features other ways.

Closes micrometer-metricsgh-5480
micrometer-metrics#5811)

* Add support for `AutoShutdownDelegatedExecutorService`

This executor is returned by `Executors#newSingleThreadExecutor` under Java 21.

Signed-off-by: nscuro <[email protected]>
Signed-off-by: Johnny Lim <[email protected]>

* Add test for AutoShutdownDelegatedExecutorService support in ExecutorServiceMetrics

Signed-off-by: Johnny Lim <[email protected]>

---------

Signed-off-by: nscuro <[email protected]>
Signed-off-by: Johnny Lim <[email protected]>
Co-authored-by: nscuro <[email protected]>
The new version of the BND plugin does not have the same issue when running the `check` command, but the new version of the BND plugin requires JDK 17, so we can't use it when JDK 11 is being used to build the project.

See micrometer-metricsgh-5599
…trics#5818)

Before, we were needlessly making multiple instances of `MetricsFilter` that were functionally equivalent. This reduces the instances to one per registry to which Log4j2Metrics is bound. This will reduce allocations and memory usage slightly.
The mentioned library is no longer needed when using recent versions.

Resolves micrometer-metricsgh-5819
…lt' into create-tags-based-on-method-result

# Conflicts:
#	micrometer-core/src/main/java/io/micrometer/core/aop/CountedAspect.java
#	micrometer-core/src/main/java/io/micrometer/core/aop/TimedAspect.java
#	samples/micrometer-samples-spring-framework6/src/test/java/io/micrometer/samples/spring6/aop/CountedAspectTest.java
#	samples/micrometer-samples-spring-framework6/src/test/java/io/micrometer/samples/spring6/aop/TimedAspectTest.java
@MarinaMoiseenko
Copy link
Contributor Author

please consider #5827 instead

@shakuzen shakuzen added the superseded An issue that has been superseded by another label Jan 27, 2025
@shakuzen shakuzen closed this Jan 27, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
superseded An issue that has been superseded by another
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow injecting a function into TimedAspect to create tags based on method result