Skip to content

Commit e19e260

Browse files
committed
Enable kitchen-sink.yaml test
1 parent 14b362f commit e19e260

File tree

6 files changed

+124
-5
lines changed

6 files changed

+124
-5
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ void parseAndCreate_Examples(@TempDir Path tempDir)
7070
assertThat(examplesDir).isDirectory();
7171

7272
for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
73-
// TODO: remove once support is added for otlp_file exporters
74-
if (example.getName().equals("kitchen-sink.yaml")) {
75-
continue;
76-
}
77-
7873
// Rewrite references to cert files in examples
7974
String exampleContent =
8075
new String(Files.readAllBytes(example.toPath()), StandardCharsets.UTF_8);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.sdk.extension.incubator.fileconfig.component;
7+
8+
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
9+
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
10+
import io.opentelemetry.sdk.resources.Resource;
11+
12+
// TODO(jack-berg): This allows DeclarativeConfigurationCreateTest to pass with kitchen-sink.yaml
13+
// example. Delete after resource providers from opentelemetry-java-instrumentation are renamed to
14+
// reflect declarative config naming
15+
public class ContainerResourceProvider implements ComponentProvider<Resource> {
16+
@Override
17+
public Class<Resource> getType() {
18+
return Resource.class;
19+
}
20+
21+
@Override
22+
public String getName() {
23+
return "container";
24+
}
25+
26+
@Override
27+
public Resource create(DeclarativeConfigProperties config) {
28+
return Resource.empty();
29+
}
30+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.sdk.extension.incubator.fileconfig.component;
7+
8+
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
9+
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
10+
import io.opentelemetry.sdk.resources.Resource;
11+
12+
// TODO(jack-berg): This allows DeclarativeConfigurationCreateTest to pass with kitchen-sink.yaml
13+
// example. Delete after resource providers from opentelemetry-java-instrumentation are renamed to
14+
// reflect declarative config naming
15+
public class HostResourceProvider implements ComponentProvider<Resource> {
16+
@Override
17+
public Class<Resource> getType() {
18+
return Resource.class;
19+
}
20+
21+
@Override
22+
public String getName() {
23+
return "host";
24+
}
25+
26+
@Override
27+
public Resource create(DeclarativeConfigProperties config) {
28+
return Resource.empty();
29+
}
30+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.sdk.extension.incubator.fileconfig.component;
7+
8+
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
9+
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
10+
import io.opentelemetry.sdk.resources.Resource;
11+
12+
// TODO(jack-berg): This allows DeclarativeConfigurationCreateTest to pass with kitchen-sink.yaml
13+
// example. Delete after resource providers from opentelemetry-java-instrumentation are renamed to
14+
// reflect declarative config naming
15+
public class OsResourceProvider implements ComponentProvider<Resource> {
16+
@Override
17+
public Class<Resource> getType() {
18+
return Resource.class;
19+
}
20+
21+
@Override
22+
public String getName() {
23+
return "os";
24+
}
25+
26+
@Override
27+
public Resource create(DeclarativeConfigProperties config) {
28+
return Resource.empty();
29+
}
30+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.sdk.extension.incubator.fileconfig.component;
7+
8+
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
9+
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
10+
import io.opentelemetry.sdk.resources.Resource;
11+
12+
// TODO(jack-berg): This allows DeclarativeConfigurationCreateTest to pass with kitchen-sink.yaml
13+
// example. Delete after resource providers from opentelemetry-java-instrumentation are renamed to
14+
// reflect declarative config naming
15+
public class ProcessResourceProvider implements ComponentProvider<Resource> {
16+
@Override
17+
public Class<Resource> getType() {
18+
return Resource.class;
19+
}
20+
21+
@Override
22+
public String getName() {
23+
return "process";
24+
}
25+
26+
@Override
27+
public Resource create(DeclarativeConfigProperties config) {
28+
return Resource.empty();
29+
}
30+
}

sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ io.opentelemetry.sdk.extension.incubator.fileconfig.component.LogRecordProcessor
88
io.opentelemetry.sdk.extension.incubator.fileconfig.component.ResourceComponentProvider
99
io.opentelemetry.sdk.extension.incubator.fileconfig.component.ResourceFirstComponentProvider
1010
io.opentelemetry.sdk.extension.incubator.fileconfig.component.ResourceSecondComponentProvider
11+
io.opentelemetry.sdk.extension.incubator.fileconfig.component.ContainerResourceProvider
12+
io.opentelemetry.sdk.extension.incubator.fileconfig.component.HostResourceProvider
13+
io.opentelemetry.sdk.extension.incubator.fileconfig.component.OsResourceProvider
14+
io.opentelemetry.sdk.extension.incubator.fileconfig.component.ProcessResourceProvider

0 commit comments

Comments
 (0)