Skip to content

Commit 7c5cd56

Browse files
committed
use yaml file
1 parent c2a63ea commit 7c5cd56

File tree

2 files changed

+7
-29
lines changed

2 files changed

+7
-29
lines changed

javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/DeclarativeConfigPropertiesBridgeTest.java

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
1313
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.InstrumentationModel;
1414
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
15-
import java.io.ByteArrayInputStream;
16-
import java.nio.charset.StandardCharsets;
1715
import java.time.Duration;
1816
import java.util.Arrays;
1917
import java.util.HashMap;
@@ -24,37 +22,16 @@
2422

2523
class DeclarativeConfigPropertiesBridgeTest {
2624

27-
private static final String YAML =
28-
"file_format: 0.4\n"
29-
+ "instrumentation/development:\n"
30-
+ " java:\n"
31-
+ " common:\n"
32-
+ " default:\n"
33-
+ " enabled: true\n"
34-
+ " runtime_telemetry:\n"
35-
+ " enabled: false\n"
36-
+ " example_instrumentation:\n"
37-
+ " string_key: value\n"
38-
+ " bool_key: true\n"
39-
+ " int_key: 1\n"
40-
+ " double_key: 1.1\n"
41-
+ " list_key:\n"
42-
+ " - value1\n"
43-
+ " - value2\n"
44-
+ " - true\n"
45-
+ " map_key:\n"
46-
+ " string_key1: value1\n"
47-
+ " string_key2: value2\n"
48-
+ " bool_key: true\n";
49-
5025
private ConfigProperties bridge;
5126
private ConfigProperties emptyBridge;
5227

5328
@BeforeEach
5429
void setup() {
5530
OpenTelemetryConfigurationModel model =
5631
DeclarativeConfiguration.parse(
57-
new ByteArrayInputStream(YAML.getBytes(StandardCharsets.UTF_8)));
32+
DeclarativeConfigPropertiesBridgeTest.class
33+
.getClassLoader()
34+
.getResourceAsStream("config.yaml"));
5835
SdkConfigProvider configProvider = SdkConfigProvider.create(model);
5936
bridge =
6037
new DeclarativeConfigPropertiesBridge(

javaagent-tooling/src/test/resources/config.yaml renamed to javaagent-extension-api/src/test/resources/config.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
instrumentation:
1+
file_format: 0.4
2+
instrumentation/development:
23
java:
4+
agent:
35
common:
46
default:
57
enabled: true
68
runtime_telemetry:
79
enabled: false
8-
external_annotations:
9-
enabled: true
1010
example_instrumentation:
1111
string_key: value
1212
bool_key: true
@@ -15,6 +15,7 @@ instrumentation:
1515
list_key:
1616
- value1
1717
- value2
18+
- true
1819
map_key:
1920
string_key1: value1
2021
string_key2: value2

0 commit comments

Comments
 (0)