Skip to content

Commit a681c40

Browse files
committed
Fix existing tests: file_format version and setBuilder
1 parent 491b14a commit a681c40

8 files changed

Lines changed: 45 additions & 3 deletions

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCreateTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ void parseAndCreate_Exception_CleansUpPartials() {
114114
// exporter with OTLP exporter, following by invalid batch exporter which references invalid
115115
// exporter "foo".
116116
String yaml =
117-
"file_format: \"1.0-rc.1\"\n"
117+
"file_format: \"1.0-rc.3\"\n"
118118
+ "logger_provider:\n"
119119
+ " processors:\n"
120120
+ " - batch:\n"
@@ -141,7 +141,7 @@ void parseAndCreate_Exception_CleansUpPartials() {
141141
@Test
142142
void parseAndCreate_EmptyComponentProviderConfig() {
143143
String yaml =
144-
"file_format: \"1.0-rc.1\"\n"
144+
"file_format: \"1.0-rc.3\"\n"
145145
+ "logger_provider:\n"
146146
+ " processors:\n"
147147
+ " - test:\n"
@@ -159,7 +159,7 @@ void parseAndCreate_EmptyComponentProviderConfig() {
159159
@Test
160160
void create_ModelCustomizer() {
161161
OpenTelemetryConfigurationModel model = new OpenTelemetryConfigurationModel();
162-
model.withFileFormat("1.0-rc.1");
162+
model.withFileFormat("1.0-rc.3");
163163
model.withTracerProvider(
164164
new TracerProviderModel()
165165
.withProcessors(

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactoryTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.util.ArrayList;
2828
import java.util.List;
2929
import org.assertj.core.api.Assertions;
30+
import org.junit.jupiter.api.BeforeEach;
3031
import org.junit.jupiter.api.Test;
3132
import org.junit.jupiter.api.extension.RegisterExtension;
3233

@@ -38,6 +39,11 @@ class LogRecordProcessorFactoryTest {
3839
new DeclarativeConfigContext(
3940
SpiHelper.create(LogRecordProcessorFactoryTest.class.getClassLoader()));
4041

42+
@BeforeEach
43+
void setup() {
44+
context.setBuilder(new DeclarativeConfigurationBuilder());
45+
}
46+
4147
@Test
4248
void create_BatchNullExporter() {
4349
assertThatThrownBy(

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderFactoryTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import java.util.Collections;
3535
import java.util.List;
3636
import java.util.stream.Stream;
37+
import org.junit.jupiter.api.BeforeEach;
3738
import org.junit.jupiter.api.extension.RegisterExtension;
3839
import org.junit.jupiter.params.ParameterizedTest;
3940
import org.junit.jupiter.params.provider.Arguments;
@@ -47,6 +48,11 @@ class LoggerProviderFactoryTest {
4748
new DeclarativeConfigContext(
4849
SpiHelper.create(LoggerProviderFactoryTest.class.getClassLoader()));
4950

51+
@BeforeEach
52+
void setup() {
53+
context.setBuilder(new DeclarativeConfigurationBuilder());
54+
}
55+
5056
@ParameterizedTest
5157
@MethodSource("createArguments")
5258
void create(LoggerProviderAndAttributeLimits model, SdkLoggerProvider expectedProvider) {

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MeterProviderFactoryTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import java.util.Collections;
3636
import java.util.List;
3737
import java.util.stream.Stream;
38+
import org.junit.jupiter.api.BeforeEach;
3839
import org.junit.jupiter.api.extension.RegisterExtension;
3940
import org.junit.jupiter.params.ParameterizedTest;
4041
import org.junit.jupiter.params.provider.Arguments;
@@ -48,6 +49,11 @@ class MeterProviderFactoryTest {
4849
new DeclarativeConfigContext(
4950
SpiHelper.create(MeterProviderFactoryTest.class.getClassLoader()));
5051

52+
@BeforeEach
53+
void setup() {
54+
context.setBuilder(new DeclarativeConfigurationBuilder());
55+
}
56+
5157
@ParameterizedTest
5258
@MethodSource("createArguments")
5359
void create(MeterProviderModel model, SdkMeterProvider expectedProvider) {

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricReaderFactoryTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import java.time.Duration;
3939
import java.util.ArrayList;
4040
import java.util.List;
41+
import org.junit.jupiter.api.BeforeEach;
4142
import org.junit.jupiter.api.Test;
4243
import org.junit.jupiter.api.extension.RegisterExtension;
4344

@@ -54,6 +55,11 @@ class MetricReaderFactoryTest {
5455
new DeclarativeConfigContext(
5556
SpiHelper.create(MetricReaderFactoryTest.class.getClassLoader())));
5657

58+
@BeforeEach
59+
void setup() {
60+
context.setBuilder(new DeclarativeConfigurationBuilder());
61+
}
62+
5763
@Test
5864
void create_PeriodicNullExporter() {
5965
assertThatThrownBy(

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactoryTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
import java.util.Collections;
7373
import java.util.List;
7474
import java.util.stream.Stream;
75+
import org.junit.jupiter.api.BeforeEach;
7576
import org.junit.jupiter.api.Test;
7677
import org.junit.jupiter.api.extension.RegisterExtension;
7778
import org.junit.jupiter.params.ParameterizedTest;
@@ -92,6 +93,11 @@ class OpenTelemetryConfigurationFactoryTest {
9293
new DeclarativeConfigContext(
9394
SpiHelper.create(OpenTelemetryConfigurationFactoryTest.class.getClassLoader()));
9495

96+
@BeforeEach
97+
void setup() {
98+
context.setBuilder(new DeclarativeConfigurationBuilder());
99+
}
100+
95101
@ParameterizedTest
96102
@MethodSource("fileFormatArgs")
97103
void create_FileFormat(String fileFormat, boolean isValid) {

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactoryTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.util.ArrayList;
2828
import java.util.List;
2929
import org.assertj.core.api.Assertions;
30+
import org.junit.jupiter.api.BeforeEach;
3031
import org.junit.jupiter.api.Test;
3132
import org.junit.jupiter.api.extension.RegisterExtension;
3233

@@ -38,6 +39,11 @@ class SpanProcessorFactoryTest {
3839
new DeclarativeConfigContext(
3940
SpiHelper.create(SpanProcessorFactoryTest.class.getClassLoader()));
4041

42+
@BeforeEach
43+
void setup() {
44+
context.setBuilder(new DeclarativeConfigurationBuilder());
45+
}
46+
4147
@Test
4248
void create_BatchNullExporter() {
4349
assertThatThrownBy(

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderFactoryTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import java.util.Collections;
3737
import java.util.List;
3838
import java.util.stream.Stream;
39+
import org.junit.jupiter.api.BeforeEach;
3940
import org.junit.jupiter.api.extension.RegisterExtension;
4041
import org.junit.jupiter.params.ParameterizedTest;
4142
import org.junit.jupiter.params.provider.Arguments;
@@ -49,6 +50,11 @@ class TracerProviderFactoryTest {
4950
new DeclarativeConfigContext(
5051
SpiHelper.create(TracerProviderFactoryTest.class.getClassLoader()));
5152

53+
@BeforeEach
54+
void setup() {
55+
context.setBuilder(new DeclarativeConfigurationBuilder());
56+
}
57+
5258
@ParameterizedTest
5359
@MethodSource("createArguments")
5460
void create(TracerProviderAndAttributeLimits model, SdkTracerProvider expectedProvider) {

0 commit comments

Comments
 (0)