Skip to content

Commit a3a3b8b

Browse files
authored
Be consistent about using snake case in metadata yaml (#13610)
1 parent 2e16a2e commit a3a3b8b

File tree

16 files changed

+302
-295
lines changed

16 files changed

+302
-295
lines changed

docs/instrumentation-list.yaml

Lines changed: 261 additions & 261 deletions
Large diffs are not rendered by default.

instrumentation-docs/readme.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ public class SpringWebInstrumentationModule extends InstrumentationModule
5050
* name
5151
* Identifier for instrumentation module, used to enable/disable
5252
* Configured in `InstrumentationModule` code for each module
53-
* srcPath
53+
* source_path
5454
* Path to the source code of the instrumentation module
55-
* minimumJavaVersion
55+
* minimum_java_version
5656
* Minimum Java version required by the instrumentation module. If not specified, it is assumed to
5757
be Java 8
5858
* description
@@ -73,7 +73,7 @@ As of now, the following fields are supported:
7373

7474
```yaml
7575
description: "Description of what the instrumentation does."
76-
disabledByDefault: true
76+
disabled_by_default: true
7777

7878
# used to mark modules that do not instrument traditional libraries (e.g. methods, annotations)
7979
# defaults to true

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/internal/InstrumentationMetaData.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@
99
import javax.annotation.Nullable;
1010

1111
/**
12-
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
13-
* any time.
12+
* Represents the data in a metadata.yaml file. This class is internal and is hence not for public
13+
* use. Its APIs are unstable and can change at any time.
1414
*/
1515
public class InstrumentationMetaData {
16+
@Nullable private String description;
17+
@Nullable private Boolean isLibraryInstrumentation;
18+
@Nullable private Boolean disabledByDefault;
1619

1720
public InstrumentationMetaData() {}
1821

1922
public InstrumentationMetaData(String description) {
2023
this.description = description;
21-
this.isLibraryInstrumentation = true;
22-
this.disabledByDefault = false;
2324
}
2425

2526
public InstrumentationMetaData(
@@ -29,10 +30,6 @@ public InstrumentationMetaData(
2930
this.description = description;
3031
}
3132

32-
@Nullable private String description;
33-
@Nullable private Boolean disabledByDefault;
34-
@Nullable private Boolean isLibraryInstrumentation;
35-
3633
@Nullable
3734
public String getDescription() {
3835
return description;

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/utils/YamlHelper.java

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,20 @@
1515
import java.util.TreeMap;
1616
import java.util.stream.Collectors;
1717
import org.yaml.snakeyaml.DumperOptions;
18+
import org.yaml.snakeyaml.TypeDescription;
1819
import org.yaml.snakeyaml.Yaml;
1920

2021
public class YamlHelper {
2122

23+
private static final Yaml metaDataYaml = new Yaml();
24+
25+
static {
26+
TypeDescription customDescriptor = new TypeDescription(InstrumentationMetaData.class);
27+
customDescriptor.substituteProperty(
28+
"disabled_by_default", Boolean.class, "getDisabledByDefault", "setDisabledByDefault");
29+
metaDataYaml.addTypeDescription(customDescriptor);
30+
}
31+
2232
public static void printInstrumentationList(
2333
List<InstrumentationEntity> list, BufferedWriter writer) {
2434
Map<String, List<InstrumentationEntity>> groupedByGroup =
@@ -43,14 +53,14 @@ public static void printInstrumentationList(
4353
}
4454

4555
if (entity.getMetadata().getDisabledByDefault()) {
46-
entityMap.put("disabledByDefault", entity.getMetadata().getDisabledByDefault());
56+
entityMap.put("disabled_by_default", entity.getMetadata().getDisabledByDefault());
4757
}
4858
}
4959

50-
entityMap.put("srcPath", entity.getSrcPath());
60+
entityMap.put("source_path", entity.getSrcPath());
5161

5262
if (entity.getMinJavaVersion() != null) {
53-
entityMap.put("minimumJavaVersion", entity.getMinJavaVersion());
63+
entityMap.put("minimum_java_version", entity.getMinJavaVersion());
5464
}
5565

5666
Map<String, Object> scopeMap = getScopeMap(entity);
@@ -97,7 +107,7 @@ private static Map<String, Object> getScopeMap(InstrumentationEntity entity) {
97107
}
98108

99109
public static InstrumentationMetaData metaDataParser(String input) {
100-
return new Yaml().loadAs(input, InstrumentationMetaData.class);
110+
return metaDataYaml.loadAs(input, InstrumentationMetaData.class);
101111
}
102112

103113
private YamlHelper() {}

instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/utils/YamlHelperTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ void testPrintInstrumentationList() throws Exception {
6969
instrumentations:
7070
- name: spring-web-6.0
7171
description: Spring Web 6.0 instrumentation
72-
disabledByDefault: true
73-
srcPath: instrumentation/spring/spring-web/spring-web-6.0
74-
minimumJavaVersion: 11
72+
disabled_by_default: true
73+
source_path: instrumentation/spring/spring-web/spring-web-6.0
74+
minimum_java_version: 11
7575
scope:
7676
name: io.opentelemetry.spring-web-6.0
7777
target_versions:
@@ -80,7 +80,7 @@ void testPrintInstrumentationList() throws Exception {
8080
struts:
8181
instrumentations:
8282
- name: struts-2.3
83-
srcPath: instrumentation/struts/struts-2.3
83+
source_path: instrumentation/struts/struts-2.3
8484
scope:
8585
name: io.opentelemetry.struts-2.3
8686
target_versions:
@@ -137,8 +137,8 @@ void testPrintInstrumentationListIgnoresNonLibraryInstrumentation() throws Excep
137137
instrumentations:
138138
- name: spring-web-6.0
139139
description: Spring Web 6.0 instrumentation
140-
srcPath: instrumentation/spring/spring-web/spring-web-6.0
141-
minimumJavaVersion: 11
140+
source_path: instrumentation/spring/spring-web/spring-web-6.0
141+
minimum_java_version: 11
142142
scope:
143143
name: io.opentelemetry.spring-web-6.0
144144
target_versions:
@@ -155,7 +155,7 @@ void testMetadataParser() {
155155
"""
156156
description: test description
157157
isLibraryInstrumentation: false
158-
disabledByDefault: true
158+
disabled_by_default: true
159159
""";
160160

161161
InstrumentationMetaData metadata = YamlHelper.metaDataParser(input);
@@ -183,7 +183,7 @@ void testMetadataParserWithOnlyDescription() {
183183

184184
@Test
185185
void testMetadataParserWithOnlyDisabledByDefault() {
186-
String input = "disabledByDefault: true";
186+
String input = "disabled_by_default: true";
187187
InstrumentationMetaData metadata = YamlHelper.metaDataParser(input);
188188
assertThat(metadata.getIsLibraryInstrumentation()).isTrue();
189189
assertThat(metadata.getDescription()).isNull();
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
disabledByDefault: true
1+
disabled_by_default: true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
disabledByDefault: true
1+
disabled_by_default: true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
disabledByDefault: true
1+
disabled_by_default: true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
disabledByDefault: true
1+
disabled_by_default: true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
disabledByDefault: true
1+
disabled_by_default: true

0 commit comments

Comments
 (0)