-
Notifications
You must be signed in to change notification settings - Fork 985
Update to opentelemetry-configuration v1.1.0 #8451
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
Open
jack-berg
wants to merge
6
commits into
open-telemetry:main
Choose a base branch
from
jack-berg:declarative-config-1.1
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d1896eb
Update to opentelemetry-configuration latest ref
jack-berg b3fcffd
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
jack-berg 3b92c73
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
jack-berg d275e5d
Bump to v1.1.0 tag
jack-berg eaf7878
Add support for new declarative config features
jack-berg abac96b
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
jack-berg 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
34 changes: 34 additions & 0 deletions
34
...rc/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/IdGeneratorFactory.java
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.autoconfigure.declarativeconfig; | ||
|
|
||
| import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.IdGeneratorModel; | ||
| import io.opentelemetry.sdk.trace.IdGenerator; | ||
|
|
||
| final class IdGeneratorFactory implements Factory<IdGeneratorModel, IdGenerator> { | ||
|
|
||
| private static final IdGeneratorFactory INSTANCE = new IdGeneratorFactory(); | ||
|
|
||
| private IdGeneratorFactory() {} | ||
|
|
||
| static IdGeneratorFactory getInstance() { | ||
| return INSTANCE; | ||
| } | ||
|
|
||
| @Override | ||
| public IdGenerator create(IdGeneratorModel model, DeclarativeConfigContext context) { | ||
| // We don't use the variable till later but call validate first to confirm there are not | ||
| // multiple IdGenerators. | ||
| ConfigKeyValue processorKeyValue = | ||
| FileConfigUtil.validateSingleKeyValue(context, model, "id generator"); | ||
|
|
||
| if (model.getRandom() != null) { | ||
| return IdGenerator.random(); | ||
| } | ||
|
|
||
| return context.loadComponent(IdGenerator.class, processorKeyValue); | ||
| } | ||
| } |
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
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
51 changes: 51 additions & 0 deletions
51
...re/declarativeconfig/model/ExperimentalEventToSpanEventBridgeLogRecordProcessorModel.java
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,51 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.sdk.autoconfigure.declarativeconfig.model; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.annotation.JsonPropertyOrder; | ||
| import javax.annotation.Generated; | ||
|
|
||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| @JsonPropertyOrder({}) | ||
| @Generated("jsonschema2pojo") | ||
| @SuppressWarnings({"NullAway", "rawtypes", "BoxedPrimitiveEquality"}) | ||
| public class ExperimentalEventToSpanEventBridgeLogRecordProcessorModel { | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| StringBuilder sb = new StringBuilder(); | ||
| sb.append(ExperimentalEventToSpanEventBridgeLogRecordProcessorModel.class.getName()) | ||
| .append('@') | ||
| .append(Integer.toHexString(System.identityHashCode(this))) | ||
| .append('['); | ||
| if (sb.charAt((sb.length() - 1)) == ',') { | ||
| sb.setCharAt((sb.length() - 1), ']'); | ||
| } else { | ||
| sb.append(']'); | ||
| } | ||
| return sb.toString(); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| int result = 1; | ||
| return result; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object other) { | ||
| if (other == this) { | ||
| return true; | ||
| } | ||
| if ((other instanceof ExperimentalEventToSpanEventBridgeLogRecordProcessorModel) == false) { | ||
| return false; | ||
| } | ||
| ExperimentalEventToSpanEventBridgeLogRecordProcessorModel rhs = | ||
| ((ExperimentalEventToSpanEventBridgeLogRecordProcessorModel) other); | ||
| return true; | ||
| } | ||
| } |
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
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.
With POJOs checked into VCS now, its cool /useful to see these diffs as we update to the new version of the schema