Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

De-singleton ZPageServer implementation #4935

Merged
merged 5 commits into from Nov 12, 2022
Merged

De-singleton ZPageServer implementation #4935

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1efc40
remove the static/singleton nature from ZPageServer
breedx-splk Nov 10, 2022
48af61d
add convenience method for creating zpages-based sdktracerprovider
breedx-splk Nov 10, 2022
18609c8
update readme for zpageserver
breedx-splk Nov 10, 2022
84e6a4f
oh checkstyle.
breedx-splk Nov 11, 2022
4ecb895
overload build and add test
breedx-splk Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 12 additions & 1 deletion ...ator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/zpages/ZPageServer.java
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@
import com.sun.net.httpserver.HttpServer;
import io.opentelemetry.api.internal.GuardedBy;
import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
import io.opentelemetry.sdk.trace.SpanLimits;
import io.opentelemetry.sdk.trace.SpanProcessor;
import io.opentelemetry.sdk.trace.samplers.Sampler;
Expand Down Expand Up @@ -195,7 +196,17 @@ private void stop() {
* @return new SdkTracerProvider
*/
public SdkTracerProvider buildSdkTracerProvider() {
return SdkTracerProvider.builder()
return buildSdkTracerProvider(SdkTracerProvider.builder());
}

/**
* Convenience method to return a new SdkTracerProvider that has been configured with our ZPage
* specific span processor, sampler, and limits.
*
* @return new SdkTracerProvider
*/
public SdkTracerProvider buildSdkTracerProvider(SdkTracerProviderBuilder builder) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have this return void, but don't feel strongly since its a convenience method and is experimental.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool. Yeah I totally see where you're coming from, but pure side-effect methods also give me the creeps. :)

return builder
.addSpanProcessor(getSpanProcessor())
.setSpanLimits(getTracezTraceConfigSupplier())
.setSampler(getTracezSampler())
Expand Down
13 changes: 13 additions & 0 deletions .../src/test/java/io/opentelemetry/sdk/extension/incubator/trace/zpages/ZPageServerTest.java
View file
Open in desktop
Expand Up @@ -7,6 +7,8 @@

import static org.assertj.core.api.Assertions.assertThat;

import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.SpanLimits;
import org.junit.jupiter.api.Test;

class ZPageServerTest {
Expand All @@ -28,4 +30,15 @@ void testSampler() {
ZPageServer server = ZPageServer.create();
assertThat(server.getTracezSampler()).isInstanceOf(TracezTraceConfigSupplier.class);
}

@Test
void buildTracerProvider() {
ZPageServer server = ZPageServer.create();
SpanLimits expectedLimits = server.getTracezTraceConfigSupplier().get();

try (SdkTracerProvider provider = server.buildSdkTracerProvider()) {
assertThat(provider.getSpanLimits()).isEqualTo(expectedLimits);
assertThat(provider.getSampler()).isSameAs(server.getTracezSampler());
}
}
}