feat: always return ExtendedOpenTelemetry when incubator is available #7991
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.sdk.extension.incubator.fileconfig; | ||
|
|
||
| import io.opentelemetry.sdk.OpenTelemetrySdkBuilder; | ||
| import java.lang.reflect.Method; | ||
|
|
||
| /** | ||
| * This class is internal and is hence not for public use. Its APIs are unstable and can change at | ||
| * any time. | ||
| */ | ||
| public final class OpenTelemetrySdkBuilderUtil { | ||
|
|
||
| private OpenTelemetrySdkBuilderUtil() {} | ||
|
|
||
| public static OpenTelemetrySdkBuilder setSdkConfigProvider( | ||
| OpenTelemetrySdkBuilder builder, SdkConfigProvider sdkConfigProvider) { | ||
| try { | ||
| Method method = | ||
| OpenTelemetrySdkBuilder.class.getDeclaredMethod("setSdkConfigProvider", Object.class); | ||
| method.setAccessible(true); | ||
| method.invoke(builder, sdkConfigProvider); | ||
| return builder; | ||
| } catch (NoSuchMethodException | ||
| | IllegalAccessException | ||
| | java.lang.reflect.InvocationTargetException e) { | ||
| throw new IllegalStateException( | ||
| "Error calling setSdkConfigProvider on OpenTelemetrySdkBuilder", e); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.sdk; | ||
|
|
||
| import java.lang.reflect.InvocationTargetException; | ||
| import java.lang.reflect.Method; | ||
|
|
||
| /** | ||
| * Utilities for interacting with incubating components ({@code | ||
| * io.opentelemetry:opentelemetry-api-incubator} and {@code | ||
| * io.opentelemetry:opentelemetry-sdk-extension-incubator}), which are not guaranteed to be present | ||
| * on the classpath. For all methods, callers MUST first separately reflectively confirm that the | ||
| * incubator is available on the classpath. | ||
| */ | ||
| final class IncubatingUtil { | ||
|
|
||
| private IncubatingUtil() {} | ||
|
|
||
| static Object noopSdkConfigProvider() { | ||
| try { | ||
| Class<?> sdkConfigProviderClass = | ||
| Class.forName("io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider"); | ||
| Method defaultProviderMethod = sdkConfigProviderClass.getMethod("noop"); | ||
| return defaultProviderMethod.invoke(null); | ||
| } catch (ClassNotFoundException | ||
| | NoSuchMethodException | ||
| | IllegalAccessException | ||
| | InvocationTargetException e) { | ||
| throw new IllegalStateException( | ||
| "Failed to create default SdkConfigProvider from incubator", e); | ||
| } | ||
| } | ||
|
|
||
| static OpenTelemetrySdk createExtendedOpenTelemetrySdk( | ||
| OpenTelemetrySdk openTelemetrySdk, Object sdkConfigProvider) { | ||
| try { | ||
| Class<?> extendedSdkClass = | ||
| Class.forName("io.opentelemetry.sdk.extension.incubator.ExtendedOpenTelemetrySdk"); | ||
| Class<?> sdkConfigProviderClass = | ||
| Class.forName("io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider"); | ||
| Method createMethod = | ||
| extendedSdkClass.getMethod("create", OpenTelemetrySdk.class, sdkConfigProviderClass); | ||
| return (OpenTelemetrySdk) | ||
| createMethod.invoke( | ||
| null, openTelemetrySdk, sdkConfigProviderClass.cast(sdkConfigProvider)); | ||
| } catch (ClassNotFoundException | ||
| | NoSuchMethodException | ||
| | IllegalAccessException | ||
| | InvocationTargetException e) { | ||
| throw new IllegalStateException( | ||
| "Failed to create ExtendedOpenTelemetrySdk from incubator", e); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unused and a duplicate of
ConfigProvider#noop()There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Called from https://github.com/zeitlinger/opentelemetry-java/blob/0db77eb839b0af1e7f32b0f7ced29e60edcce005/sdk/all/src/main/java/io/opentelemetry/sdk/IncubatingUtil.java#L26 to get an instance for ExtendedOpenTelemetrySdk.
I tried to make it return SdkConfigProvider - but then a design test failed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Called from https://github.com/zeitlinger/opentelemetry-java/blob/0db77eb839b0af1e7f32b0f7ced29e60edcce005/sdk/all/src/main/java/io/opentelemetry/sdk/IncubatingUtil.java#L26 to get an instance for ExtendedOpenTelemetrySdk.
I tried to make it return SdkConfigProvider - but then a design test failed.