Skip to content

Commit 7cd931c

Browse files
author
Anuraag Agrawal
authored
Return SDK attributes in default Resource. (#1528)
* Populate SDK resource by default. * Add test * Newline * Revert "Newline" This reverts commit e6ff4b4. * Revert "Add test" This reverts commit f2eaa7c.
1 parent f5a611a commit 7cd931c

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSdkProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public static Builder builder() {
8888
public static final class Builder {
8989

9090
private Clock clock = MillisClock.getInstance();
91-
private Resource resource = Resource.getTelemetrySdk().merge(Resource.getDefault());
91+
private Resource resource = Resource.getDefault();
9292

9393
private Builder() {}
9494

sdk/src/main/java/io/opentelemetry/sdk/resources/Resource.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@ public abstract class Resource {
5454
.setAttribute("telemetry.sdk.version", readVersion())
5555
.build());
5656
private static final Resource DEFAULT =
57-
new EnvAutodetectResource.Builder().readEnvironmentVariables().readSystemProperties().build();
57+
new EnvAutodetectResource.Builder()
58+
.readEnvironmentVariables()
59+
.readSystemProperties()
60+
.build()
61+
.merge(TELEMETRY_SDK);
5862

5963
@Nullable
6064
private static String readVersion() {

sdk/src/main/java/io/opentelemetry/sdk/trace/TracerSdkProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public static class Builder {
137137

138138
private Clock clock = MillisClock.getInstance();
139139
private IdsGenerator idsGenerator = new RandomIdsGenerator();
140-
private Resource resource = Resource.getTelemetrySdk().merge(Resource.getDefault());
140+
private Resource resource = Resource.getDefault();
141141

142142
/**
143143
* Assign a {@link Clock}.

0 commit comments

Comments
 (0)