-
Notifications
You must be signed in to change notification settings - Fork 33
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
Allow setting otlp protocol for profiler with otel.exporter.otlp.protocol #2090
Merged
Merged
Changes from all commits
Commits
Show all changes
2 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 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 |
---|---|---|
|
@@ -47,7 +47,8 @@ public class Configuration implements AutoConfigurationCustomizerProvider { | |
public static final String CONFIG_KEY_RECORDING_DURATION = "splunk.profiler.recording.duration"; | ||
public static final String CONFIG_KEY_KEEP_FILES = "splunk.profiler.keep-files"; | ||
public static final String CONFIG_KEY_INGEST_URL = "splunk.profiler.logs-endpoint"; | ||
public static final String CONFIG_KEY_OTLP_PROTOCOL = "splunk.profiler.otlp.protocol"; | ||
public static final String CONFIG_KEY_PROFILER_OTLP_PROTOCOL = "splunk.profiler.otlp.protocol"; | ||
public static final String CONFIG_KEY_OTLP_PROTOCOL = "otel.exporter.otlp.protocol"; | ||
public static final String CONFIG_KEY_OTEL_OTLP_URL = "otel.exporter.otlp.endpoint"; | ||
public static final String CONFIG_KEY_MEMORY_ENABLED = PROFILER_MEMORY_ENABLED_PROPERTY; | ||
public static final String CONFIG_KEY_MEMORY_EVENT_RATE_LIMIT_ENABLED = | ||
|
@@ -82,7 +83,6 @@ Map<String, String> defaultProperties() { | |
config.put(CONFIG_KEY_MEMORY_ENABLED, String.valueOf(DEFAULT_MEMORY_ENABLED)); | ||
config.put(CONFIG_KEY_MEMORY_EVENT_RATE, DEFAULT_MEMORY_EVENT_RATE); | ||
config.put(CONFIG_KEY_CALL_STACK_INTERVAL, DEFAULT_CALL_STACK_INTERVAL.toMillis() + "ms"); | ||
config.put(CONFIG_KEY_OTLP_PROTOCOL, "http/protobuf"); | ||
return config; | ||
} | ||
|
||
|
@@ -116,7 +116,9 @@ private static String getDefaultLogsEndpoint(ConfigProperties config) { | |
} | ||
|
||
public static String getOtlpProtocol(ConfigProperties config) { | ||
return config.getString(CONFIG_KEY_OTLP_PROTOCOL); | ||
return config.getString( | ||
CONFIG_KEY_PROFILER_OTLP_PROTOCOL, | ||
config.getString(CONFIG_KEY_OTLP_PROTOCOL, "http/protobuf")); | ||
Comment on lines
+119
to
+121
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. 👍🏻 |
||
} | ||
|
||
public static boolean getMemoryEnabled(ConfigProperties config) { | ||
|
This file contains 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 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.
This makes it a little more challenging for a casual reader to know the default, but I think it's fine.