Skip to content

Commit 1d124c7

Browse files
authored
Declarative Config Schema updated to 1.0 (signalfx#2712)
1 parent 251240c commit 1d124c7

File tree

12 files changed

+36
-36
lines changed

12 files changed

+36
-36
lines changed

custom/src/test/java/com/splunk/opentelemetry/appd/AppdBeforeAgentListenerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void shouldSetPropagatorProperties_declarativeConfig(@TempDir Path tempDir) thro
5050
AppdBeforeAgentListener agentListener = new AppdBeforeAgentListener();
5151
var yaml =
5252
"""
53-
file_format: "1.0-rc.3"
53+
file_format: "1.0"
5454
resource:
5555
attributes:
5656
- name: service.name

custom/src/test/java/com/splunk/opentelemetry/appd/AppdBonusConfigurationCustomizerProviderTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class AppdBonusConfigurationCustomizerProviderTest {
2828
void shouldAddAppdPropagatorWithDefaultPropagatorsAndSpanProcessorWhenFeatureIsEnabled() {
2929
var yaml =
3030
"""
31-
file_format: "1.0-rc.3"
31+
file_format: "1.0"
3232
instrumentation/development:
3333
java:
3434
cisco:
@@ -53,7 +53,7 @@ void shouldAddAppdPropagatorWithDefaultPropagatorsAndSpanProcessorWhenFeatureIsE
5353
void shouldAddAppdPropagatorToExistingListAndSpanProcessorWhenFeatureIsEnabled() {
5454
var yaml =
5555
"""
56-
file_format: "1.0-rc.3"
56+
file_format: "1.0"
5757
propagator:
5858
composite_list: "b3"
5959
instrumentation/development:
@@ -79,7 +79,7 @@ void shouldAddAppdPropagatorToExistingListAndSpanProcessorWhenFeatureIsEnabled()
7979
void shouldNotAddPropagatorAndSpanProcessorWhenFeatureIsDisabled() {
8080
var yaml =
8181
"""
82-
file_format: "1.0-rc.3"
82+
file_format: "1.0"
8383
instrumentation/development:
8484
java:
8585
cisco:
@@ -99,7 +99,7 @@ void shouldNotAddPropagatorAndSpanProcessorWhenFeatureIsDisabled() {
9999
void shouldNotAddPropagatorAndSpanProcessorWhenFeaturePropertyIsMissing() {
100100
var yaml =
101101
"""
102-
file_format: "1.0-rc.3"
102+
file_format: "1.0"
103103
instrumentation/development:
104104
java:
105105
""";

custom/src/test/java/com/splunk/opentelemetry/webengine/WebengineSpanProcessorCustomizerProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class WebengineSpanProcessorCustomizerProviderTest {
2828
void shouldAddWebengineSpanProcessor() {
2929
String yaml =
3030
"""
31-
file_format: "1.0-rc.3"
31+
file_format: "1.0"
3232
tracer_provider:
3333
processors:
3434
- simple:

instrumentation/nocode-testing/src/test/java/com/splunk/opentelemetry/instrumentation/nocode/NocodeInitializerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ void throwExceptionWhenRulesFileAndEmbeddedRulesAreDefined(@TempDir Path tempDir
110110
// given
111111
String yaml =
112112
"""
113-
file_format: "1.0-rc.3"
113+
file_format: "1.0"
114114
instrumentation/development:
115115
java:
116116
splunk:
@@ -135,7 +135,7 @@ void processRulesFromRulesFile(@TempDir Path tempDir) throws IOException {
135135

136136
String yaml =
137137
"""
138-
file_format: "1.0-rc.3"
138+
file_format: "1.0"
139139
instrumentation/development:
140140
java:
141141
splunk:
@@ -158,7 +158,7 @@ void processRulesFromDeclarativeConfiguration(@TempDir Path tempDir) throws IOEx
158158
// given
159159
String yaml =
160160
"""
161-
file_format: "1.0-rc.3"
161+
file_format: "1.0"
162162
instrumentation/development:
163163
java:
164164
splunk:

instrumentation/nocode-testing/src/test/java/com/splunk/opentelemetry/instrumentation/nocode/YamlParserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void shouldParseFromDeclarativeConfigYaml() {
109109
// given
110110
var yaml =
111111
"""
112-
file_format: "1.0-rc.3"
112+
file_format: "1.0"
113113
instrumentation/development:
114114
java:
115115
splunk:

profiler/src/test/java/com/splunk/opentelemetry/profiler/JfrActivatorTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void shouldActivateJfrRecording(@TempDir Path tempDir) throws IOException {
5959
// given
6060
String yaml =
6161
"""
62-
file_format: "1.0-rc.3"
62+
file_format: "1.0"
6363
distribution:
6464
splunk:
6565
profiling:
@@ -89,7 +89,7 @@ void shouldNotActivateJfrRecording_JfrNotAvailable(@TempDir Path tempDir) throws
8989
// given
9090
String yaml =
9191
"""
92-
file_format: "1.0-rc.3"
92+
file_format: "1.0"
9393
distribution:
9494
splunk:
9595
profiling:
@@ -138,21 +138,21 @@ void shouldNotActivateJfrRecording_profilerDisabled(String yaml, @TempDir Path t
138138

139139
private List<Arguments> generateNoProfilerYamlStrings() {
140140
return List.of(
141-
Arguments.of("file_format: \"1.0-rc.3\""),
141+
Arguments.of("file_format: \"1.0\""),
142142
Arguments.of(
143143
"""
144-
file_format: "1.0-rc.3"
144+
file_format: "1.0"
145145
distribution:
146146
"""),
147147
Arguments.of(
148148
"""
149-
file_format: "1.0-rc.3"
149+
file_format: "1.0"
150150
distribution:
151151
splunk:
152152
"""),
153153
Arguments.of(
154154
"""
155-
file_format: "1.0-rc.3"
155+
file_format: "1.0"
156156
distribution:
157157
splunk:
158158
something:

profiler/src/test/java/com/splunk/opentelemetry/profiler/LogExporterBuilderTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ void shouldCreateHttpExporter() {
161161
OpenTelemetryConfigurationModel model =
162162
DeclarativeConfigTestUtil.parse(
163163
"""
164-
file_format: "1.0-rc.3"
164+
file_format: "1.0"
165165
distribution:
166166
splunk:
167167
profiling:
@@ -185,7 +185,7 @@ void shouldCreateGrpcExporter() {
185185
OpenTelemetryConfigurationModel model =
186186
DeclarativeConfigTestUtil.parse(
187187
"""
188-
file_format: "1.0-rc.3"
188+
file_format: "1.0"
189189
distribution:
190190
splunk:
191191
profiling:
@@ -209,7 +209,7 @@ void shouldCreateHttpExporter_defaultEndpoint() {
209209
OpenTelemetryConfigurationModel model =
210210
DeclarativeConfigTestUtil.parse(
211211
"""
212-
file_format: "1.0-rc.3"
212+
file_format: "1.0"
213213
distribution:
214214
splunk:
215215
profiling:
@@ -232,7 +232,7 @@ void shouldCreateGrpcExporter_defaultEndpoint() {
232232
OpenTelemetryConfigurationModel model =
233233
DeclarativeConfigTestUtil.parse(
234234
"""
235-
file_format: "1.0-rc.3"
235+
file_format: "1.0"
236236
distribution:
237237
splunk:
238238
profiling:
@@ -255,7 +255,7 @@ void shouldThrowExceptionForInvalidProtocol() {
255255
OpenTelemetryConfigurationModel model =
256256
DeclarativeConfigTestUtil.parse(
257257
"""
258-
file_format: "1.0-rc.3"
258+
file_format: "1.0"
259259
distribution:
260260
splunk:
261261
profiling:

profiler/src/test/java/com/splunk/opentelemetry/profiler/ProfilerDeclarativeConfigurationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void shouldMapYamlToConfiguration() {
3434
OpenTelemetryConfigurationModel model =
3535
DeclarativeConfigTestUtil.parse(
3636
"""
37-
file_format: "1.0-rc.3"
37+
file_format: "1.0"
3838
distribution:
3939
splunk:
4040
profiling:

profiler/src/test/java/com/splunk/opentelemetry/profiler/snapshot/SnapshotProfilingConfigurationCustomizerProviderTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void shouldDoNothingIfProfilerIsNotEnabled(@TempDir Path tempDir) throws IOExcep
5151
// given
5252
String yaml =
5353
"""
54-
file_format: "1.0-rc.3"
54+
file_format: "1.0"
5555
""";
5656

5757
// when
@@ -68,7 +68,7 @@ void shouldAddRequiredPropagator() {
6868
// given
6969
String yaml =
7070
"""
71-
file_format: "1.0-rc.3"
71+
file_format: "1.0"
7272
distribution:
7373
splunk:
7474
profiling:
@@ -87,7 +87,7 @@ void shouldKeepPropagatorsDefinedInCompositeList() {
8787
// given
8888
String yaml =
8989
"""
90-
file_format: "1.0-rc.3"
90+
file_format: "1.0"
9191
propagator:
9292
composite_list: "propagator1,propagator2"
9393
distribution:
@@ -110,7 +110,7 @@ void shouldAddSpanProcessors() {
110110
// given
111111
String yaml =
112112
"""
113-
file_format: "1.0-rc.3"
113+
file_format: "1.0"
114114
tracer_provider:
115115
processors:
116116
- batch:
@@ -146,7 +146,7 @@ void shouldInitializeActiveSpansTracking() {
146146
OpenTelemetryConfigurationModel model =
147147
DeclarativeConfigTestUtil.parse(
148148
"""
149-
file_format: "1.0-rc.3"
149+
file_format: "1.0"
150150
distribution:
151151
splunk:
152152
profiling:

profiler/src/test/java/com/splunk/opentelemetry/profiler/snapshot/SnapshotProfilingDeclarativeConfigurationTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void shouldMapYamlToConfiguration() {
3333
OpenTelemetryConfigurationModel model =
3434
DeclarativeConfigTestUtil.parse(
3535
"""
36-
file_format: "1.0-rc.3"
36+
file_format: "1.0"
3737
distribution:
3838
splunk:
3939
profiling:
@@ -66,7 +66,7 @@ void shouldEnableSnapshotProfilingWithDefaults() {
6666
OpenTelemetryConfigurationModel model =
6767
DeclarativeConfigTestUtil.parse(
6868
"""
69-
file_format: "1.0-rc.3"
69+
file_format: "1.0"
7070
distribution:
7171
splunk:
7272
profiling:
@@ -94,7 +94,7 @@ void shouldDisableSnapshotProfiling() {
9494
OpenTelemetryConfigurationModel model =
9595
DeclarativeConfigTestUtil.parse(
9696
"""
97-
file_format: "1.0-rc.3"
97+
file_format: "1.0"
9898
distribution:
9999
splunk:
100100
profiling:
@@ -116,7 +116,7 @@ void shouldReturnValidSelectionInterval_aboveMax() {
116116
OpenTelemetryConfigurationModel model =
117117
DeclarativeConfigTestUtil.parse(
118118
"""
119-
file_format: "1.0-rc.3"
119+
file_format: "1.0"
120120
distribution:
121121
splunk:
122122
profiling:
@@ -141,7 +141,7 @@ void shouldReturnValidSelectionInterval_tooLow() {
141141
OpenTelemetryConfigurationModel model =
142142
DeclarativeConfigTestUtil.parse(
143143
"""
144-
file_format: "1.0-rc.3"
144+
file_format: "1.0"
145145
distribution:
146146
splunk:
147147
profiling:

0 commit comments

Comments
 (0)