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

Jump to bottom

Update the otelgocql to use the latest otel pkg #4199

Merged
merged 1 commit into from
Aug 17, 2023
Merged

Update the otelgocql to use the latest otel pkg #4199

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions instrumentation/github.com/gocql/gocql/otelgocql/example/client.go
View file
Open in desktop
Expand Up @@ -46,7 +46,6 @@ import (
otelprom "go.opentelemetry.io/otel/exporters/prometheus"
"go.opentelemetry.io/otel/exporters/zipkin"
"go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/sdk/metric/aggregation"
"go.opentelemetry.io/otel/sdk/trace"

"go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql"
Expand Down Expand Up @@ -131,15 +130,15 @@ func views() []metric.View {
Name: "db.cassandra.rows",
},
metric.Stream{
Aggregation: aggregation.ExplicitBucketHistogram{
Aggregation: metric.AggregationExplicitBucketHistogram{
Boundaries: []float64{0.001, 0.01, 0.1, 0.5, 1, 2, 5, 10},
},
},
),
metric.NewView(
metric.Instrument{Name: "db.cassandra.latency"},
metric.Stream{
Aggregation: aggregation.ExplicitBucketHistogram{
Aggregation: metric.AggregationExplicitBucketHistogram{
Boundaries: []float64{0.001, 0.01, 0.1, 0.5, 1, 2, 5, 10},
},
},
Expand Down
18 changes: 9 additions & 9 deletions instrumentation/github.com/gocql/gocql/otelgocql/example/go.mod
View file
Open in desktop
Expand Up @@ -8,11 +8,11 @@ require (
github.com/gocql/gocql v1.5.2
github.com/prometheus/client_golang v1.16.0
go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql v0.42.0
go.opentelemetry.io/otel v1.16.0
go.opentelemetry.io/otel/exporters/prometheus v0.39.0
go.opentelemetry.io/otel/exporters/zipkin v1.16.0
go.opentelemetry.io/otel/sdk v1.16.0
go.opentelemetry.io/otel/sdk/metric v0.39.0
go.opentelemetry.io/otel v1.16.1-0.20230815155450-d78820e9050c
go.opentelemetry.io/otel/exporters/prometheus v0.39.1-0.20230815155450-d78820e9050c
go.opentelemetry.io/otel/exporters/zipkin v1.16.1-0.20230815155450-d78820e9050c
go.opentelemetry.io/otel/sdk v1.16.1-0.20230815155450-d78820e9050c
go.opentelemetry.io/otel/sdk/metric v0.39.1-0.20230815155450-d78820e9050c
)

require (
Expand All @@ -24,13 +24,13 @@ require (
github.com/golang/snappy v0.0.4 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/openzipkin/zipkin-go v0.4.1 // indirect
github.com/openzipkin/zipkin-go v0.4.2 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
golang.org/x/sys v0.8.0 // indirect
go.opentelemetry.io/otel/metric v1.16.1-0.20230815155450-d78820e9050c // indirect
go.opentelemetry.io/otel/trace v1.16.1-0.20230815155450-d78820e9050c // indirect
golang.org/x/sys v0.11.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
)
36 changes: 18 additions & 18 deletions instrumentation/github.com/gocql/gocql/otelgocql/example/go.sum
View file
Open in desktop
Expand Up @@ -33,8 +33,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/openzipkin/zipkin-go v0.4.1 h1:kNd/ST2yLLWhaWrkgchya40TJabe8Hioj9udfPcEO5A=
github.com/openzipkin/zipkin-go v0.4.1/go.mod h1:qY0VqDSN1pOBN94dBc6w2GJlWLiovAyg7Qt6/I9HecM=
github.com/openzipkin/zipkin-go v0.4.2 h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDOCg/jA=
github.com/openzipkin/zipkin-go v0.4.2/go.mod h1:ZeVkFjuuBiSy13y8vpSDCjMi9GoI3hPpCJSBx/EYFhY=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
Expand All @@ -49,23 +49,23 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s=
go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4=
go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA=
go.opentelemetry.io/otel/exporters/prometheus v0.39.0/go.mod h1:4jo5Q4CROlCpSPsXLhymi+LYrDXd2ObU5wbKayfZs7Y=
go.opentelemetry.io/otel/exporters/zipkin v1.16.0 h1:WdMSH6vIJ+myJfr/HB/pjsYoJWQP0Wz/iJ1haNO5hX4=
go.opentelemetry.io/otel/exporters/zipkin v1.16.0/go.mod h1:QjDOKdylighHJBc7pf4Vo6fdhtiEJEqww/3Df8TOWjo=
go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo=
go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4=
go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE=
go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4=
go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI=
go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI=
go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs=
go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0=
go.opentelemetry.io/otel v1.16.1-0.20230815155450-d78820e9050c h1:y4aIFS8tFn6rsm+S5lFUz17hL0uZ+DMG2WSZzEI90nU=
go.opentelemetry.io/otel v1.16.1-0.20230815155450-d78820e9050c/go.mod h1:Mvz6BAa6MtPqA1gx2H3y/tC3Foorsu9yR97iju5I6S8=
go.opentelemetry.io/otel/exporters/prometheus v0.39.1-0.20230815155450-d78820e9050c h1:42gFHfs8njqsYv5Rv58NIeAq81LZnB/g1Os9HHY2aFI=
go.opentelemetry.io/otel/exporters/prometheus v0.39.1-0.20230815155450-d78820e9050c/go.mod h1:7UsiN7Uc2yY6dj+rpKqQVnTgDHiCeIyGzDxDzFLfnJI=
go.opentelemetry.io/otel/exporters/zipkin v1.16.1-0.20230815155450-d78820e9050c h1:ZdDqD8wqtKesN24bl0OrmsfOVY6QcUE8N6L8vt01ct8=
go.opentelemetry.io/otel/exporters/zipkin v1.16.1-0.20230815155450-d78820e9050c/go.mod h1:iZ40z7DQcaFDyzmMmOap/dxytphqejm5jHoqOAAdWqM=
go.opentelemetry.io/otel/metric v1.16.1-0.20230815155450-d78820e9050c h1:mmvpSjZm4yAgoPE1vMZUYaZUM23tZsf63hUGsBEcaTc=
go.opentelemetry.io/otel/metric v1.16.1-0.20230815155450-d78820e9050c/go.mod h1:08MUQNCYXDA/oPwzB+f54ZLadUIwTKMizcDKsM40yrs=
go.opentelemetry.io/otel/sdk v1.16.1-0.20230815155450-d78820e9050c h1:uvGxvAJeC5C5sL/7B2AlFnkee7/OFjpJCt1aUElG0gc=
go.opentelemetry.io/otel/sdk v1.16.1-0.20230815155450-d78820e9050c/go.mod h1:9JTtzqpDB2mVf3C0eV5BIdV2kObNIOpXAb357qjKwV8=
go.opentelemetry.io/otel/sdk/metric v0.39.1-0.20230815155450-d78820e9050c h1:+HbnvbQzuSiGqc1sxmXDMxtcsXCajiDR4r7YLN7ObN8=
go.opentelemetry.io/otel/sdk/metric v0.39.1-0.20230815155450-d78820e9050c/go.mod h1:b5MdgFx7hDE/QEGNe0RZfuXNT8alT9piEX5ToEhbHKM=
go.opentelemetry.io/otel/trace v1.16.1-0.20230815155450-d78820e9050c h1:OocdPx1fcRECGAJgzsBQ7xuY6Q/RnMIW0GyCDep7iZ8=
go.opentelemetry.io/otel/trace v1.16.1-0.20230815155450-d78820e9050c/go.mod h1:DnzZyF3YU12DItlxaqmBfIeMlwqDLvx0CtOihg37/i4=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
Expand Down