Skip to content

Commit 871c825

Browse files
aepfliaepfli
committed
fixup: apply changes
Signed-off-by: Simon Schrottner <simon.schrottner@dynatrace.com>
1 parent 3f109ba commit 871c825

File tree

183 files changed

+4707
-3910
lines changed

Some content is hidden

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

183 files changed

+4707
-3910
lines changed

‎checkstyle.xml‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,15 @@
2020

2121
<property name="charset" value="UTF-8"/>
2222

23-
<property name="severity" value="${org.checkstyle.google.severity}" default="warning"/>
23+
<property name="severity" value="error"/>
2424

2525
<property name="fileExtensions" value="java, properties, xml"/>
2626
<!-- Excludes all 'module-info.java' files -->
2727
<!-- See https://checkstyle.org/filefilters/index.html -->
2828
<module name="BeforeExecutionExclusionFileFilter">
2929
<property name="fileNamePattern" value="module\-info\.java$"/>
3030
</module>
31-
32-
<module name="SuppressWarningsFilter"/>
33-
34-
<!-- https://checkstyle.org/filters/suppressionfilter.html -->
31+
<!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
3532
<module name="SuppressionFilter">
3633
<property name="file" value="${org.checkstyle.google.suppressionfilter.config}"
3734
default="checkstyle-suppressions.xml" />
@@ -54,12 +51,28 @@
5451

5552
<module name="LineLength">
5653
<property name="fileExtensions" value="java"/>
57-
<property name="max" value="100"/>
58-
<property name="ignorePattern"
59-
value="^package.*|^import.*|href\s*=\s*&quot;[^&quot;]*&quot;|http://|https://|ftp://"/>
54+
<property name="max" value="120"/>
55+
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
6056
</module>
6157

58+
<module name="SuppressWarningsFilter" />
59+
6260
<module name="TreeWalker">
61+
<!-- needed for SuppressWarningsFilter -->
62+
<module name="SuppressWarningsHolder" />
63+
64+
<module name="SuppressWarnings">
65+
<property name="id" value="checkstyle:suppresswarnings"/>
66+
</module>
67+
68+
<!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
69+
<module name="SuppressionXpathFilter">
70+
<property name="file" value="${org.checkstyle.google.suppressionxpathfilter.config}"
71+
default="checkstyle-xpath-suppressions.xml" />
72+
<property name="optional" value="true"/>
73+
</module>
74+
75+
<module name="UnusedImports"/>
6376
<module name="OuterTypeFilename"/>
6477
<module name="IllegalTokenText">
6578
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
@@ -282,12 +295,12 @@
282295
value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
283296
</module>
284297
<module name="Indentation">
285-
<property name="basicOffset" value="2"/>
286-
<property name="braceAdjustment" value="2"/>
287-
<property name="caseIndent" value="2"/>
298+
<property name="basicOffset" value="4"/>
299+
<property name="braceAdjustment" value="0"/>
300+
<property name="caseIndent" value="4"/>
288301
<property name="throwsIndent" value="4"/>
289302
<property name="lineWrappingIndentation" value="4"/>
290-
<property name="arrayInitIndent" value="2"/>
303+
<property name="arrayInitIndent" value="4"/>
291304
</module>
292305
<!-- Suppression for block code until we find a way to detect them properly
293306
until https://github.com/checkstyle/checkstyle/issues/15769 -->
@@ -297,8 +310,9 @@
297310
| //SLIST[not(parent::CASE_GROUP)]/SLIST/RCURLY"/>
298311
</module>
299312
<module name="AbbreviationAsWordInName">
300-
<property name="ignoreFinal" value="false"/>
301-
<property name="allowedAbbreviationLength" value="0"/>
313+
<property name="ignoreFinal" value="true"/>
314+
<property name="allowedAbbreviations" value="API" />
315+
<property name="allowedAbbreviationLength" value="1"/>
302316
<property name="tokens"
303317
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
304318
PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
@@ -358,7 +372,6 @@
358372
value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
359373
</module>
360374
<module name="JavadocParagraph">
361-
<property name="allowNewlineParagraph" value="false"/>
362375
</module>
363376
<module name="RequireEmptyLineBeforeBlockTagGroup"/>
364377
<module name="AtclauseOrder">
@@ -374,7 +387,8 @@
374387
<property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF"/>
375388
</module>
376389
<module name="MissingJavadocMethod">
377-
<property name="scope" value="protected"/>
390+
<property name="scope" value="public"/>
391+
<property name="minLineCount" value="2"/>
378392
<property name="allowMissingPropertyJavadoc" value="true"/>
379393
<property name="allowedAnnotations" value="Override, Test"/>
380394
<property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF,

‎hooks/open-telemetry/src/main/java/dev/openfeature/contrib/hooks/otel/MetricHookOptions.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
import dev.openfeature.sdk.ImmutableMetadata;
44
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
55
import io.opentelemetry.api.common.Attributes;
6-
import lombok.Builder;
7-
import lombok.Getter;
8-
96
import java.util.Collections;
107
import java.util.List;
118
import java.util.function.Function;
9+
import lombok.Builder;
10+
import lombok.Getter;
1211

1312
/**
1413
* OpenTelemetry hook options.
1514
*/
1615
@Builder
1716
@Getter
18-
@SuppressFBWarnings(value = {"EI_EXPOSE_REP"}, justification = "Dimension list can be mutable")
19-
17+
@SuppressFBWarnings(
18+
value = {"EI_EXPOSE_REP"},
19+
justification = "Dimension list can be mutable")
2020
public class MetricHookOptions {
2121

2222
/**

‎hooks/open-telemetry/src/main/java/dev/openfeature/contrib/hooks/otel/MetricsHook.java‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
package dev.openfeature.contrib.hooks.otel;
22

3+
import static dev.openfeature.contrib.hooks.otel.OTelCommons.REASON_KEY;
4+
import static dev.openfeature.contrib.hooks.otel.OTelCommons.flagKeyAttributeKey;
5+
import static dev.openfeature.contrib.hooks.otel.OTelCommons.providerNameAttributeKey;
6+
import static dev.openfeature.contrib.hooks.otel.OTelCommons.variantAttributeKey;
7+
38
import dev.openfeature.sdk.EvaluationContext;
49
import dev.openfeature.sdk.FlagEvaluationDetails;
510
import dev.openfeature.sdk.Hook;
@@ -11,18 +16,12 @@
1116
import io.opentelemetry.api.metrics.LongCounter;
1217
import io.opentelemetry.api.metrics.LongUpDownCounter;
1318
import io.opentelemetry.api.metrics.Meter;
14-
import lombok.extern.slf4j.Slf4j;
15-
1619
import java.util.Collections;
1720
import java.util.List;
1821
import java.util.Map;
1922
import java.util.Optional;
2023
import java.util.function.Function;
21-
22-
import static dev.openfeature.contrib.hooks.otel.OTelCommons.REASON_KEY;
23-
import static dev.openfeature.contrib.hooks.otel.OTelCommons.flagKeyAttributeKey;
24-
import static dev.openfeature.contrib.hooks.otel.OTelCommons.providerNameAttributeKey;
25-
import static dev.openfeature.contrib.hooks.otel.OTelCommons.variantAttributeKey;
24+
import lombok.extern.slf4j.Slf4j;
2625

2726
/**
2827
* OpenTelemetry metric hook records metrics at different {@link Hook} stages.
@@ -58,9 +57,9 @@ public MetricsHook(final OpenTelemetry openTelemetry) {
5857
public MetricsHook(final OpenTelemetry openTelemetry, final MetricHookOptions options) {
5958
final Meter meter = openTelemetry.getMeter(METER_NAME);
6059

61-
activeFlagEvaluationsCounter =
62-
meter.upDownCounterBuilder(EVALUATION_ACTIVE_COUNT).setDescription("active flag evaluations counter")
63-
.build();
60+
activeFlagEvaluationsCounter = meter.upDownCounterBuilder(EVALUATION_ACTIVE_COUNT)
61+
.setDescription("active flag evaluations counter")
62+
.build();
6463

6564
evaluationRequestCounter = meter.counterBuilder(EVALUATION_REQUESTS_TOTAL)
6665
.setDescription("feature flag evaluation request counter")
@@ -81,13 +80,17 @@ public MetricsHook(final OpenTelemetry openTelemetry, final MetricHookOptions op
8180
extraDimensions = options.getExtraAttributes();
8281
}
8382

84-
8583
@Override
8684
public Optional<EvaluationContext> before(HookContext ctx, Map hints) {
8785
activeFlagEvaluationsCounter.add(+1, Attributes.of(flagKeyAttributeKey, ctx.getFlagKey()));
8886

89-
evaluationRequestCounter.add(+1, Attributes.of(flagKeyAttributeKey, ctx.getFlagKey(), providerNameAttributeKey,
90-
ctx.getProviderMetadata().getName()));
87+
evaluationRequestCounter.add(
88+
+1,
89+
Attributes.of(
90+
flagKeyAttributeKey,
91+
ctx.getFlagKey(),
92+
providerNameAttributeKey,
93+
ctx.getProviderMetadata().getName()));
9194
return Optional.empty();
9295
}
9396

@@ -96,7 +99,8 @@ public void after(HookContext ctx, FlagEvaluationDetails details, Map hints) {
9699
final AttributesBuilder attributesBuilder = Attributes.builder();
97100

98101
attributesBuilder.put(flagKeyAttributeKey, ctx.getFlagKey());
99-
attributesBuilder.put(providerNameAttributeKey, ctx.getProviderMetadata().getName());
102+
attributesBuilder.put(
103+
providerNameAttributeKey, ctx.getProviderMetadata().getName());
100104
attributesBuilder.putAll(extraDimensions);
101105

102106
if (details.getReason() != null) {
@@ -122,7 +126,8 @@ public void after(HookContext ctx, FlagEvaluationDetails details, Map hints) {
122126
public void error(HookContext ctx, Exception error, Map hints) {
123127
final AttributesBuilder attributesBuilder = Attributes.builder();
124128
attributesBuilder.put(flagKeyAttributeKey, ctx.getFlagKey());
125-
attributesBuilder.put(providerNameAttributeKey, ctx.getProviderMetadata().getName());
129+
attributesBuilder.put(
130+
providerNameAttributeKey, ctx.getProviderMetadata().getName());
126131
attributesBuilder.putAll(extraDimensions);
127132

128133
evaluationErrorCounter.add(+1, attributesBuilder.build());
@@ -136,8 +141,8 @@ public void finallyAfter(HookContext ctx, Map hints) {
136141
/**
137142
* A helper to derive attributes from {@link DimensionDescription}.
138143
*/
139-
private static Attributes attributesFromFlagMetadata(final ImmutableMetadata flagMetadata,
140-
final List<DimensionDescription> dimensionDescriptions) {
144+
private static Attributes attributesFromFlagMetadata(
145+
final ImmutableMetadata flagMetadata, final List<DimensionDescription> dimensionDescriptions) {
141146
final AttributesBuilder builder = Attributes.builder();
142147

143148
for (DimensionDescription dimension : dimensionDescriptions) {

‎hooks/open-telemetry/src/main/java/dev/openfeature/contrib/hooks/otel/OTelCommons.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package dev.openfeature.contrib.hooks.otel;
22

3-
import io.opentelemetry.api.common.AttributeKey;
4-
53
import static io.opentelemetry.semconv.incubating.FeatureFlagIncubatingAttributes.FEATURE_FLAG_KEY;
64
import static io.opentelemetry.semconv.incubating.FeatureFlagIncubatingAttributes.FEATURE_FLAG_PROVIDER_NAME;
75
import static io.opentelemetry.semconv.incubating.FeatureFlagIncubatingAttributes.FEATURE_FLAG_VARIANT;
86

7+
import io.opentelemetry.api.common.AttributeKey;
8+
99
class OTelCommons {
1010
// Define semantic conventions
1111
// Refer - https://opentelemetry.io/docs/specs/otel/logs/semantic_conventions/feature-flags/

‎hooks/open-telemetry/src/main/java/dev/openfeature/contrib/hooks/otel/TracesHook.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
package dev.openfeature.contrib.hooks.otel;
22

3+
import static dev.openfeature.contrib.hooks.otel.OTelCommons.EVENT_NAME;
4+
import static dev.openfeature.contrib.hooks.otel.OTelCommons.flagKeyAttributeKey;
5+
import static dev.openfeature.contrib.hooks.otel.OTelCommons.providerNameAttributeKey;
6+
import static dev.openfeature.contrib.hooks.otel.OTelCommons.variantAttributeKey;
7+
38
import dev.openfeature.sdk.FlagEvaluationDetails;
49
import dev.openfeature.sdk.Hook;
510
import dev.openfeature.sdk.HookContext;
@@ -8,15 +13,9 @@
813
import io.opentelemetry.api.common.AttributesBuilder;
914
import io.opentelemetry.api.trace.Span;
1015
import io.opentelemetry.api.trace.StatusCode;
11-
1216
import java.util.Map;
1317
import java.util.function.Function;
1418

15-
import static dev.openfeature.contrib.hooks.otel.OTelCommons.EVENT_NAME;
16-
import static dev.openfeature.contrib.hooks.otel.OTelCommons.flagKeyAttributeKey;
17-
import static dev.openfeature.contrib.hooks.otel.OTelCommons.providerNameAttributeKey;
18-
import static dev.openfeature.contrib.hooks.otel.OTelCommons.variantAttributeKey;
19-
2019
/**
2120
* The OpenTelemetry hook provides a way to automatically add a feature flag evaluation to a span as a span event.
2221
* Refer to <a href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/feature-flags.md">OpenTelemetry</a>
@@ -63,7 +62,8 @@ public void after(HookContext ctx, FlagEvaluationDetails details, Map hints) {
6362
final AttributesBuilder attributesBuilder = Attributes.builder();
6463

6564
attributesBuilder.put(flagKeyAttributeKey, ctx.getFlagKey());
66-
attributesBuilder.put(providerNameAttributeKey, ctx.getProviderMetadata().getName());
65+
attributesBuilder.put(
66+
providerNameAttributeKey, ctx.getProviderMetadata().getName());
6767
attributesBuilder.put(variantAttributeKey, variant);
6868
attributesBuilder.putAll(extraAttributes);
6969

‎hooks/open-telemetry/src/main/java/dev/openfeature/contrib/hooks/otel/TracesHookOptions.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import dev.openfeature.sdk.ImmutableMetadata;
44
import io.opentelemetry.api.common.Attributes;
5+
import java.util.function.Function;
56
import lombok.Builder;
67
import lombok.Getter;
78

8-
import java.util.function.Function;
9-
109
/**
1110
* OpenTelemetry {@link TracesHook} options.
1211
*/

0 commit comments

Comments
 (0)