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

chore: update OpenTelmetry plugins (#11194)

This commit is contained in:
Jacob Marble 2022-05-26 09:26:54 -07:00 committed by GitHub
parent 34e5d821f7
commit 8bf4ea8173
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
go.mod
View File

@ -79,9 +79,9 @@ require (
github.com/hashicorp/consul/api v1.12.0
github.com/hashicorp/go-uuid v1.0.2
github.com/influxdata/go-syslog/v3 v3.0.0
github.com/influxdata/influxdb-observability/common v0.2.20
github.com/influxdata/influxdb-observability/influx2otel v0.2.20
github.com/influxdata/influxdb-observability/otel2influx v0.2.20
github.com/influxdata/influxdb-observability/common v0.2.21
github.com/influxdata/influxdb-observability/influx2otel v0.2.21
github.com/influxdata/influxdb-observability/otel2influx v0.2.21
github.com/influxdata/line-protocol/v2 v2.2.1
github.com/influxdata/tail v1.0.1-0.20210707231403-b283181d1fa7
github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65
@ -140,7 +140,7 @@ require (
github.com/xdg/scram v1.0.5
github.com/yuin/goldmark v1.4.1
go.mongodb.org/mongo-driver v1.9.0
go.opentelemetry.io/collector/pdata v0.51.0
go.opentelemetry.io/collector/pdata v0.52.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.28.0
go.opentelemetry.io/otel/metric v0.28.0
go.opentelemetry.io/otel/sdk/metric v0.28.0
@ -154,7 +154,7 @@ require (
gonum.org/v1/gonum v0.11.0
google.golang.org/api v0.67.0
google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00
google.golang.org/grpc v1.46.0
google.golang.org/grpc v1.46.2
google.golang.org/protobuf v1.28.0
gopkg.in/gorethink/gorethink.v3 v3.0.5
gopkg.in/olivere/elastic.v5 v5.0.86

20
go.sum
View File

@ -1310,12 +1310,12 @@ github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7m
github.com/influxdata/go-syslog/v3 v3.0.0 h1:jichmjSZlYK0VMmlz+k4WeOQd7z745YLsvGMqwtYt4I=
github.com/influxdata/go-syslog/v3 v3.0.0/go.mod h1:tulsOp+CecTAYC27u9miMgq21GqXRW6VdKbOG+QSP4Q=
github.com/influxdata/influxdb v1.8.4/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI=
github.com/influxdata/influxdb-observability/common v0.2.20 h1:gCDrsHnhkWm4nFH2PGHAtUx6IgR7u48bDASem+pQjms=
github.com/influxdata/influxdb-observability/common v0.2.20/go.mod h1:9t4MDkYRImBa4Wuatb3URr6tlimGT1JUYv9O8y5L/C8=
github.com/influxdata/influxdb-observability/influx2otel v0.2.20 h1:A0XKklwAa+INyirFMcFFOBkXSOBduD+zET1Eoo4HPaM=
github.com/influxdata/influxdb-observability/influx2otel v0.2.20/go.mod h1:rWuw8bSmCbj6h3JLtj8QyXvoDnFtXKfGIzlcPMyH4Q8=
github.com/influxdata/influxdb-observability/otel2influx v0.2.20 h1:pBAzvwHvcXtQ+Fa+xSTJ0ddagqdend23+vKTThjBdm0=
github.com/influxdata/influxdb-observability/otel2influx v0.2.20/go.mod h1:AWkadnBhKwYeGgGquzIE9K88AgVB5xTwsw4WNugsFGc=
github.com/influxdata/influxdb-observability/common v0.2.21 h1:r48Krsc4ZtVMh4HV8cFh7+OUScCjjxsPmmT79mrtdeU=
github.com/influxdata/influxdb-observability/common v0.2.21/go.mod h1:fxeWJeqB/vN9mJvYA1EAM9wl7mfYA/H+4d81xeqQEv4=
github.com/influxdata/influxdb-observability/influx2otel v0.2.21 h1:tmmLtJBEOU04+CLc1WsPSWVVW+BTmdmAlpgROlY/zog=
github.com/influxdata/influxdb-observability/influx2otel v0.2.21/go.mod h1:Bg6Pi3swyEv3kvl/+3odBLG+LzPXS38IW5EkW3Qs3wg=
github.com/influxdata/influxdb-observability/otel2influx v0.2.21 h1:u/9TVy1nKfzmKg1QYmAwDtnMCOvVDdafPg0f5GUim/8=
github.com/influxdata/influxdb-observability/otel2influx v0.2.21/go.mod h1:tuvPe7mdJXuxqB+0Zt4vuy3AxZX9SryGIullw1wz8+o=
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385/go.mod h1:gHp9y86a/pxhjJ+zMjNXiQAA197Xk9wLxaz+fGG+kWk=
github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e/go.mod h1:4kt73NQhadE3daL3WhR5EJ/J2ocX0PZzwxQ0gXJ7oFE=
@ -2325,8 +2325,8 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opentelemetry.io/collector v0.28.0/go.mod h1:AP/BTXwo1eedoJO7V+HQ68CSvJU1lcdqOzJCgt1VsNs=
go.opentelemetry.io/collector/pdata v0.51.0 h1:J5CCnrg1iGOA1CfFOH+wAkMlJ1vjcm677kuPp18mbko=
go.opentelemetry.io/collector/pdata v0.51.0/go.mod h1:FsowYKNmf8CgsHgOfJv8V3KjALmy6FYQRHtXAOY3fho=
go.opentelemetry.io/collector/pdata v0.52.0 h1:B0L9fkqKq5xRKFjICK9i11PRyTR52CCYSpTWaynf1Qc=
go.opentelemetry.io/collector/pdata v0.52.0/go.mod h1:GJUTfTv8mlYpHRjcmHXVbvJr48EW/q/P/HuBvpXAE58=
go.opentelemetry.io/otel v0.7.0/go.mod h1:aZMyHG5TqDOXEgH2tyLiXSUKly1jT3yqE9PmrzIeCdo=
go.opentelemetry.io/otel v1.6.0 h1:YV6GkGe/Ag2PKsm4rjlqdSNs0w0A5ZzxeGkxhx1T+t4=
go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ=
@ -3105,8 +3105,8 @@ google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K
google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8=
google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ=
google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=

2
plugins/inputs/opentelemetry/opentelemetry.go
View File

@ -20,7 +20,7 @@ import (
"github.com/influxdata/telegraf/plugins/inputs"
)
// DO NOT REMOVE THE NEXT TWO LINES! This is required to embedd the sampleConfig data.
// DO NOT REMOVE THE NEXT TWO LINES! This is required to embed the sampleConfig data.
//go:embed sample.conf
var sampleConfig string

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

@ -21,7 +21,7 @@ import (
"github.com/influxdata/telegraf/plugins/outputs"
)
// DO NOT REMOVE THE NEXT TWO LINES! This is required to embedd the sampleConfig data.
// DO NOT REMOVE THE NEXT TWO LINES! This is required to embed the sampleConfig data.
//go:embed sample.conf
var sampleConfig string
@ -126,8 +126,7 @@ func (o *OpenTelemetry) Write(metrics []telegraf.Metric) error {
}
}
md := pmetricotlp.NewRequest()
md.SetMetrics(batch.GetMetrics())
md := pmetricotlp.NewRequestFromMetrics(batch.GetMetrics())
if md.Metrics().ResourceMetrics().Len() == 0 {
return nil
}