NeuronCore mapping bug fix #341
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,11 +14,12 @@ import ( | |
| ) | ||
|
|
||
| const ( | ||
| statusType = "status_type" | ||
| errorType = "error_type" | ||
| memoryLocation = "memory_location" | ||
| percentile = "percentile" | ||
| RuntimeTagOverride = "DEFAULT" | ||
| DefaultNeuronCorePerDevice = 2 | ||
| ) | ||
|
|
||
| var attributeConfig = map[string][]string{ | ||
|
|
@@ -66,6 +67,13 @@ func (ed *EmptyMetricDecorator) ConsumeMetrics(ctx context.Context, md pmetric.M | |
| neuronHardwareInfo, neuronHardwareInfoFound := findNeuronHardwareInfo(metrics) | ||
| if neuronHardwareInfoFound { | ||
| ed.addEmptyMetrics(neuronHardwareInfo, metrics) | ||
| neuronCoresPerDevice, foundCoresPerDevice := getNeuronCoresPerDevice(neuronHardwareInfo) | ||
| if foundCoresPerDevice { | ||
| ed.addNeuronCorePerDeviceAttribute(metrics, neuronCoresPerDevice) | ||
| } else { | ||
| // Always add the Default if the above is not found, should never happen | ||
| ed.addNeuronCorePerDeviceAttribute(metrics, DefaultNeuronCorePerDevice) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -129,7 +137,6 @@ func populateCoreMetrics(metrics pmetric.MetricSlice, metricName string, hardwar | |
| datapoint.Attributes().PutStr(neuronCoreOriginalAttributeKey, strconv.Itoa(coreIndex)) | ||
| datapoint.Attributes().PutStr(neuronDeviceAttributeKey, strconv.Itoa(coreIndex/neuronCoresPerDevice)) | ||
| datapoint.Attributes().PutStr("runtime_tag", RuntimeTagOverride) | ||
| } | ||
|
|
||
| metricToAdd.CopyTo(metrics.AppendEmpty()) | ||
|
|
@@ -159,7 +166,38 @@ func createNewMetricFromHardwareInfo(hardwareInfo pmetric.Metric, metricName str | |
| metricBody := metricToAdd.Gauge().DataPoints().At(0) | ||
| metricBody.SetDoubleValue(0) | ||
| metricBody.Attributes().PutStr("runtime_tag", RuntimeTagOverride) | ||
|
|
||
| return metricToAdd | ||
| } | ||
|
|
||
| // method to add neuroncore_per_device_count attribute to all metrics | ||
| func (ed *EmptyMetricDecorator) addNeuronCorePerDeviceAttribute(metrics pmetric.MetricSlice, neuronCoresPerDevice int) { | ||
|
There was a problem hiding this comment. Why does this have to be a datapoint attribute? Cant it be a resource attr?
Author
There was a problem hiding this comment. We chose to do it like this because we don't have access to the resource later on. But this would be a good idea for future refactoring. There was a problem hiding this comment. Its the same pmetric getting passed to the processor right? I dont get why it wont be available later on.
Author
There was a problem hiding this comment. Will do, thank you for pointing this out |
||
| attributeValue := strconv.Itoa(neuronCoresPerDevice) | ||
| for i := 0; i < metrics.Len(); i++ { | ||
| m := metrics.At(i) | ||
| switch m.Type() { | ||
| case pmetric.MetricTypeGauge: | ||
| ed.addAttributeToNumberDataPoints(m.Gauge().DataPoints(), attributeValue) | ||
| case pmetric.MetricTypeSum: | ||
| ed.addAttributeToNumberDataPoints(m.Sum().DataPoints(), attributeValue) | ||
| case pmetric.MetricTypeHistogram: | ||
| dataPoints := m.Histogram().DataPoints() | ||
| for j := 0; j < dataPoints.Len(); j++ { | ||
| dataPoints.At(j).Attributes().PutStr(neuronCorePerDeviceKey, attributeValue) | ||
| } | ||
| case pmetric.MetricTypeSummary: | ||
| dataPoints := m.Summary().DataPoints() | ||
| for j := 0; j < dataPoints.Len(); j++ { | ||
| dataPoints.At(j).Attributes().PutStr(neuronCorePerDeviceKey, attributeValue) | ||
| } | ||
| default: | ||
| ed.Logger.Info("Metric type not supported", zap.String("metricType", m.Type().String())) | ||
|
petruanica marked this conversation as resolved.
Outdated
|
||
| } | ||
| } | ||
| } | ||
|
|
||
| func (ed *EmptyMetricDecorator) addAttributeToNumberDataPoints(dataPoints pmetric.NumberDataPointSlice, attributeValue string) { | ||
| for j := 0; j < dataPoints.Len(); j++ { | ||
| dataPoints.At(j).Attributes().PutStr(neuronCorePerDeviceKey, attributeValue) | ||
| } | ||
| } | ||
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.
nit for better readability