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

Merge the current Resource object with custom Resource Object. (#5619)

This commit is contained in:
Parth Dadhaniya 2023-08-09 20:58:25 +05:30 committed by GitHub
parent 88c80b1378
commit f52050bc2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 126 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/apidiffs/current_vs_latest/opentelemetry-sdk-logs.txt
View File

@ -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 addResource(io.opentelemetry.sdk.resources.Resource)

4
docs/apidiffs/current_vs_latest/opentelemetry-sdk-metrics.txt
View File

@ -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 addResource(io.opentelemetry.sdk.resources.Resource)

4
docs/apidiffs/current_vs_latest/opentelemetry-sdk-trace.txt
View File

@ -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 addResource(io.opentelemetry.sdk.resources.Resource)

12
sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerProviderBuilder.java
View File

@ -15,6 +15,7 @@ import io.opentelemetry.sdk.logs.data.LogRecordData;
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 final class SdkLoggerProviderBuilder {
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 addResource(Resource resource) {
Objects.requireNonNull(resource, "resource");
this.resource = this.resource.merge(resource);
return this;
}
}

31
sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderBuilderTest.java Normal file
View File

@ -0,0 +1,31 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.sdk.logs;
import static org.assertj.core.api.Assertions.assertThat;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.sdk.resources.Resource;
import org.junit.jupiter.api.Test;
public class SdkLoggerProviderBuilderTest {
@Test
void addResource() {
Resource customResource =
Resource.create(
Attributes.of(
AttributeKey.stringKey("custom_attribute_key"), "custom_attribute_value"));
SdkLoggerProvider sdkLoggerProvider =
SdkLoggerProvider.builder().addResource(customResource).build();
assertThat(sdkLoggerProvider)
.extracting("sharedState")
.hasFieldOrPropertyWithValue("resource", Resource.getDefault().merge(customResource));
}
}

11
sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilder.java
View File

@ -134,4 +134,15 @@ public final class SdkMeterProviderBuilder {
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 addResource(Resource resource) {
Objects.requireNonNull(resource, "resource");
this.resource = this.resource.merge(resource);
return this;
}
}

20
sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilderTest.java
View File

@ -7,6 +7,8 @@ package io.opentelemetry.sdk.metrics;
import static org.assertj.core.api.Assertions.assertThat;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader;
import org.junit.jupiter.api.Test;
@ -23,4 +25,22 @@ class SdkMeterProviderBuilderTest {
.extracting("sharedState")
.hasFieldOrPropertyWithValue("resource", Resource.getDefault());
}
@Test
void addResource() {
Resource customResource =
Resource.create(
Attributes.of(
AttributeKey.stringKey("custom_attribute_key"), "custom_attribute_value"));
SdkMeterProvider sdkMeterProvider =
SdkMeterProvider.builder()
.registerMetricReader(InMemoryMetricReader.create())
.addResource(customResource)
.build();
assertThat(sdkMeterProvider)
.extracting("sharedState")
.hasFieldOrPropertyWithValue("resource", Resource.getDefault().merge(customResource));
}
}

12
sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerProviderBuilder.java
View File

@ -12,6 +12,7 @@ import io.opentelemetry.sdk.resources.Resource;
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 final class SdkTracerProviderBuilder {
}
SdkTracerProviderBuilder() {}
/**
* Merge custom resource object with the current resource object.
*
* @param resource {@link Resource} object to merge with current.
*/
public SdkTracerProviderBuilder addResource(Resource resource) {
Objects.requireNonNull(resource, "resource");
this.resource = this.resource.merge(resource);
return this;
}
}

31
sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkTracerProviderBuilderTest.java Normal file
View File

@ -0,0 +1,31 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.sdk.trace;
import static org.assertj.core.api.Assertions.assertThat;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.sdk.resources.Resource;
import org.junit.jupiter.api.Test;
public class SdkTracerProviderBuilderTest {
@Test
void addResource() {
Resource customResource =
Resource.create(
Attributes.of(
AttributeKey.stringKey("custom_attribute_key"), "custom_attribute_value"));
SdkTracerProvider sdkTracerProvider =
SdkTracerProvider.builder().addResource(customResource).build();
assertThat(sdkTracerProvider)
.extracting("sharedState")
.hasFieldOrPropertyWithValue("resource", Resource.getDefault().merge(customResource));
}
}