Merge the current Resource object with custom Resource Object.

open-telemetry · Jul 11, 2023 · 89a4c02 · 89a4c02
1 parent 9ecc6f0
commit 89a4c02
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 3 deletions.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-logs.txt b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-logs.txt
@@ -1,2 +1,4 @@
 Comparing source compatibility of  against 
-No changes.
+***  MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder mergeResource(io.opentelemetry.sdk.resources.Resource)
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-metrics.txt b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-metrics.txt
@@ -1,2 +1,4 @@
 Comparing source compatibility of  against 
-No changes.
+***  MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder mergeResource(io.opentelemetry.sdk.resources.Resource)
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-trace.txt b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-trace.txt
@@ -1,2 +1,4 @@
 Comparing source compatibility of  against 
-No changes.
+***  MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.trace.SdkTracerProviderBuilder  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.trace.SdkTracerProviderBuilder mergeResource(io.opentelemetry.sdk.resources.Resource)
diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerProviderBuilder.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerProviderBuilder.java
@@ -15,6 +15,7 @@
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Supplier;
 
 /**
@@ -95,4 +96,15 @@ public SdkLoggerProviderBuilder setClock(Clock clock) {
   public SdkLoggerProvider build() {
     return new SdkLoggerProvider(resource, logLimitsSupplier, logRecordProcessors, clock);
   }
+
+  /**
+   * Merge custom resource object with the current resource object.
+   *
+   * @param resource {@link Resource} object to merge with current.
+   */
+  public SdkLoggerProviderBuilder mergeResource(Resource resource) {
+    Objects.requireNonNull(resource, "resource");
+    this.resource.merge(resource);
+    return this;
+  }
 }
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilder.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilder.java
@@ -134,4 +134,15 @@ SdkMeterProviderBuilder registerMetricReader(
   public SdkMeterProvider build() {
     return new SdkMeterProvider(registeredViews, metricReaders, clock, resource, exemplarFilter);
   }
+
+  /**
+   * Merge custom resource object with the current resource object.
+   *
+   * @param resource {@link Resource} object to merge with current.
+   */
+  public SdkMeterProviderBuilder mergeResource(Resource resource) {
+    Objects.requireNonNull(resource, "resource");
+    this.resource.merge(resource);
+    return this;
+  }
 }
diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerProviderBuilder.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerProviderBuilder.java
@@ -12,6 +12,7 @@
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Supplier;
 
 /** Builder of {@link SdkTracerProvider}. */
@@ -145,4 +146,15 @@ public SdkTracerProvider build() {
   }
 
   SdkTracerProviderBuilder() {}
+
+  /**
+   * Merge custom resource object with the current resource object.
+   *
+   * @param resource {@link Resource} object to merge with current.
+   */
+  public SdkTracerProviderBuilder mergeResource(Resource resource) {
+    Objects.requireNonNull(resource, "resource");
+    this.resource.merge(resource);
+    return this;
+  }
 }