Update to opentelemetry-configuration 1.0.0-rc.3 #7861
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.sdk.extension.incubator.fileconfig; | ||
|
|
||
| import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableProbabilitySamplerModel; | ||
| import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableSamplerModel; | ||
| import io.opentelemetry.sdk.extension.incubator.trace.samplers.ComposableSampler; | ||
| import java.util.Map; | ||
|
|
||
| final class ComposableSamplerFactory | ||
| implements Factory<ExperimentalComposableSamplerModel, ComposableSampler> { | ||
|
|
||
| private static final ComposableSamplerFactory INSTANCE = new ComposableSamplerFactory(); | ||
|
|
||
| private ComposableSamplerFactory() {} | ||
|
|
||
| static ComposableSamplerFactory getInstance() { | ||
| return INSTANCE; | ||
| } | ||
|
|
||
| @Override | ||
| public ComposableSampler create( | ||
| ExperimentalComposableSamplerModel model, DeclarativeConfigContext context) { | ||
| if (model.getAlwaysOn() != null) { | ||
| return ComposableSampler.alwaysOn(); | ||
| } | ||
| if (model.getAlwaysOff() != null) { | ||
| return ComposableSampler.alwaysOff(); | ||
| } | ||
| ExperimentalComposableProbabilitySamplerModel probability = model.getProbability(); | ||
| if (probability != null) { | ||
| Double ratio = probability.getRatio(); | ||
| if (ratio == null) { | ||
| ratio = 1.0d; | ||
| } | ||
| return ComposableSampler.probability(ratio); | ||
| } | ||
| Map.Entry<String, ?> keyValue = | ||
| FileConfigUtil.getSingletonMapEntry(model.getAdditionalProperties(), "composable sampler"); | ||
| return context.loadComponent(ComposableSampler.class, keyValue.getKey(), keyValue.getValue()); | ||
| } | ||
| } |
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 |
|---|---|---|
|
|
@@ -5,12 +5,16 @@ | |
|
|
||
| package io.opentelemetry.sdk.extension.incubator.fileconfig; | ||
|
|
||
| import static io.opentelemetry.sdk.extension.incubator.fileconfig.FileConfigUtil.requireNullResource; | ||
|
|
||
| import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel; | ||
| import io.opentelemetry.sdk.logs.export.LogRecordExporter; | ||
| import java.util.Map; | ||
|
|
||
| final class LogRecordExporterFactory implements Factory<LogRecordExporterModel, LogRecordExporter> { | ||
|
|
||
| private static final String RESOURCE_NAME = "log record exporter"; | ||
|
|
||
| private static final LogRecordExporterFactory INSTANCE = new LogRecordExporterFactory(); | ||
|
|
||
| private LogRecordExporterFactory() {} | ||
|
|
@@ -22,17 +26,37 @@ static LogRecordExporterFactory getInstance() { | |
| @Override | ||
| public LogRecordExporter create(LogRecordExporterModel model, DeclarativeConfigContext context) { | ||
|
|
||
| String key = null; | ||
| Object resource = null; | ||
|
|
||
| if (model.getOtlpHttp() != null) { | ||
| key = "otlp_http"; | ||
| resource = model.getOtlpHttp(); | ||
| } | ||
| if (model.getOtlpGrpc() != null) { | ||
| requireNullResource(resource, RESOURCE_NAME, model.getAdditionalProperties()); | ||
|
Member
There was a problem hiding this comment. Adding strictness here to fail fast?
Contributor
Author
There was a problem hiding this comment. I think this was to reproduce the max-1 check from the previous map/compute approach
Member
There was a problem hiding this comment. I think I understand the intent: if
Member
There was a problem hiding this comment. The old implementation works because I was sort of cheating and moving all the well known exporter model definitions to additionalProperties.
Member
There was a problem hiding this comment. I pushed bc11574 which sort of reverts this change but does it without polluting Thinking about this, I need to go apply this pattern to SamplerFactory, LgRecordProcessorFactory, SpanProcessorFactory, TextMapPropagatorFactory, AggregationFactory. In all these cases, exactly one key value pair is expected but the implementations tolerate multiple. Will do this in a followup PR. |
||
| key = "otlp_grpc"; | ||
| resource = model.getOtlpGrpc(); | ||
| } | ||
| if (model.getOtlpFileDevelopment() != null) { | ||
| requireNullResource(resource, RESOURCE_NAME, model.getAdditionalProperties()); | ||
| key = "otlp_file/development"; | ||
| resource = model.getOtlpFileDevelopment(); | ||
| } | ||
| if (model.getConsole() != null) { | ||
| requireNullResource(resource, RESOURCE_NAME, model.getAdditionalProperties()); | ||
| key = "console"; | ||
| resource = model.getConsole(); | ||
| } | ||
| if (key == null || resource == null) { | ||
| Map.Entry<String, ?> keyValue = | ||
| FileConfigUtil.getSingletonMapEntry(model.getAdditionalProperties(), RESOURCE_NAME); | ||
| key = keyValue.getKey(); | ||
| resource = keyValue.getValue(); | ||
| } | ||
|
|
||
| LogRecordExporter logRecordExporter = | ||
| context.loadComponent(LogRecordExporter.class, key, resource); | ||
| return context.addCloseable(logRecordExporter); | ||
| } | ||
| } | ||
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
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.
Uh oh!
There was an error while loading. Please reload this page.