-
Notifications
You must be signed in to change notification settings - Fork 1k
DocGenerator fixes #13968
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
DocGenerator fixes #13968
Changes from 3 commits
Commits
Show all changes
4 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
87 changes: 87 additions & 0 deletions
87
...tation-docs/src/main/java/io/opentelemetry/instrumentation/docs/parsers/MetricParser.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,87 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.instrumentation.docs.parsers; | ||
|
|
||
| import io.opentelemetry.instrumentation.docs.internal.EmittedMetrics; | ||
| import io.opentelemetry.instrumentation.docs.utils.FileManager; | ||
| import io.opentelemetry.instrumentation.docs.utils.YamlHelper; | ||
| import java.io.IOException; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.logging.Logger; | ||
| import java.util.stream.Stream; | ||
|
|
||
| public class MetricParser { | ||
| private static final Logger logger = Logger.getLogger(MetricParser.class.getName()); | ||
|
|
||
| /** | ||
| * Looks for metric files in the .telemetry directory, and combines them into a single list of | ||
| * metrics. | ||
| * | ||
| * @param instrumentationDirectory the directory to traverse | ||
| * @return contents of aggregated files | ||
| */ | ||
| public static EmittedMetrics getMetricsFromFiles( | ||
| String rootDir, String instrumentationDirectory) { | ||
| StringBuilder metricsContent = new StringBuilder("metrics:\n"); | ||
| Path telemetryDir = Paths.get(rootDir + "/" + instrumentationDirectory, ".telemetry"); | ||
|
|
||
| if (Files.exists(telemetryDir) && Files.isDirectory(telemetryDir)) { | ||
| try (Stream<Path> files = Files.list(telemetryDir)) { | ||
| files | ||
| .filter(path -> path.getFileName().toString().startsWith("metrics-")) | ||
| .forEach( | ||
| path -> { | ||
| String content = FileManager.readFileToString(path.toString()); | ||
| if (content != null) { | ||
| // Skip the first line of yaml ("metrics:") so we can aggregate into one list | ||
| int firstNewline = content.indexOf('\n'); | ||
| if (firstNewline != -1) { | ||
| String contentWithoutFirstLine = content.substring(firstNewline + 1); | ||
| metricsContent.append(contentWithoutFirstLine); | ||
| } | ||
| } | ||
| }); | ||
| } catch (IOException e) { | ||
| logger.severe("Error reading metrics files: " + e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| return parseMetrics(metricsContent.toString()); | ||
| } | ||
|
|
||
| /** | ||
| * Takes in a raw string representation of the aggregated EmittedMetrics yaml, deduplicates the | ||
| * metrics by name and then returns a new EmittedMetrics object. | ||
| * | ||
| * @param input raw string representation of EmittedMetrics yaml | ||
| * @return EmittedMetrics | ||
| */ | ||
| // visible for testing | ||
| public static EmittedMetrics parseMetrics(String input) { | ||
| EmittedMetrics metrics = YamlHelper.emittedMetricsParser(input); | ||
| if (metrics.getMetrics() == null) { | ||
| return new EmittedMetrics(Collections.emptyList()); | ||
| } | ||
|
|
||
| // deduplicate metrics by name | ||
| Map<String, EmittedMetrics.Metric> deduplicatedMetrics = new HashMap<>(); | ||
| for (EmittedMetrics.Metric metric : metrics.getMetrics()) { | ||
| deduplicatedMetrics.put(metric.getName(), metric); | ||
| } | ||
|
|
||
| List<EmittedMetrics.Metric> uniqueMetrics = new ArrayList<>(deduplicatedMetrics.values()); | ||
| return new EmittedMetrics(uniqueMetrics); | ||
| } | ||
|
|
||
| private MetricParser() {} | ||
| } |
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.
You really don't need to specify the charset. By default
newBufferedWriteruses utf-8 which is what you want. Default charset could be something else.