-
Notifications
You must be signed in to change notification settings - Fork 2
New - Enable Proxy Support for Declarative Configs #414
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
cleverchuk
wants to merge
1
commit into
main
Choose a base branch
from
cc/NH-128717
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
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
File renamed without changes.
46 changes: 46 additions & 0 deletions
46
...src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/ProxyParser.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,46 @@ | ||
| /* | ||
| * © SolarWinds Worldwide, LLC. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.solarwinds.opentelemetry.extensions.config.parser.yaml; | ||
|
|
||
| import com.google.auto.service.AutoService; | ||
| import com.solarwinds.joboe.config.ConfigParser; | ||
| import com.solarwinds.joboe.config.InvalidConfigException; | ||
| import com.solarwinds.joboe.config.ProxyConfig; | ||
| import com.solarwinds.opentelemetry.extensions.config.parser.json.ProxyConfigParser; | ||
| import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; | ||
|
|
||
| @SuppressWarnings("rawtypes") | ||
| @AutoService(ConfigParser.class) | ||
| public class ProxyParser implements ConfigParser<DeclarativeConfigProperties, ProxyConfig> { | ||
|
|
||
| private static final String CONFIG_KEY = "agent.proxy"; | ||
|
|
||
| @Override | ||
| public ProxyConfig convert(DeclarativeConfigProperties declarativeConfigProperties) | ||
| throws InvalidConfigException { | ||
| String proxyString = declarativeConfigProperties.getString(CONFIG_KEY); | ||
| if (proxyString == null) { | ||
| return null; | ||
| } | ||
| return ProxyConfigParser.INSTANCE.convert(proxyString); | ||
| } | ||
|
|
||
| @Override | ||
| public String configKey() { | ||
| return CONFIG_KEY; | ||
| } | ||
| } |
75 changes: 75 additions & 0 deletions
75
...com/solarwinds/opentelemetry/extensions/config/provider/LogExporterComponentProvider.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,75 @@ | ||
| /* | ||
| * © SolarWinds Worldwide, LLC. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.solarwinds.opentelemetry.extensions.config.provider; | ||
|
|
||
| import static io.opentelemetry.exporter.otlp.internal.OtlpConfigUtil.DATA_TYPE_LOGS; | ||
|
|
||
| import com.google.auto.service.AutoService; | ||
| import com.solarwinds.joboe.config.ConfigManager; | ||
| import com.solarwinds.joboe.config.ConfigProperty; | ||
| import com.solarwinds.joboe.config.ProxyConfig; | ||
| import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; | ||
| import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter; | ||
| import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporterBuilder; | ||
| import io.opentelemetry.exporter.otlp.internal.OtlpDeclarativeConfigUtil; | ||
| import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; | ||
| import io.opentelemetry.sdk.common.export.ProxyOptions; | ||
| import io.opentelemetry.sdk.logs.export.LogRecordExporter; | ||
| import java.net.InetSocketAddress; | ||
|
|
||
| @AutoService(ComponentProvider.class) | ||
| public class LogExporterComponentProvider implements ComponentProvider { | ||
|
|
||
| public static final String COMPONENT_NAME = "swo/logExporter"; | ||
|
|
||
| @Override | ||
| public Class<LogRecordExporter> getType() { | ||
| return LogRecordExporter.class; | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return COMPONENT_NAME; | ||
| } | ||
|
|
||
| @Override | ||
| public LogRecordExporter create(DeclarativeConfigProperties config) { | ||
| OtlpHttpLogRecordExporterBuilder builder = OtlpHttpLogRecordExporter.builder(); | ||
|
|
||
| OtlpDeclarativeConfigUtil.configureOtlpExporterBuilder( | ||
| DATA_TYPE_LOGS, | ||
| config, | ||
| builder::setComponentLoader, | ||
| builder::setEndpoint, | ||
| builder::addHeader, | ||
| builder::setCompression, | ||
| builder::setTimeout, | ||
| builder::setTrustedCertificates, | ||
| builder::setClientTls, | ||
| builder::setRetryPolicy, | ||
| builder::setMemoryMode, | ||
| true); | ||
|
|
||
| ProxyConfig proxyConfig = (ProxyConfig) ConfigManager.getConfig(ConfigProperty.AGENT_PROXY); | ||
| if (proxyConfig != null) { | ||
| builder.setProxyOptions( | ||
| ProxyOptions.create(new InetSocketAddress(proxyConfig.getHost(), proxyConfig.getPort()))); | ||
| } | ||
|
|
||
| return builder.build(); | ||
| } | ||
| } |
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.
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.
The InvalidConfigException is being wrapped in a RuntimeException without additional context. Consider providing a more descriptive error message that explains the proxy configuration failure, such as
throw new RuntimeException(\"Failed to parse proxy configuration\", e);.