diff --git a/consumer/spring-analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerConfiguration.java b/consumer/spring-analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerConfiguration.java
index fd25d28b..d6157a35 100644
--- a/consumer/spring-analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerConfiguration.java
+++ b/consumer/spring-analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerConfiguration.java
@@ -65,6 +65,7 @@ public class AnalyticsConsumerConfiguration {
CharSequence meterNameRaw = properties.getComputedNameExpression().getValue(message, CharSequence.class);
String meterName = StringUtils.hasText(meterNameRaw) ? meterNameRaw.toString() : "empty";
+ @SuppressWarnings("deprecation")
// All fixed tags together are passed with every meter update.
Tags fixedTags = this.toTags(properties.getTag().getFixed());
diff --git a/consumer/spring-analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerProperties.java b/consumer/spring-analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerProperties.java
index 9bc8bfe4..b81cef8d 100644
--- a/consumer/spring-analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerProperties.java
+++ b/consumer/spring-analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerProperties.java
@@ -156,6 +156,7 @@ public class AnalyticsConsumerProperties {
* fixed Tags is:
* analytics.tag.fixed.[tag-name]=[tag-value]
*
+ * @deprecated in favor of {@link #expression}
*/
@Deprecated
private Map fixed;
@@ -168,10 +169,12 @@ public class AnalyticsConsumerProperties {
*/
private Map expression;
+ @Deprecated
public Map getFixed() {
return this.fixed;
}
+ @Deprecated
public void setFixed(Map fixed) {
this.fixed = fixed;
}
@@ -186,7 +189,7 @@ public class AnalyticsConsumerProperties {
@Override
public String toString() {
- return "MetricsTag{" + "fixed=" + this.fixed + ", expression=" + this.expression + '}';
+ return "MetricsTag{expression=" + this.expression + '}';
}
}
diff --git a/settings.gradle b/settings.gradle
index 88b8d88a..4857cde8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +1,11 @@
plugins {
- id 'com.gradle.develocity' version '3.17.6'
+ id 'com.gradle.develocity' version '3.17.6' apply false
id 'io.spring.ge.conventions' version '0.0.17' apply false
}
startParameter.noBuildScan = startParameter.taskNames.contains('format')
+apply plugin: 'com.gradle.develocity'
apply plugin: 'io.spring.ge.conventions'
rootProject.name = 'spring-functions-catalog'