Skip to content
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.

Sign up for GitHub

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

Fix telemetry labels propagation #835

Merged
merged 1 commit into from
Oct 28, 2022
Merged

Fix telemetry labels propagation #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions pkg/otelcollector/metricsprocessor/internal/check_response_labels.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,6 @@ func AddCheckResponseBasedLabels(attributes pcommon.Map, checkResponse *flowcont
labels[otelcollector.ApertureFlowLabelKeysLabel].Slice().AppendEmpty().SetStr(flowLabelKey)
}

for key, value := range checkResponse.GetTelemetryFlowLabels() {
pcommon.NewValueStr(value).CopyTo(attributes.PutEmpty(key))
}

for _, classifier := range checkResponse.ClassifierInfos {
rawValue := []string{
fmt.Sprintf("%s:%v", metrics.PolicyNameLabel, classifier.PolicyName),
Expand All @@ -141,3 +137,10 @@ func AddCheckResponseBasedLabels(attributes pcommon.Map, checkResponse *flowcont
value.CopyTo(attributes.PutEmpty(key))
}
}

// AddFlowLabels adds dynamic from labels.
func AddFlowLabels(attributes pcommon.Map, checkResponse *flowcontrolv1.CheckResponse) {
for key, value := range checkResponse.GetTelemetryFlowLabels() {
pcommon.NewValueStr(value).CopyTo(attributes.PutEmpty(key))
}
}
26 changes: 13 additions & 13 deletions pkg/otelcollector/metricsprocessor/internal/check_response_labels_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,19 +107,6 @@ var _ = DescribeTable("Check Response labels", func(checkResponse *flowcontrolv1
map[string]interface{}{otelcollector.ApertureFlowLabelKeysLabel: []interface{}{"someLabel", "otherLabel"}},
),

Entry("Sets telemetry flow labels",
&flowcontrolv1.CheckResponse{
TelemetryFlowLabels: map[string]string{
"someLabel": "someValue",
"otherLabel": "otherValue",
},
},
map[string]interface{}{
"someLabel": "someValue",
"otherLabel": "otherValue",
},
),

Entry("Sets classifiers",
&flowcontrolv1.CheckResponse{
ClassifierInfos: []*flowcontrolv1.ClassifierInfo{
Expand All @@ -138,3 +125,16 @@ var _ = DescribeTable("Check Response labels", func(checkResponse *flowcontrolv1
},
),
)

var _ = Describe("AddFlowLabels", func() {
attributes := pcommon.NewMap()
checkResponse := &flowcontrolv1.CheckResponse{
TelemetryFlowLabels: map[string]string{
"someLabel": "someValue",
"otherLabel": "otherValue",
},
}
internal.AddFlowLabels(attributes, checkResponse)
Expect(attributes.AsRaw()).To(HaveKeyWithValue("someLabel", "someValue"))
Expect(attributes.AsRaw()).To(HaveKeyWithValue("otherLabel", "otherValue"))
})
3 changes: 3 additions & 0 deletions pkg/otelcollector/metricsprocessor/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ func (p *metricsProcessor) ConsumeLogs(ctx context.Context, ld plog.Logs) (plog.
p.updateMetrics(attributes, checkResponse, []string{otelcollector.EnvoyMissingAttributeValue})
internal.EnforceIncludeListHTTP(attributes)
}

// This needs to be called **after** internal.EnforceIncludeList{HTTP,SDK}.
internal.AddFlowLabels(attributes, checkResponse)
return nil
})
return ld, err
Expand Down
2 changes: 2 additions & 0 deletions pkg/otelcollector/metricsprocessor/processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ var _ = Describe("Metrics Processor", func() {
}}
baseCheckResp.FluxMeterInfos = []*flowcontrolv1.FluxMeterInfo{{FluxMeterName: "bar"}}
baseCheckResp.FlowLabelKeys = []string{"someLabel"}
baseCheckResp.TelemetryFlowLabels = map[string]string{"flowLabelKey": "flowLabelValue"}
baseCheckResp.Services = []string{"svc1", "svc2"}

// <split> is a workaround until PR https://github.com/prometheus/client_golang/pull/1143 is released
Expand Down Expand Up @@ -228,6 +229,7 @@ workload_latency_ms_count{component_index="1",decision_type="DECISION_TYPE_REJEC
oc.ApertureProcessingDurationLabel: float64(1000),
oc.ApertureServicesLabel: []interface{}{"svc1", "svc2"},
oc.ApertureControlPointLabel: "type:TYPE_INGRESS",
"flowLabelKey": "flowLabelValue",
}
source = oc.ApertureSourceEnvoy

Expand Down