Skip to content

Commit 7df12a5

Browse files
committed
re-add setResource() and run jApiCmp
1 parent 126c7cf commit 7df12a5

File tree

3 files changed

+55
-2
lines changed

3 files changed

+55
-2
lines changed
Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,38 @@
11
Comparing source compatibility of opentelemetry-sdk-common-1.51.0-SNAPSHOT.jar against opentelemetry-sdk-common-1.50.0.jar
2-
No changes.
2+
+++ NEW CLASS: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.entities.Entity (not serializable)
3+
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
4+
+++ NEW SUPERCLASS: java.lang.Object
5+
+++ NEW CONSTRUCTOR: PUBLIC(+) Entity()
6+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.entities.Entity create(java.lang.String, java.lang.String, io.opentelemetry.api.common.Attributes)
7+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.entities.Entity create(io.opentelemetry.sdk.resources.Resource)
8+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.common.Attributes getAttributes()
9+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getId()
10+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getName()
11+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.entities.Entity withAttributes(io.opentelemetry.api.common.Attributes)
12+
+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.entities.EntityListener (not serializable)
13+
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
14+
+++ NEW SUPERCLASS: java.lang.Object
15+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void onEntityDelete(io.opentelemetry.sdk.entities.Entity, io.opentelemetry.sdk.resources.Resource)
16+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void onEntityState(io.opentelemetry.sdk.entities.Entity, io.opentelemetry.sdk.resources.Resource)
17+
+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.entities.EntityProvider (not serializable)
18+
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
19+
+++ NEW SUPERCLASS: java.lang.Object
20+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void addEntity(java.lang.String, java.lang.String, io.opentelemetry.api.common.Attributes)
21+
+++ NEW METHOD: PUBLIC(+) void addEntity(io.opentelemetry.sdk.entities.Entity)
22+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void addListener(io.opentelemetry.sdk.entities.EntityListener)
23+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void deleteEntity(java.lang.String)
24+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.resources.Resource getResource()
25+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void updateEntity(java.lang.String, io.opentelemetry.api.common.Attributes)
26+
+++ NEW CLASS: PUBLIC(+) io.opentelemetry.sdk.entities.SdkEntityProvider (not serializable)
27+
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
28+
+++ NEW INTERFACE: io.opentelemetry.sdk.entities.EntityProvider
29+
+++ NEW SUPERCLASS: java.lang.Object
30+
+++ NEW CONSTRUCTOR: PUBLIC(+) SdkEntityProvider()
31+
+++ NEW CONSTRUCTOR: PUBLIC(+) SdkEntityProvider(java.util.List<io.opentelemetry.sdk.entities.Entity>)
32+
+++ NEW METHOD: PUBLIC(+) void addEntity(java.lang.String, java.lang.String, io.opentelemetry.api.common.Attributes)
33+
+++ NEW METHOD: PUBLIC(+) void addListener(io.opentelemetry.sdk.entities.EntityListener)
34+
+++ NEW METHOD: PUBLIC(+) void deleteEntity(java.lang.String)
35+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.entities.EntityProvider empty()
36+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.entities.EntityProvider getDefault()
37+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.Resource getResource()
38+
+++ NEW METHOD: PUBLIC(+) void updateEntity(java.lang.String, io.opentelemetry.api.common.Attributes)
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
Comparing source compatibility of opentelemetry-sdk-trace-1.51.0-SNAPSHOT.jar against opentelemetry-sdk-trace-1.50.0.jar
2-
No changes.
2+
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.trace.SdkTracerProviderBuilder (not serializable)
3+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.trace.SdkTracerProviderBuilder addEntity(java.lang.String, java.lang.String, io.opentelemetry.api.common.Attributes)
5+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.trace.SdkTracerProviderBuilder addEntity(io.opentelemetry.sdk.entities.Entity)
6+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.trace.SdkTracerProviderBuilder setEntityProvider(io.opentelemetry.sdk.entities.EntityProvider)

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import io.opentelemetry.sdk.trace.internal.TracerConfig;
2222
import io.opentelemetry.sdk.trace.samplers.Sampler;
2323
import java.util.ArrayList;
24+
import java.util.Collections;
2425
import java.util.List;
2526
import java.util.Objects;
2627
import java.util.function.Predicate;
@@ -106,6 +107,18 @@ public SdkTracerProviderBuilder addEntity(Entity entity) {
106107
return addEntity(entity.getId(), entity.getName(), entity.getAttributes());
107108
}
108109

110+
/**
111+
* Assign a {@link Resource} to be attached to all Spans created by Tracers.
112+
*
113+
* @param resource A Resource implementation.
114+
* @return this
115+
*/
116+
public SdkTracerProviderBuilder setResource(Resource resource) {
117+
requireNonNull(resource, "resource");
118+
this.entityProvider = new SdkEntityProvider(Collections.singletonList(Entity.create(resource)));
119+
return this;
120+
}
121+
109122
/**
110123
* Creates an Entity from a {@link Resource} and merges it into the current EntityProvider.
111124
*

0 commit comments

Comments
 (0)