Skip to content

Add declarative config support for setting schema url #8028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jack-berg wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −19
Open

Add declarative config support for setting schema url #8028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...or/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ public Resource create(ResourceModel model, DeclarativeConfigContext context) {
.build();
}

if (model.getSchemaUrl() != null) {
builder.setSchemaUrl(model.getSchemaUrl());
}

return builder.build();
}

Expand Down
40 changes: 21 additions & 19 deletions ...rc/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.util.List;
import java.util.stream.Stream;
import javax.annotation.Nullable;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
Expand All @@ -31,28 +30,31 @@ class ResourceFactoryTest {
private final DeclarativeConfigContext context =
new DeclarativeConfigContext(SpiHelper.create(ResourceFactoryTest.class.getClassLoader()));

@Test
void create() {
assertThat(
ResourceFactory.getInstance()
.create(
new ResourceModel()
.withAttributes(
Arrays.asList(
new AttributeNameValueModel()
.withName("service.name")
.withValue("my-service"),
new AttributeNameValueModel().withName("key").withValue("val"),
new AttributeNameValueModel()
.withName("shape")
.withValue("circle"))),
context))
.isEqualTo(
@ParameterizedTest
@MethodSource("createArgs")
void create(ResourceModel model, Resource expectedResource) {
assertThat(ResourceFactory.getInstance().create(model, context)).isEqualTo(expectedResource);
}

private static Stream<Arguments> createArgs() {
return Stream.of(
Arguments.of(
new ResourceModel()
.withAttributes(
Arrays.asList(
new AttributeNameValueModel()
.withName("service.name")
.withValue("my-service"),
new AttributeNameValueModel().withName("key").withValue("val"),
new AttributeNameValueModel().withName("shape").withValue("circle"))),
Resource.getDefault().toBuilder()
.put("shape", "circle")
.put("service.name", "my-service")
.put("key", "val")
.build());
.build()),
Arguments.of(
new ResourceModel().withSchemaUrl("http://foo"),
Resource.getDefault().toBuilder().setSchemaUrl("http://foo").build()));
}

@ParameterizedTest
Expand Down
Loading