From 9be8ffbff9673194534d8d83e23c3b0f262b8f75 Mon Sep 17 00:00:00 2001 From: Toshiaki Maki Date: Wed, 24 Jan 2024 23:32:30 +0900 Subject: [PATCH] Update Wavefront property names (#107) * Update Wavefront property names Wavefront property names have changed since Spring Boot 3.0 https://docs.spring.io/spring-boot/docs/3.0.0/reference/html/actuator.html#actuator.metrics.export.wavefront fixes #97 --- README.md | 4 ++-- .../bindings/boot/WavefrontBindingsPropertiesProcessor.java | 4 ++-- .../boot/WavefrontBindingsPropertiesProcessorTest.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ec61e9d..4f1485e 100644 --- a/README.md +++ b/README.md @@ -450,8 +450,8 @@ Disable Property: `org.springframework.cloud.bindings.boot.wavefront.enable` | Property | Value | | ----------------------------------------------- | ------------- | -| `management.metrics.export.wavefront.api-token` | `{api-token}` | -| `management.metrics.export.wavefront.uri` | `{uri}` | +| `management.wavefront.api-token` | `{api-token}` | +| `management.wavefront.uri` | `{uri}` | ## Extending Spring Boot Configuration diff --git a/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessor.java index dd6887d..bc09eb5 100644 --- a/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessor.java +++ b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessor.java @@ -42,8 +42,8 @@ public final class WavefrontBindingsPropertiesProcessor implements BindingsPrope bindings.filterBindings(TYPE).forEach(binding -> { MapMapper map = new MapMapper(binding.getSecret(), properties); - map.from("api-token").to("management.metrics.export.wavefront.api-token"); - map.from("uri").to("management.metrics.export.wavefront.uri"); + map.from("api-token").to("management.wavefront.api-token"); + map.from("uri").to("management.wavefront.uri"); }); } diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessorTest.java index eb4f513..aa01a5b 100644 --- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessorTest.java +++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessorTest.java @@ -50,8 +50,8 @@ final class WavefrontBindingsPropertiesProcessorTest { void test() { new WavefrontBindingsPropertiesProcessor().process(environment, bindings, properties); assertThat(properties) - .containsEntry("management.metrics.export.wavefront.api-token", "test-api-token") - .containsEntry("management.metrics.export.wavefront.uri", "test-uri"); + .containsEntry("management.wavefront.api-token", "test-api-token") + .containsEntry("management.wavefront.uri", "test-uri"); } @Test