-
Notifications
You must be signed in to change notification settings - Fork 45
Prepare release 2.25.0 #2640
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.
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
Merged
Merged
Prepare release 2.25.0 #2640
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,2 @@ | ||
| # opentelemetry-sdk-trace jar includes META-INF/maven/org.jctools/jctools-core Hopefully this will get removed in the next release and we won't need these overrides | ||
| io.opentelemetry:opentelemetry-sdk-trace:1.58.0|https://github.com/open-telemetry/opentelemetry-java|Apache License, Version 2.0|https://www.apache.org/licenses/LICENSE-2.0 | ||
| io.opentelemetry:opentelemetry-sdk-trace:1.59.0|https://github.com/open-telemetry/opentelemetry-java|Apache License, Version 2.0|https://www.apache.org/licenses/LICENSE-2.0 |
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 |
|---|---|---|
|
|
@@ -23,15 +23,13 @@ | |
| import io.opentelemetry.api.incubator.config.ConfigProvider; | ||
| import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; | ||
| import io.opentelemetry.common.ComponentLoader; | ||
| import io.opentelemetry.instrumentation.config.bridge.ConfigPropertiesBackedConfigProvider; | ||
| import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; | ||
| import io.opentelemetry.sdk.extension.incubator.fileconfig.YamlDeclarativeConfigProperties; | ||
| import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.DistributionModel; | ||
| import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.DistributionPropertyModel; | ||
| import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; | ||
| import io.opentelemetry.sdk.resources.Resource; | ||
| import java.util.Map; | ||
| import java.util.logging.Logger; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
|
|
@@ -45,7 +43,17 @@ | |
| * <p>This class is internal and is not intended for public use. | ||
| */ | ||
| public final class AutoConfigureUtil { | ||
| private static final Logger logger = Logger.getLogger(AutoConfigureUtil.class.getName()); | ||
| private static final Class<?> DECLARATIVE_CONFIG_PROPERTIES_BRIDGE_CLASS; | ||
|
|
||
| static { | ||
| try { | ||
| DECLARATIVE_CONFIG_PROPERTIES_BRIDGE_CLASS = | ||
| Class.forName( | ||
| "io.opentelemetry.instrumentation.config.bridge.DeclarativeConfigPropertiesBridge"); | ||
| } catch (ClassNotFoundException exception) { | ||
| throw new IllegalStateException(exception); | ||
| } | ||
| } | ||
|
|
||
| private AutoConfigureUtil() {} | ||
|
|
||
|
|
@@ -55,9 +63,10 @@ public static ConfigProperties getConfig(AutoConfiguredOpenTelemetrySdk sdk) { | |
| } | ||
|
|
||
| public static boolean isDeclarativeConfig(AutoConfiguredOpenTelemetrySdk sdk) { | ||
| ConfigProvider configProvider = getConfigProvider(sdk); | ||
| return configProvider != null | ||
| && !(configProvider instanceof ConfigPropertiesBackedConfigProvider); | ||
| ConfigProperties configProperties = | ||
| io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil.getConfig(sdk); | ||
| return configProperties == null | ||
| || DECLARATIVE_CONFIG_PROPERTIES_BRIDGE_CLASS.isInstance(configProperties); | ||
|
Comment on lines
+66
to
+69
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. hacktastic! 🚀 |
||
| } | ||
|
|
||
| public static ConfigProvider getConfigProvider(AutoConfiguredOpenTelemetrySdk sdk) { | ||
|
|
||
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
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.
I see that detecting declarative configuration is getting more and more tricky. I think it would be good to contribute something in this area to the upstream.