open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make the EnvironmentResource public. (#3200)

This commit is contained in:
John Watson 2021-05-06 16:50:07 -07:00 committed by GitHub
parent 940ebf0a34
commit 2a002f20fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/EnvironmentResource.java
View File

@ -9,11 +9,23 @@ import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.resources.Resource;
final class EnvironmentResource { /**
* Factory for a {@link Resource} which parses the standard "otel.resource.attributes" system
* property or OTEL_RESOURCE_ATTRIBUTES environment variable.
*/
public final class EnvironmentResource {
// Visible for testing // Visible for testing
static final String ATTRIBUTE_PROPERTY = "otel.resource.attributes"; static final String ATTRIBUTE_PROPERTY = "otel.resource.attributes";
/**
* Returns a {@link Resource} which contains information from the standard
* "otel.resource.attributes" system property or OTEL_RESOURCE_ATTRIBUTES environment variable.
*/
public static Resource get() {
return create(ConfigProperties.get());
}
static Resource create(ConfigProperties config) { static Resource create(ConfigProperties config) {
return Resource.create(getAttributes(config)); return Resource.create(getAttributes(config));
} }

5
sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/EnvironmentResourceTest.java
View File

@ -16,6 +16,11 @@ import org.junit.jupiter.api.Test;
class EnvironmentResourceTest { class EnvironmentResourceTest {
@Test
void get() {
assertThat(EnvironmentResource.get()).isNotNull();
}
@Test @Test
void resourceFromConfig_empty() { void resourceFromConfig_empty() {
Attributes attributes = Attributes attributes =

4
sdk-extensions/resources/src/main/java/io/opentelemetry/sdk/extension/resources/HostResource.java
View File

@ -12,12 +12,12 @@ import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
/** Factory of a {@link Resource} which provides information about the host info. */ /** Factory for a {@link Resource} which provides information about the host info. */
public final class HostResource { public final class HostResource {
private static final Resource INSTANCE = buildResource(); private static final Resource INSTANCE = buildResource();
/** Returns a factory for a {@link Resource} which provides information about host. */ /** Returns a {@link Resource} which provides information about host. */
public static Resource get() { public static Resource get() {
return INSTANCE; return INSTANCE;
} }