Skip to content

Commit 7702e78

Browse files
Spottless apply
1 parent 9905344 commit 7702e78

File tree

5 files changed

+27
-28
lines changed

5 files changed

+27
-28
lines changed

runtime/service/src/main/java/org/apache/polaris/service/metrics/MetricsConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,5 @@ interface UserPrincipalTag {
7979
*/
8080
@WithDefault("false")
8181
boolean enableInApiMetrics();
82-
8382
}
8483
}

runtime/service/src/main/java/org/apache/polaris/service/metrics/PolarisValueExpressionResolver.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ public String resolve(@Nonnull String expression, @Nullable Object parameter) {
4141
return realmContext.getRealmIdentifier();
4242
}
4343

44-
if (metricsConfiguration.userPrincipalTag().enableInApiMetrics() &&
45-
parameter instanceof SecurityContext securityContext
46-
&& expression.equals("userPrincipal") && securityContext.getUserPrincipal() != null) {
44+
if (metricsConfiguration.userPrincipalTag().enableInApiMetrics()
45+
&& parameter instanceof SecurityContext securityContext
46+
&& expression.equals("userPrincipal")
47+
&& securityContext.getUserPrincipal() != null) {
4748
return securityContext.getUserPrincipal().getName();
4849
}
4950
return null;
5051
}
51-
5252
}

runtime/service/src/test/java/org/apache/polaris/service/metrics/MetricsTestBase.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void testMetricsEmittedOnSuccessfulRequest(String endpoint) {
106106
? fixture.realm
107107
: ""),
108108
Map.entry(
109-
"principal",
109+
"principal",
110110
metricsConfiguration.userPrincipalTag().enableInApiMetrics()
111111
? "root"
112112
: ""),
@@ -163,9 +163,9 @@ public void testMetricsEmittedOnFailedRequest(String endpoint) {
163163
: ""),
164164
Map.entry(
165165
"principal",
166-
metricsConfiguration.userPrincipalTag().enableInApiMetrics()
167-
? "root"
168-
: ""),
166+
metricsConfiguration.userPrincipalTag().enableInApiMetrics()
167+
? "root"
168+
: ""),
169169
Map.entry(
170170
"class", "org.apache.polaris.service.admin.api.PolarisPrincipalsApi"),
171171
Map.entry("exception", "NotFoundException"),

runtime/service/src/test/java/org/apache/polaris/service/metrics/UserPrincipalTagDisabledMetricsTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
@TestProfile(UserPrincipalTagDisabledMetricsTest.Profile.class)
2828
public class UserPrincipalTagDisabledMetricsTest extends MetricsTestBase {
2929

30-
public static class Profile implements QuarkusTestProfile {
30+
public static class Profile implements QuarkusTestProfile {
3131

32-
@Override
33-
public Map<String, String> getConfigOverrides() {
34-
return Map.of(
35-
"polaris.metrics.tags.environment", "prod", "polaris.realm-context.type", "test");
36-
}
32+
@Override
33+
public Map<String, String> getConfigOverrides() {
34+
return Map.of(
35+
"polaris.metrics.tags.environment", "prod", "polaris.realm-context.type", "test");
3736
}
37+
}
3838
}

runtime/service/src/test/java/org/apache/polaris/service/metrics/UserPrincipalTagEnabledMetricsTest.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@
2727
@TestProfile(UserPrincipalTagEnabledMetricsTest.Profile.class)
2828
public class UserPrincipalTagEnabledMetricsTest extends MetricsTestBase {
2929

30-
public static class Profile implements QuarkusTestProfile {
30+
public static class Profile implements QuarkusTestProfile {
3131

32-
@Override
33-
public Map<String, String> getConfigOverrides() {
34-
return Map.of(
35-
"polaris.metrics.tags.environment",
36-
"prod",
37-
"polaris.metrics.user-principal-tag.enable-in-api-metrics",
38-
"true",
39-
"polaris.metrics.realm-id-tag.enable-in-api-metrics",
40-
"false",
41-
"polaris.metrics.realm-id-tag.enable-in-http-metrics",
42-
"false");
43-
}
32+
@Override
33+
public Map<String, String> getConfigOverrides() {
34+
return Map.of(
35+
"polaris.metrics.tags.environment",
36+
"prod",
37+
"polaris.metrics.user-principal-tag.enable-in-api-metrics",
38+
"true",
39+
"polaris.metrics.realm-id-tag.enable-in-api-metrics",
40+
"false",
41+
"polaris.metrics.realm-id-tag.enable-in-http-metrics",
42+
"false");
4443
}
44+
}
4545
}

0 commit comments

Comments
 (0)