Skip to content

Commit bf99a72

Browse files
author
Jacob Marble
authored
fix: update go.opentelemetry.io/collector/pdata from v0.48.0 to v0.49.0 (#10984)
1 parent b2a1c1b commit bf99a72

File tree

7 files changed

+53
-45
lines changed

7 files changed

+53
-45
lines changed

‎docs/LICENSE_OF_DEPENDENCIES.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ following works:
262262
- go.mongodb.org/mongo-driver [Apache License 2.0](https://github.com/mongodb/mongo-go-driver/blob/master/LICENSE)
263263
- go.opencensus.io [Apache License 2.0](https://github.com/census-instrumentation/opencensus-go/blob/master/LICENSE)
264264
- go.opentelemetry.io/collector/model [Apache License 2.0](https://github.com/open-telemetry/opentelemetry-collector/blob/main/LICENSE)
265+
- go.opentelemetry.io/collector/pdata [Apache License 2.0](https://github.com/open-telemetry/opentelemetry-collector/blob/main/LICENSE)
265266
- go.starlark.net [BSD 3-Clause "New" or "Revised" License](https://github.com/google/starlark-go/blob/master/LICENSE)
266267
- go.uber.org/atomic [MIT License](https://pkg.go.dev/go.uber.org/atomic?tab=licenses)
267268
- go.uber.org/multierr [MIT License](https://pkg.go.dev/go.uber.org/multierr?tab=licenses)

‎go.mod‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ require (
7878
github.com/hashicorp/consul/api v1.12.0
7979
github.com/hashicorp/go-uuid v1.0.2
8080
github.com/influxdata/go-syslog/v3 v3.0.0
81-
github.com/influxdata/influxdb-observability/common v0.2.17
82-
github.com/influxdata/influxdb-observability/influx2otel v0.2.17
83-
github.com/influxdata/influxdb-observability/otel2influx v0.2.17
81+
github.com/influxdata/influxdb-observability/common v0.2.18
82+
github.com/influxdata/influxdb-observability/influx2otel v0.2.18
83+
github.com/influxdata/influxdb-observability/otel2influx v0.2.18
8484
github.com/influxdata/line-protocol/v2 v2.2.1
8585
github.com/influxdata/tail v1.0.1-0.20210707231403-b283181d1fa7
8686
github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65
@@ -139,7 +139,7 @@ require (
139139
github.com/xdg/scram v1.0.5
140140
github.com/yuin/goldmark v1.4.1
141141
go.mongodb.org/mongo-driver v1.9.0
142-
go.opentelemetry.io/collector/model v0.48.0
142+
go.opentelemetry.io/collector/pdata v0.49.0
143143
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.28.0
144144
go.opentelemetry.io/otel/metric v0.28.0
145145
go.opentelemetry.io/otel/sdk/metric v0.28.0
@@ -335,6 +335,7 @@ require (
335335
github.com/yusufpapurcu/wmi v1.2.2 // indirect
336336
go.etcd.io/etcd/api/v3 v3.5.0 // indirect
337337
go.opencensus.io v0.23.0 // indirect
338+
go.opentelemetry.io/collector/model v0.49.0 // indirect
338339
go.opentelemetry.io/otel v1.6.0 // indirect
339340
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.0 // indirect
340341
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.28.0 // indirect

‎go.sum‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,12 +1297,12 @@ github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7m
12971297
github.com/influxdata/go-syslog/v3 v3.0.0 h1:jichmjSZlYK0VMmlz+k4WeOQd7z745YLsvGMqwtYt4I=
12981298
github.com/influxdata/go-syslog/v3 v3.0.0/go.mod h1:tulsOp+CecTAYC27u9miMgq21GqXRW6VdKbOG+QSP4Q=
12991299
github.com/influxdata/influxdb v1.8.4/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI=
1300-
github.com/influxdata/influxdb-observability/common v0.2.17 h1:nl1BpGcs00mctFo4FzuB3jZKIoCEEuNr9SNBvmbijss=
1301-
github.com/influxdata/influxdb-observability/common v0.2.17/go.mod h1:fuVPmy5B3kp9xKiUhqAtsAd9s+7CXafOCdR/AkxVG/4=
1302-
github.com/influxdata/influxdb-observability/influx2otel v0.2.17 h1:kiWPPbAyzUTatUb2QCZPThY6yvwRZyvYU+WSDoWjREo=
1303-
github.com/influxdata/influxdb-observability/influx2otel v0.2.17/go.mod h1:JmAH/hVWjdvSEd9EjtYeX8K8Z4OOjPrjEI9SoHjMuNo=
1304-
github.com/influxdata/influxdb-observability/otel2influx v0.2.17 h1:7EspR0ClC+p7lFOajV+QmzgB6siO/qS6RxFNVfhQptY=
1305-
github.com/influxdata/influxdb-observability/otel2influx v0.2.17/go.mod h1:Qhw4L2S4ho6gTMIZHRSzxdKMJi4QsVn2J+NQp4f41Qw=
1300+
github.com/influxdata/influxdb-observability/common v0.2.18 h1:M+49hbNmZ5/bbUDMgtsbY4qqR/xtWEc3VnNAw/oa+Pk=
1301+
github.com/influxdata/influxdb-observability/common v0.2.18/go.mod h1:5wAWFtOFjmYo2tgi/S0wWC4z+inxFzOeAxEpYqIdcWg=
1302+
github.com/influxdata/influxdb-observability/influx2otel v0.2.18 h1:4pWyw6Jan9TTlSnc7N/sgfOSCSD/5fDtd/FP12uw7lE=
1303+
github.com/influxdata/influxdb-observability/influx2otel v0.2.18/go.mod h1:bU6jIF+uxOC0S3G2i9ilPFIQS0GJFSgUqVVqfJ7JzLA=
1304+
github.com/influxdata/influxdb-observability/otel2influx v0.2.18 h1:x1o5C36t6KBkx0//mRl3nMLBIJKLOe463kWhTRh12Uo=
1305+
github.com/influxdata/influxdb-observability/otel2influx v0.2.18/go.mod h1:A4Y9+52yOPuNXuvbHwKKX70RhrtfNfmoZCVG6xj6qoQ=
13061306
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
13071307
github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385/go.mod h1:gHp9y86a/pxhjJ+zMjNXiQAA197Xk9wLxaz+fGG+kWk=
13081308
github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e/go.mod h1:4kt73NQhadE3daL3WhR5EJ/J2ocX0PZzwxQ0gXJ7oFE=
@@ -2284,8 +2284,10 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
22842284
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
22852285
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
22862286
go.opentelemetry.io/collector v0.28.0/go.mod h1:AP/BTXwo1eedoJO7V+HQ68CSvJU1lcdqOzJCgt1VsNs=
2287-
go.opentelemetry.io/collector/model v0.48.0 h1:xmN4LdZ92q6PZnaKhMdIlC5KGtPJeOYaWCnA1PQ2oZw=
2288-
go.opentelemetry.io/collector/model v0.48.0/go.mod h1:1QVYv8TqsTMt9wVC5BUF9fqMVtk2C5EclWDnuVqdKoU=
2287+
go.opentelemetry.io/collector/model v0.49.0 h1:mbUSNgpaBE3GWmzGsRb5t0xILpXIVYv7scPTTfoMt6c=
2288+
go.opentelemetry.io/collector/model v0.49.0/go.mod h1:nOYQv9KoFPs6ihJwOi24qB209EOhS9HkwhGj54YiEAw=
2289+
go.opentelemetry.io/collector/pdata v0.49.0 h1:aYj5rOlRC0x7lGXbc185LMsMMoY/pjOTXr5s1O2SzXs=
2290+
go.opentelemetry.io/collector/pdata v0.49.0/go.mod h1:YwmKuiFhNgtmhRdpi8Q8FAWPa0AwJTCSlssSsAtuRcY=
22892291
go.opentelemetry.io/otel v0.7.0/go.mod h1:aZMyHG5TqDOXEgH2tyLiXSUKly1jT3yqE9PmrzIeCdo=
22902292
go.opentelemetry.io/otel v1.6.0 h1:YV6GkGe/Ag2PKsm4rjlqdSNs0w0A5ZzxeGkxhx1T+t4=
22912293
go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ=

‎plugins/inputs/opentelemetry/grpc_services.go‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,20 @@ package opentelemetry
33
import (
44
"context"
55
"fmt"
6+
"go.opentelemetry.io/collector/pdata/plog/plogotlp"
7+
"go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp"
8+
"go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp"
69

710
"github.com/influxdata/influxdb-observability/common"
811
"github.com/influxdata/influxdb-observability/otel2influx"
9-
"go.opentelemetry.io/collector/model/otlpgrpc"
1012
)
1113

1214
type traceService struct {
1315
converter *otel2influx.OtelTracesToLineProtocol
1416
writer *writeToAccumulator
1517
}
1618

17-
var _ otlpgrpc.TracesServer = (*traceService)(nil)
19+
var _ ptraceotlp.Server = (*traceService)(nil)
1820

1921
func newTraceService(logger common.Logger, writer *writeToAccumulator) *traceService {
2022
converter := otel2influx.NewOtelTracesToLineProtocol(logger)
@@ -24,17 +26,17 @@ func newTraceService(logger common.Logger, writer *writeToAccumulator) *traceSer
2426
}
2527
}
2628

27-
func (s *traceService) Export(ctx context.Context, req otlpgrpc.TracesRequest) (otlpgrpc.TracesResponse, error) {
29+
func (s *traceService) Export(ctx context.Context, req ptraceotlp.Request) (ptraceotlp.Response, error) {
2830
err := s.converter.WriteTraces(ctx, req.Traces(), s.writer)
29-
return otlpgrpc.NewTracesResponse(), err
31+
return ptraceotlp.NewResponse(), err
3032
}
3133

3234
type metricsService struct {
3335
converter *otel2influx.OtelMetricsToLineProtocol
3436
writer *writeToAccumulator
3537
}
3638

37-
var _ otlpgrpc.MetricsServer = (*metricsService)(nil)
39+
var _ pmetricotlp.Server = (*metricsService)(nil)
3840

3941
var metricsSchemata = map[string]common.MetricsSchema{
4042
"prometheus-v1": common.MetricsSchemaTelegrafPrometheusV1,
@@ -57,17 +59,17 @@ func newMetricsService(logger common.Logger, writer *writeToAccumulator, schema
5759
}, nil
5860
}
5961

60-
func (s *metricsService) Export(ctx context.Context, req otlpgrpc.MetricsRequest) (otlpgrpc.MetricsResponse, error) {
62+
func (s *metricsService) Export(ctx context.Context, req pmetricotlp.Request) (pmetricotlp.Response, error) {
6163
err := s.converter.WriteMetrics(ctx, req.Metrics(), s.writer)
62-
return otlpgrpc.NewMetricsResponse(), err
64+
return pmetricotlp.NewResponse(), err
6365
}
6466

6567
type logsService struct {
6668
converter *otel2influx.OtelLogsToLineProtocol
6769
writer *writeToAccumulator
6870
}
6971

70-
var _ otlpgrpc.LogsServer = (*logsService)(nil)
72+
var _ plogotlp.Server = (*logsService)(nil)
7173

7274
func newLogsService(logger common.Logger, writer *writeToAccumulator) *logsService {
7375
converter := otel2influx.NewOtelLogsToLineProtocol(logger)
@@ -77,7 +79,7 @@ func newLogsService(logger common.Logger, writer *writeToAccumulator) *logsServi
7779
}
7880
}
7981

80-
func (s *logsService) Export(ctx context.Context, req otlpgrpc.LogsRequest) (otlpgrpc.LogsResponse, error) {
82+
func (s *logsService) Export(ctx context.Context, req plogotlp.Request) (plogotlp.Response, error) {
8183
err := s.converter.WriteLogs(ctx, req.Logs(), s.writer)
82-
return otlpgrpc.NewLogsResponse(), err
84+
return plogotlp.NewResponse(), err
8385
}

‎plugins/inputs/opentelemetry/opentelemetry.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ package opentelemetry
22

33
import (
44
"fmt"
5+
"go.opentelemetry.io/collector/pdata/plog/plogotlp"
6+
"go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp"
7+
"go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp"
58
"net"
69
"sync"
710
"time"
@@ -10,7 +13,6 @@ import (
1013
"github.com/influxdata/telegraf/config"
1114
"github.com/influxdata/telegraf/plugins/common/tls"
1215
"github.com/influxdata/telegraf/plugins/inputs"
13-
"go.opentelemetry.io/collector/model/otlpgrpc"
1416
"google.golang.org/grpc"
1517
"google.golang.org/grpc/credentials"
1618
)
@@ -49,13 +51,13 @@ func (o *OpenTelemetry) Start(accumulator telegraf.Accumulator) error {
4951
influxWriter := &writeToAccumulator{accumulator}
5052
o.grpcServer = grpc.NewServer(grpcOptions...)
5153

52-
otlpgrpc.RegisterTracesServer(o.grpcServer, newTraceService(logger, influxWriter))
54+
ptraceotlp.RegisterServer(o.grpcServer, newTraceService(logger, influxWriter))
5355
ms, err := newMetricsService(logger, influxWriter, o.MetricsSchema)
5456
if err != nil {
5557
return err
5658
}
57-
otlpgrpc.RegisterMetricsServer(o.grpcServer, ms)
58-
otlpgrpc.RegisterLogsServer(o.grpcServer, newLogsService(logger, influxWriter))
59+
pmetricotlp.RegisterServer(o.grpcServer, ms)
60+
plogotlp.RegisterServer(o.grpcServer, newLogsService(logger, influxWriter))
5961

6062
if o.listener == nil {
6163
o.listener, err = net.Listen("tcp", o.ServiceAddress)

‎plugins/outputs/opentelemetry/opentelemetry.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package opentelemetry
22

33
import (
44
"context"
5+
"go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp"
56
"google.golang.org/grpc/credentials/insecure"
67
"time"
78

@@ -11,7 +12,6 @@ import (
1112
"github.com/influxdata/telegraf/config"
1213
"github.com/influxdata/telegraf/plugins/common/tls"
1314
"github.com/influxdata/telegraf/plugins/outputs"
14-
"go.opentelemetry.io/collector/model/otlpgrpc"
1515
"google.golang.org/grpc"
1616
"google.golang.org/grpc/credentials"
1717

@@ -33,7 +33,7 @@ type OpenTelemetry struct {
3333

3434
metricsConverter *influx2otel.LineProtocolToOtelMetrics
3535
grpcClientConn *grpc.ClientConn
36-
metricsServiceClient otlpgrpc.MetricsClient
36+
metricsServiceClient pmetricotlp.Client
3737
callOptions []grpc.CallOption
3838
}
3939

@@ -69,7 +69,7 @@ func (o *OpenTelemetry) Connect() error {
6969
return err
7070
}
7171

72-
metricsServiceClient := otlpgrpc.NewMetricsClient(grpcClientConn)
72+
metricsServiceClient := pmetricotlp.NewClient(grpcClientConn)
7373

7474
o.metricsConverter = metricsConverter
7575
o.grpcClientConn = grpcClientConn
@@ -117,7 +117,7 @@ func (o *OpenTelemetry) Write(metrics []telegraf.Metric) error {
117117
}
118118
}
119119

120-
md := otlpgrpc.NewMetricsRequest()
120+
md := pmetricotlp.NewRequest()
121121
md.SetMetrics(batch.GetMetrics())
122122
if md.Metrics().ResourceMetrics().Len() == 0 {
123123
return nil

‎plugins/outputs/opentelemetry/opentelemetry_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ package opentelemetry
22

33
import (
44
"context"
5+
"go.opentelemetry.io/collector/pdata/pcommon"
6+
"go.opentelemetry.io/collector/pdata/pmetric"
7+
"go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp"
58
"google.golang.org/grpc/credentials/insecure"
69
"net"
710
"strings"
@@ -15,15 +18,12 @@ import (
1518
"github.com/influxdata/telegraf/testutil"
1619
"github.com/stretchr/testify/assert"
1720
"github.com/stretchr/testify/require"
18-
"go.opentelemetry.io/collector/model/otlp"
19-
"go.opentelemetry.io/collector/model/otlpgrpc"
20-
"go.opentelemetry.io/collector/model/pdata"
2121
"google.golang.org/grpc"
2222
"google.golang.org/grpc/metadata"
2323
)
2424

2525
func TestOpenTelemetry(t *testing.T) {
26-
expect := pdata.NewMetrics()
26+
expect := pmetric.NewMetrics()
2727
{
2828
rm := expect.ResourceMetrics().AppendEmpty()
2929
rm.Resource().Attributes().InsertString("host.name", "potato")
@@ -32,10 +32,10 @@ func TestOpenTelemetry(t *testing.T) {
3232
ilm.Scope().SetName("My Library Name")
3333
m := ilm.Metrics().AppendEmpty()
3434
m.SetName("cpu_temp")
35-
m.SetDataType(pdata.MetricDataTypeGauge)
35+
m.SetDataType(pmetric.MetricDataTypeGauge)
3636
dp := m.Gauge().DataPoints().AppendEmpty()
3737
dp.Attributes().InsertString("foo", "bar")
38-
dp.SetTimestamp(pdata.Timestamp(1622848686000000000))
38+
dp.SetTimestamp(pcommon.Timestamp(1622848686000000000))
3939
dp.SetDoubleVal(87.332)
4040
}
4141
m := newMockOtelService(t)
@@ -50,7 +50,7 @@ func TestOpenTelemetry(t *testing.T) {
5050
Attributes: map[string]string{"attr-key": "attr-val"},
5151
metricsConverter: metricsConverter,
5252
grpcClientConn: m.GrpcClient(),
53-
metricsServiceClient: otlpgrpc.NewMetricsClient(m.GrpcClient()),
53+
metricsServiceClient: pmetricotlp.NewClient(m.GrpcClient()),
5454
}
5555

5656
input := testutil.MustMetric(
@@ -76,24 +76,24 @@ func TestOpenTelemetry(t *testing.T) {
7676

7777
got := m.GotMetrics()
7878

79-
expectJSON, err := otlp.NewJSONMetricsMarshaler().MarshalMetrics(expect)
79+
expectJSON, err := pmetric.NewJSONMarshaler().MarshalMetrics(expect)
8080
require.NoError(t, err)
8181

82-
gotJSON, err := otlp.NewJSONMetricsMarshaler().MarshalMetrics(got)
82+
gotJSON, err := pmetric.NewJSONMarshaler().MarshalMetrics(got)
8383
require.NoError(t, err)
8484

8585
assert.JSONEq(t, string(expectJSON), string(gotJSON))
8686
}
8787

88-
var _ otlpgrpc.MetricsServer = (*mockOtelService)(nil)
88+
var _ pmetricotlp.Server = (*mockOtelService)(nil)
8989

9090
type mockOtelService struct {
9191
t *testing.T
9292
listener net.Listener
9393
grpcServer *grpc.Server
9494
grpcClient *grpc.ClientConn
9595

96-
metrics pdata.Metrics
96+
metrics pmetric.Metrics
9797
}
9898

9999
func newMockOtelService(t *testing.T) *mockOtelService {
@@ -107,7 +107,7 @@ func newMockOtelService(t *testing.T) *mockOtelService {
107107
grpcServer: grpcServer,
108108
}
109109

110-
otlpgrpc.RegisterMetricsServer(grpcServer, mockOtelService)
110+
pmetricotlp.RegisterServer(grpcServer, mockOtelService)
111111
go func() { assert.NoError(t, grpcServer.Serve(listener)) }()
112112

113113
grpcClient, err := grpc.Dial(listener.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock())
@@ -126,18 +126,18 @@ func (m *mockOtelService) GrpcClient() *grpc.ClientConn {
126126
return m.grpcClient
127127
}
128128

129-
func (m *mockOtelService) GotMetrics() pdata.Metrics {
129+
func (m *mockOtelService) GotMetrics() pmetric.Metrics {
130130
return m.metrics
131131
}
132132

133133
func (m *mockOtelService) Address() string {
134134
return m.listener.Addr().String()
135135
}
136136

137-
func (m *mockOtelService) Export(ctx context.Context, request otlpgrpc.MetricsRequest) (otlpgrpc.MetricsResponse, error) {
137+
func (m *mockOtelService) Export(ctx context.Context, request pmetricotlp.Request) (pmetricotlp.Response, error) {
138138
m.metrics = request.Metrics().Clone()
139139
ctxMetadata, ok := metadata.FromIncomingContext(ctx)
140140
assert.Equal(m.t, []string{"header1"}, ctxMetadata.Get("test"))
141141
assert.True(m.t, ok)
142-
return otlpgrpc.MetricsResponse{}, nil
142+
return pmetricotlp.Response{}, nil
143143
}

0 commit comments

Comments
 (0)