CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: outputs.opentelemetry use attributes setting (#9588)

This commit is contained in:
alrex 2021-09-07 14:15:13 -07:00 committed by GitHub
parent 0317d7c3db
commit 147e3d1389
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/outputs/opentelemetry/opentelemetry.go
View File

@ -160,6 +160,14 @@ func (o *OpenTelemetry) Write(metrics []telegraf.Metric) error {
return nil return nil
} }
if len(o.Attributes) > 0 {
for i := 0; i < md.ResourceMetrics().Len(); i++ {
for k, v := range o.Attributes {
md.ResourceMetrics().At(i).Resource().Attributes().UpsertString(k, v)
}
}
}
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(o.Timeout)) ctx, cancel := context.WithTimeout(context.Background(), time.Duration(o.Timeout))
if len(o.Headers) > 0 { if len(o.Headers) > 0 {

2
plugins/outputs/opentelemetry/opentelemetry_test.go
View File

@ -26,6 +26,7 @@ func TestOpenTelemetry(t *testing.T) {
{ {
rm := expect.ResourceMetrics().AppendEmpty() rm := expect.ResourceMetrics().AppendEmpty()
rm.Resource().Attributes().InsertString("host.name", "potato") rm.Resource().Attributes().InsertString("host.name", "potato")
rm.Resource().Attributes().InsertString("attr-key", "attr-val")
ilm := rm.InstrumentationLibraryMetrics().AppendEmpty() ilm := rm.InstrumentationLibraryMetrics().AppendEmpty()
ilm.InstrumentationLibrary().SetName("My Library Name") ilm.InstrumentationLibrary().SetName("My Library Name")
m := ilm.Metrics().AppendEmpty() m := ilm.Metrics().AppendEmpty()
@ -45,6 +46,7 @@ func TestOpenTelemetry(t *testing.T) {
ServiceAddress: m.Address(), ServiceAddress: m.Address(),
Timeout: config.Duration(time.Second), Timeout: config.Duration(time.Second),
Headers: map[string]string{"test": "header1"}, Headers: map[string]string{"test": "header1"},
Attributes: map[string]string{"attr-key": "attr-val"},
metricsConverter: metricsConverter, metricsConverter: metricsConverter,
grpcClientConn: m.GrpcClient(), grpcClientConn: m.GrpcClient(),
metricsServiceClient: otlpgrpc.NewMetricsClient(m.GrpcClient()), metricsServiceClient: otlpgrpc.NewMetricsClient(m.GrpcClient()),