Skip to content

Commit

Permalink
upgrade opentelemetry in systemtest (#11543)
Browse files Browse the repository at this point in the history
  • Loading branch information
dmathieu authored Sep 1, 2023
1 parent ce978d2 commit 44b352c
Show file tree
Hide file tree
Showing 8 changed files with 68 additions and 422 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"@timestamp": "dynamic",
"agent": {
"name": "opentelemetry/go",
"version": "1.16.0"
"version": "1.17.0"
},
"counter": 1,
"data_stream": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"@timestamp": "dynamic",
"agent": {
"name": "opentelemetry/go",
"version": "1.16.0"
"version": "1.17.0"
},
"data_stream": {
"dataset": "apm.app.unknown_service_systemtest_test",
Expand Down
6 changes: 3 additions & 3 deletions systemtest/approvals/TestOTLPGRPCTraces.approved.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"@timestamp": "1970-01-01T00:02:03.002Z",
"agent": {
"name": "opentelemetry/go",
"version": "1.16.0"
"version": "1.17.0"
},
"data_stream": {
"dataset": "apm.error",
Expand Down Expand Up @@ -84,7 +84,7 @@
"@timestamp": "1970-01-01T00:02:03.001Z",
"agent": {
"name": "opentelemetry/go",
"version": "1.16.0"
"version": "1.17.0"
},
"data_stream": {
"dataset": "apm.app.unknown_service_systemtest_test",
Expand Down Expand Up @@ -144,7 +144,7 @@
"@timestamp": "1970-01-01T00:02:03.000Z",
"agent": {
"name": "opentelemetry/go",
"version": "1.16.0"
"version": "1.17.0"
},
"data_stream": {
"dataset": "apm",
Expand Down
3 changes: 1 addition & 2 deletions systemtest/cmd/sendotlp/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import (
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
"go.opentelemetry.io/otel/metric"
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/sdk/metric/aggregation"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
semconv "go.opentelemetry.io/otel/semconv/v1.8.0"
"go.opentelemetry.io/otel/trace"
Expand Down Expand Up @@ -149,7 +148,7 @@ func Main(ctx context.Context, logger *zap.SugaredLogger) (result error) {
sdkmetric.WithView(sdkmetric.NewView(
sdkmetric.Instrument{Name: "*"},
sdkmetric.Stream{
Aggregation: aggregation.ExplicitBucketHistogram{
Aggregation: sdkmetric.AggregationExplicitBucketHistogram{
Boundaries: []float64{1, 10, 100, 1000, 10000},
},
},
Expand Down
38 changes: 19 additions & 19 deletions systemtest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,37 @@ require (
github.com/stretchr/testify v1.8.4
github.com/testcontainers/testcontainers-go v0.18.0
github.com/tidwall/gjson v1.14.4
go.elastic.co/apm/v2 v2.4.3
go.elastic.co/apm/module/apmotel/v2 v2.4.4
go.elastic.co/apm/v2 v2.4.4
go.elastic.co/fastjson v1.1.0
go.opentelemetry.io/collector/pdata v1.0.0-rcv0013
go.opentelemetry.io/collector/semconv v0.81.0
go.opentelemetry.io/otel v1.16.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0
go.opentelemetry.io/otel/metric v1.16.0
go.opentelemetry.io/otel/sdk v1.16.0
go.opentelemetry.io/otel/sdk/metric v0.39.0
go.opentelemetry.io/otel/trace v1.16.0
go.opentelemetry.io/otel v1.17.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0
go.opentelemetry.io/otel/metric v1.17.0
go.opentelemetry.io/otel/sdk v1.17.0
go.opentelemetry.io/otel/sdk/metric v0.40.0
go.opentelemetry.io/otel/trace v1.17.0
go.uber.org/zap v1.24.0
golang.org/x/sync v0.2.0
golang.org/x/sys v0.10.0
golang.org/x/sys v0.11.0
golang.org/x/time v0.3.0
google.golang.org/grpc v1.56.2
google.golang.org/grpc v1.57.0
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/containerd/containerd v1.6.17 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
)

require (
Expand Down Expand Up @@ -88,14 +88,14 @@ require (
github.com/tidwall/sjson v1.2.5 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.elastic.co/apm/module/apmhttp/v2 v2.4.4 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/text v0.11.0 // indirect
google.golang.org/genproto v0.0.0-20230525234025-438c736192d0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/protobuf v1.31.0 // indirect
howett.net/plist v1.0.0 // indirect
Expand Down
Loading

0 comments on commit 44b352c

Please sign in to comment.