Skip to content

Commit

Permalink
Merge branch 'main' into opencensus_options
Browse files Browse the repository at this point in the history
  • Loading branch information
dashpole authored Sep 29, 2023
2 parents cae64aa + 60666c5 commit 4c7808f
Show file tree
Hide file tree
Showing 34 changed files with 159 additions and 142 deletions.
31 changes: 24 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,35 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

## [Unreleased]

### Changed

- `go.opentelemetry.io/otel/exporters/stdout/stdoutmetric` does not prettifies the output by default anymore. (#4507)

### Added

- Add the "Roll the dice" getting started application example in `go.opentelemetry.io/otel/example/dice`. (#4539)
- The `WithWriter` and `WithPrettyPrint` options to `go.opentelemetry.io/otel/exporters/stdout/stdoutmetric` to set a custom `io.Writer`, and allow displaying the output in human-readable JSON (#4507).
- Add `go.opentelemetry.io/otel/bridge/opencensus.InstallTraceBridge`, which installs the OpenCensus trace bridge, and replaces `opencensus.NewTracer`. (#4567)

### Deprecated

- Deprecate `go.opentelemetry.io/otel/bridge/opencensus.NewTracer` in favor of `opencensus.InstallTraceBridge`. (#4567)

## [1.19.0/0.42.0/0.0.7] 2023-09-28

This release contains the first stable release of the OpenTelemetry Go [metric SDK].
Our project stability guarantees now apply to the `go.opentelemetry.io/otel/sdk/metric` package.
See our [versioning policy](VERSIONING.md) for more information about these stability guarantees.

### Added

- Add the "Roll the dice" getting started application example in `go.opentelemetry.io/otel/example/dice`. (#4539)
- The `WithWriter` and `WithPrettyPrint` options to `go.opentelemetry.io/otel/exporters/stdout/stdoutmetric` to set a custom `io.Writer`, and allow displaying the output in human-readable JSON. (#4507)

### Changed

- Allow '/' characters in metric instrument names. (#4501)
- The exporter in `go.opentelemetry.io/otel/exporters/stdout/stdoutmetric` does not prettify its output by default anymore. (#4507)
- Upgrade `gopkg.io/yaml` from `v2` to `v3` in `go.opentelemetry.io/otel/schema`. (#4535)

### Fixed

- In `go.opentelemetry.op/otel/exporters/prometheus`, don't try to create the Prometheus metric on every `Collect` if we know the scope is invalid. (#4499)

### Removed

- Remove `"go.opentelemetry.io/otel/bridge/opencensus".NewMetricExporter`, which is replaced by `NewMetricProducer`. (#4566)
Expand Down Expand Up @@ -2649,7 +2664,8 @@ It contains api and sdk for trace and meter.
- CircleCI build CI manifest files.
- CODEOWNERS file to track owners of this project.

[Unreleased]: https://github.com/open-telemetry/opentelemetry-go/compare/v1.19.0-rc.1...HEAD
[Unreleased]: https://github.com/open-telemetry/opentelemetry-go/compare/v1.19.0...HEAD
[1.19.0/0.42.0/0.0.7]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.19.0
[1.19.0-rc.1/0.42.0-rc.1]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.19.0-rc.1
[1.18.0/0.41.0/0.0.6]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.18.0
[1.17.0/0.40.0/0.0.5]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.17.0
Expand Down Expand Up @@ -2726,3 +2742,4 @@ It contains api and sdk for trace and meter.
[Go 1.19]: https://go.dev/doc/go1.19

[metric API]:https://pkg.go.dev/go.opentelemetry.io/otel/metric
[metric SDK]:https://pkg.go.dev/go.opentelemetry.io/otel/sdk/metric
10 changes: 5 additions & 5 deletions bridge/opencensus/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ go 1.20
require (
github.com/stretchr/testify v1.8.4
go.opencensus.io v0.24.0
go.opentelemetry.io/otel v1.19.0-rc.1
go.opentelemetry.io/otel/sdk v1.19.0-rc.1
go.opentelemetry.io/otel/sdk/metric v1.19.0-rc.1
go.opentelemetry.io/otel/trace v1.19.0-rc.1
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/sdk/metric v1.19.0
go.opentelemetry.io/otel/trace v1.19.0
)

require (
Expand All @@ -18,7 +18,7 @@ require (
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
golang.org/x/sys v0.12.0 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
12 changes: 6 additions & 6 deletions bridge/opencensus/test/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ go 1.20

require (
go.opencensus.io v0.24.0
go.opentelemetry.io/otel v1.19.0-rc.1
go.opentelemetry.io/otel/bridge/opencensus v0.42.0-rc.1
go.opentelemetry.io/otel/sdk v1.19.0-rc.1
go.opentelemetry.io/otel/trace v1.19.0-rc.1
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/bridge/opencensus v0.42.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/trace v1.19.0
)

require (
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
go.opentelemetry.io/otel/metric v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/sdk/metric v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.19.0 // indirect
golang.org/x/sys v0.12.0 // indirect
)

Expand Down
6 changes: 3 additions & 3 deletions bridge/opentracing/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ replace go.opentelemetry.io/otel/trace => ../../trace
require (
github.com/opentracing/opentracing-go v1.2.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/otel v1.19.0-rc.1
go.opentelemetry.io/otel/trace v1.19.0-rc.1
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/trace v1.19.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
8 changes: 4 additions & 4 deletions bridge/opentracing/test/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ require (
github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e
github.com/opentracing/opentracing-go v1.2.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/otel v1.19.0-rc.1
go.opentelemetry.io/otel/bridge/opentracing v1.19.0-rc.1
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/bridge/opentracing v1.19.0
google.golang.org/grpc v1.58.2
)

Expand All @@ -23,8 +23,8 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/trace v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/text v0.11.0 // indirect
Expand Down
14 changes: 7 additions & 7 deletions example/dice/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ go 1.20

require (
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0
go.opentelemetry.io/otel v1.19.0-rc.1
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.41.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.18.0
go.opentelemetry.io/otel/metric v1.19.0-rc.1
go.opentelemetry.io/otel/sdk v1.19.0-rc.1
go.opentelemetry.io/otel/sdk/metric v1.19.0-rc.1
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.42.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0
go.opentelemetry.io/otel/metric v1.19.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/sdk/metric v1.19.0
)

require (
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
go.opentelemetry.io/otel/trace v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
golang.org/x/sys v0.12.0 // indirect
)

Expand Down
10 changes: 5 additions & 5 deletions example/fib/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ module go.opentelemetry.io/otel/example/fib
go 1.20

require (
go.opentelemetry.io/otel v1.19.0-rc.1
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0-rc.1
go.opentelemetry.io/otel/sdk v1.19.0-rc.1
go.opentelemetry.io/otel/trace v1.19.0-rc.1
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/trace v1.19.0
)

require (
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
go.opentelemetry.io/otel/metric v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
golang.org/x/sys v0.12.0 // indirect
)

Expand Down
10 changes: 5 additions & 5 deletions example/namedtracer/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ replace (

require (
github.com/go-logr/stdr v1.2.2
go.opentelemetry.io/otel v1.19.0-rc.1
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0-rc.1
go.opentelemetry.io/otel/sdk v1.19.0-rc.1
go.opentelemetry.io/otel/trace v1.19.0-rc.1
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/trace v1.19.0
)

require (
github.com/go-logr/logr v1.2.4 // indirect
go.opentelemetry.io/otel/metric v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
golang.org/x/sys v0.12.0 // indirect
)

Expand Down
16 changes: 8 additions & 8 deletions example/opencensus/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ replace (

require (
go.opencensus.io v0.24.0
go.opentelemetry.io/otel v1.19.0-rc.1
go.opentelemetry.io/otel/bridge/opencensus v0.42.0-rc.1
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.42.0-rc.1
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0-rc.1
go.opentelemetry.io/otel/sdk v1.19.0-rc.1
go.opentelemetry.io/otel/sdk/metric v1.19.0-rc.1
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/bridge/opencensus v0.42.0
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.42.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/sdk/metric v1.19.0
)

require (
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
go.opentelemetry.io/otel/metric v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/trace v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
golang.org/x/sys v0.12.0 // indirect
)

Expand Down
12 changes: 6 additions & 6 deletions example/otel-collector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ replace (
)

require (
go.opentelemetry.io/otel v1.19.0-rc.1
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0-rc.1
go.opentelemetry.io/otel/sdk v1.19.0-rc.1
go.opentelemetry.io/otel/trace v1.19.0-rc.1
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/trace v1.19.0
google.golang.org/grpc v1.58.2
)

Expand All @@ -21,8 +21,8 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/metric v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/sys v0.12.0 // indirect
Expand Down
10 changes: 5 additions & 5 deletions example/passthrough/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ module go.opentelemetry.io/otel/example/passthrough
go 1.20

require (
go.opentelemetry.io/otel v1.19.0-rc.1
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0-rc.1
go.opentelemetry.io/otel/sdk v1.19.0-rc.1
go.opentelemetry.io/otel/trace v1.19.0-rc.1
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/trace v1.19.0
)

require (
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
go.opentelemetry.io/otel/metric v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
golang.org/x/sys v0.12.0 // indirect
)

Expand Down
12 changes: 6 additions & 6 deletions example/prometheus/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ go 1.20

require (
github.com/prometheus/client_golang v1.16.0
go.opentelemetry.io/otel v1.19.0-rc.1
go.opentelemetry.io/otel/exporters/prometheus v0.42.0-rc.1
go.opentelemetry.io/otel/metric v1.19.0-rc.1
go.opentelemetry.io/otel/sdk/metric v1.19.0-rc.1
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/exporters/prometheus v0.42.0
go.opentelemetry.io/otel/metric v1.19.0
go.opentelemetry.io/otel/sdk/metric v1.19.0
)

require (
Expand All @@ -20,8 +20,8 @@ require (
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/sdk v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/trace v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
golang.org/x/sys v0.12.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
)
Expand Down
12 changes: 6 additions & 6 deletions example/view/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ go 1.20

require (
github.com/prometheus/client_golang v1.16.0
go.opentelemetry.io/otel v1.19.0-rc.1
go.opentelemetry.io/otel/exporters/prometheus v0.42.0-rc.1
go.opentelemetry.io/otel/metric v1.19.0-rc.1
go.opentelemetry.io/otel/sdk v1.19.0-rc.1
go.opentelemetry.io/otel/sdk/metric v1.19.0-rc.1
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/exporters/prometheus v0.42.0
go.opentelemetry.io/otel/metric v1.19.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/sdk/metric v1.19.0
)

require (
Expand All @@ -21,7 +21,7 @@ require (
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/trace v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
golang.org/x/sys v0.12.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
)
Expand Down
10 changes: 5 additions & 5 deletions example/zipkin/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ replace (
)

require (
go.opentelemetry.io/otel v1.19.0-rc.1
go.opentelemetry.io/otel/exporters/zipkin v1.19.0-rc.1
go.opentelemetry.io/otel/sdk v1.19.0-rc.1
go.opentelemetry.io/otel/trace v1.19.0-rc.1
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/exporters/zipkin v1.19.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/trace v1.19.0
)

require (
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/openzipkin/zipkin-go v0.4.2 // indirect
go.opentelemetry.io/otel/metric v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
golang.org/x/sys v0.12.0 // indirect
)

Expand Down
12 changes: 6 additions & 6 deletions exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ require (
github.com/cenkalti/backoff/v4 v4.2.1
github.com/google/go-cmp v0.5.9
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/otel v1.19.0-rc.1
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0-rc.1
go.opentelemetry.io/otel/sdk v1.19.0-rc.1
go.opentelemetry.io/otel/sdk/metric v1.19.0-rc.1
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/sdk/metric v1.19.0
go.opentelemetry.io/proto/otlp v1.0.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98
google.golang.org/grpc v1.58.2
Expand All @@ -26,8 +26,8 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/trace v1.19.0-rc.1 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/text v0.11.0 // indirect
Expand Down
Loading

0 comments on commit 4c7808f

Please sign in to comment.