Merge branch 'main' into revert-3987

open-telemetry · May 2, 2023 · a68803e · a68803e
2 parents f3bf7ab + fc96138
commit a68803e
Show file tree

Hide file tree

Showing 35 changed files with 135 additions and 132 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Move the `go.opentelemetry.io/otel/metric` module to the `stable-v1` module set.
  This stages the metric API to be released as a stable module. (#4038)
 
+## [1.15.1/0.38.1] 2023-05-02
+
 ### Fixed
 
 - Remove unused imports from `sdk/resource/host_id_bsd.go` which caused build failures. (#4040, #4041)
@@ -2446,7 +2448,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.15.0...HEAD
+[Unreleased]: https://github.com/open-telemetry/opentelemetry-go/compare/v1.15.1...HEAD
+[1.15.1/0.38.1]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.15.1
 [1.15.0/0.38.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.15.0
 [1.15.0-rc.2/0.38.0-rc.2]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.15.0-rc.2
 [1.15.0-rc.1/0.38.0-rc.1]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.15.0-rc.1

diff --git a/bridge/opencensus/go.mod b/bridge/opencensus/go.mod
@@ -5,10 +5,10 @@ go 1.19
 require (
  github.com/stretchr/testify v1.8.2
  go.opencensus.io v0.24.0
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/sdk v1.15.0
- go.opentelemetry.io/otel/sdk/metric v0.38.0
- go.opentelemetry.io/otel/trace v1.15.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/sdk v1.15.1
+ go.opentelemetry.io/otel/sdk/metric v0.38.1
+ go.opentelemetry.io/otel/trace v1.15.1
 )
 
 require (
@@ -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 v0.38.0 // indirect
+ go.opentelemetry.io/otel/metric v0.38.1 // indirect
  golang.org/x/sys v0.7.0 // indirect
  gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect

diff --git a/bridge/opencensus/test/go.mod b/bridge/opencensus/test/go.mod
@@ -4,18 +4,18 @@ go 1.19
 
 require (
  go.opencensus.io v0.24.0
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/bridge/opencensus v0.38.0
- go.opentelemetry.io/otel/sdk v1.15.0
- go.opentelemetry.io/otel/trace v1.15.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/bridge/opencensus v0.38.1
+ go.opentelemetry.io/otel/sdk v1.15.1
+ go.opentelemetry.io/otel/trace v1.15.1
 )
 
 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 v0.38.0 // indirect
- go.opentelemetry.io/otel/sdk/metric v0.38.0 // indirect
+ go.opentelemetry.io/otel/metric v0.38.1 // indirect
+ go.opentelemetry.io/otel/sdk/metric v0.38.1 // indirect
  golang.org/x/sys v0.7.0 // indirect
 )
 

diff --git a/bridge/opentracing/go.mod b/bridge/opentracing/go.mod
@@ -9,8 +9,8 @@ replace go.opentelemetry.io/otel/trace => ../../trace
 require (
  github.com/opentracing/opentracing-go v1.2.0
  github.com/stretchr/testify v1.8.2
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/trace v1.15.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/trace v1.15.1
 )
 
 require (

diff --git a/bridge/opentracing/test/go.mod b/bridge/opentracing/test/go.mod
@@ -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.2
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/bridge/opentracing v1.15.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/bridge/opentracing v1.15.1
  google.golang.org/grpc v1.54.0
 )
 
@@ -23,7 +23,7 @@ require (
  github.com/go-logr/stdr v1.2.2 // indirect
  github.com/golang/protobuf v1.5.2 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- go.opentelemetry.io/otel/trace v1.15.0 // indirect
+ go.opentelemetry.io/otel/trace v1.15.1 // indirect
  golang.org/x/net v0.8.0 // indirect
  golang.org/x/sys v0.7.0 // indirect
  golang.org/x/text v0.8.0 // indirect

diff --git a/example/fib/go.mod b/example/fib/go.mod
@@ -3,10 +3,10 @@ module go.opentelemetry.io/otel/example/fib
 go 1.19
 
 require (
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.15.0
- go.opentelemetry.io/otel/sdk v1.15.0
- go.opentelemetry.io/otel/trace v1.15.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.15.1
+ go.opentelemetry.io/otel/sdk v1.15.1
+ go.opentelemetry.io/otel/trace v1.15.1
 )
 
 require (

diff --git a/example/jaeger/go.mod b/example/jaeger/go.mod
@@ -9,15 +9,15 @@ replace (
 )
 
 require (
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/exporters/jaeger v1.15.0
- go.opentelemetry.io/otel/sdk v1.15.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/exporters/jaeger v1.15.1
+ go.opentelemetry.io/otel/sdk v1.15.1
 )
 
 require (
  github.com/go-logr/logr v1.2.4 // indirect
  github.com/go-logr/stdr v1.2.2 // indirect
- go.opentelemetry.io/otel/trace v1.15.0 // indirect
+ go.opentelemetry.io/otel/trace v1.15.1 // indirect
  golang.org/x/sys v0.7.0 // indirect
 )
 

diff --git a/example/namedtracer/go.mod b/example/namedtracer/go.mod
@@ -9,10 +9,10 @@ replace (
 
 require (
  github.com/go-logr/stdr v1.2.2
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.15.0
- go.opentelemetry.io/otel/sdk v1.15.0
- go.opentelemetry.io/otel/trace v1.15.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.15.1
+ go.opentelemetry.io/otel/sdk v1.15.1
+ go.opentelemetry.io/otel/trace v1.15.1
 )
 
 require (

diff --git a/example/opencensus/go.mod b/example/opencensus/go.mod
@@ -10,20 +10,20 @@ replace (
 
 require (
  go.opencensus.io v0.24.0
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/bridge/opencensus v0.38.0
- go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.38.0
- go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.15.0
- go.opentelemetry.io/otel/sdk v1.15.0
- go.opentelemetry.io/otel/sdk/metric v0.38.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/bridge/opencensus v0.38.1
+ go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.38.1
+ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.15.1
+ go.opentelemetry.io/otel/sdk v1.15.1
+ go.opentelemetry.io/otel/sdk/metric v0.38.1
 )
 
 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 v0.38.0 // indirect
- go.opentelemetry.io/otel/trace v1.15.0 // indirect
+ go.opentelemetry.io/otel/metric v0.38.1 // indirect
+ go.opentelemetry.io/otel/trace v1.15.1 // indirect
  golang.org/x/sys v0.7.0 // indirect
 )
 

diff --git a/example/otel-collector/go.mod b/example/otel-collector/go.mod
@@ -8,10 +8,10 @@ replace (
 )
 
 require (
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.15.0
- go.opentelemetry.io/otel/sdk v1.15.0
- go.opentelemetry.io/otel/trace v1.15.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.15.1
+ go.opentelemetry.io/otel/sdk v1.15.1
+ go.opentelemetry.io/otel/trace v1.15.1
  google.golang.org/grpc v1.54.0
 )
 
@@ -21,8 +21,8 @@ require (
  github.com/go-logr/stdr v1.2.2 // indirect
  github.com/golang/protobuf v1.5.2 // indirect
  github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
- go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.0 // indirect
- go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.15.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.1 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.15.1 // indirect
  go.opentelemetry.io/proto/otlp v0.19.0 // indirect
  golang.org/x/net v0.8.0 // indirect
  golang.org/x/sys v0.7.0 // indirect

diff --git a/example/passthrough/go.mod b/example/passthrough/go.mod
@@ -3,10 +3,10 @@ module go.opentelemetry.io/otel/example/passthrough
 go 1.19
 
 require (
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.15.0
- go.opentelemetry.io/otel/sdk v1.15.0
- go.opentelemetry.io/otel/trace v1.15.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.15.1
+ go.opentelemetry.io/otel/sdk v1.15.1
+ go.opentelemetry.io/otel/trace v1.15.1
 )
 
 require (

diff --git a/example/prometheus/go.mod b/example/prometheus/go.mod
@@ -4,10 +4,10 @@ go 1.19
 
 require (
  github.com/prometheus/client_golang v1.15.0
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/exporters/prometheus v0.38.0
- go.opentelemetry.io/otel/metric v0.38.0
- go.opentelemetry.io/otel/sdk/metric v0.38.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/exporters/prometheus v0.38.1
+ go.opentelemetry.io/otel/metric v0.38.1
+ go.opentelemetry.io/otel/sdk/metric v0.38.1
 )
 
 require (
@@ -20,8 +20,8 @@ require (
  github.com/prometheus/client_model v0.3.0 // indirect
  github.com/prometheus/common v0.42.0 // indirect
  github.com/prometheus/procfs v0.9.0 // indirect
- go.opentelemetry.io/otel/sdk v1.15.0 // indirect
- go.opentelemetry.io/otel/trace v1.15.0 // indirect
+ go.opentelemetry.io/otel/sdk v1.15.1 // indirect
+ go.opentelemetry.io/otel/trace v1.15.1 // indirect
  golang.org/x/sys v0.7.0 // indirect
  google.golang.org/protobuf v1.30.0 // indirect
 )

diff --git a/example/view/go.mod b/example/view/go.mod
@@ -4,11 +4,11 @@ go 1.19
 
 require (
  github.com/prometheus/client_golang v1.15.0
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/exporters/prometheus v0.38.0
- go.opentelemetry.io/otel/metric v0.38.0
- go.opentelemetry.io/otel/sdk v1.15.0
- go.opentelemetry.io/otel/sdk/metric v0.38.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/exporters/prometheus v0.38.1
+ go.opentelemetry.io/otel/metric v0.38.1
+ go.opentelemetry.io/otel/sdk v1.15.1
+ go.opentelemetry.io/otel/sdk/metric v0.38.1
 )
 
 require (
@@ -21,7 +21,7 @@ require (
  github.com/prometheus/client_model v0.3.0 // indirect
  github.com/prometheus/common v0.42.0 // indirect
  github.com/prometheus/procfs v0.9.0 // indirect
- go.opentelemetry.io/otel/trace v1.15.0 // indirect
+ go.opentelemetry.io/otel/trace v1.15.1 // indirect
  golang.org/x/sys v0.7.0 // indirect
  google.golang.org/protobuf v1.30.0 // indirect
 )

diff --git a/example/zipkin/go.mod b/example/zipkin/go.mod
@@ -9,10 +9,10 @@ replace (
 )
 
 require (
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/exporters/zipkin v1.15.0
- go.opentelemetry.io/otel/sdk v1.15.0
- go.opentelemetry.io/otel/trace v1.15.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/exporters/zipkin v1.15.1
+ go.opentelemetry.io/otel/sdk v1.15.1
+ go.opentelemetry.io/otel/trace v1.15.1
 )
 
 require (

diff --git a/exporters/jaeger/go.mod b/exporters/jaeger/go.mod
@@ -7,9 +7,9 @@ require (
  github.com/go-logr/stdr v1.2.2
  github.com/google/go-cmp v0.5.9
  github.com/stretchr/testify v1.8.2
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/sdk v1.15.0
- go.opentelemetry.io/otel/trace v1.15.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/sdk v1.15.1
+ go.opentelemetry.io/otel/trace v1.15.1
 )
 
 require (

diff --git a/exporters/otlp/otlpmetric/go.mod b/exporters/otlp/otlpmetric/go.mod
@@ -5,10 +5,10 @@ go 1.19
 require (
  github.com/google/go-cmp v0.5.9
  github.com/stretchr/testify v1.8.2
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.0
- go.opentelemetry.io/otel/sdk v1.15.0
- go.opentelemetry.io/otel/sdk/metric v0.38.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.1
+ go.opentelemetry.io/otel/sdk v1.15.1
+ go.opentelemetry.io/otel/sdk/metric v0.38.1
  go.opentelemetry.io/proto/otlp v0.19.0
  google.golang.org/grpc v1.54.0
  google.golang.org/protobuf v1.30.0
@@ -22,8 +22,8 @@ require (
  github.com/golang/protobuf v1.5.2 // indirect
  github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- go.opentelemetry.io/otel/metric v0.38.0 // indirect
- go.opentelemetry.io/otel/trace v1.15.0 // indirect
+ go.opentelemetry.io/otel/metric v0.38.1 // indirect
+ go.opentelemetry.io/otel/trace v1.15.1 // indirect
  golang.org/x/net v0.8.0 // indirect
  golang.org/x/sys v0.7.0 // indirect
  golang.org/x/text v0.8.0 // indirect

diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod b/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod
@@ -6,11 +6,11 @@ retract v0.32.2 // Contains unresolvable dependencies.
 
 require (
  github.com/stretchr/testify v1.8.2
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.0
- go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.38.0
- go.opentelemetry.io/otel/metric v0.38.0
- go.opentelemetry.io/otel/sdk/metric v0.38.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.1
+ go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.38.1
+ go.opentelemetry.io/otel/metric v0.38.1
+ go.opentelemetry.io/otel/sdk/metric v0.38.1
  go.opentelemetry.io/proto/otlp v0.19.0
  google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f
  google.golang.org/grpc v1.54.0
@@ -26,8 +26,8 @@ require (
  github.com/google/go-cmp v0.5.9 // indirect
  github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- go.opentelemetry.io/otel/sdk v1.15.0 // indirect
- go.opentelemetry.io/otel/trace v1.15.0 // indirect
+ go.opentelemetry.io/otel/sdk v1.15.1 // indirect
+ go.opentelemetry.io/otel/trace v1.15.1 // indirect
  golang.org/x/net v0.8.0 // indirect
  golang.org/x/sys v0.7.0 // indirect
  golang.org/x/text v0.8.0 // indirect

diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod b/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod
@@ -6,11 +6,11 @@ retract v0.32.2 // Contains unresolvable dependencies.
 
 require (
  github.com/stretchr/testify v1.8.2
- go.opentelemetry.io/otel v1.15.0
- go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.0
- go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.38.0
- go.opentelemetry.io/otel/metric v0.38.0
- go.opentelemetry.io/otel/sdk/metric v0.38.0
+ go.opentelemetry.io/otel v1.15.1
+ go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.1
+ go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.38.1
+ go.opentelemetry.io/otel/metric v0.38.1
+ go.opentelemetry.io/otel/sdk/metric v0.38.1
  go.opentelemetry.io/proto/otlp v0.19.0
  google.golang.org/protobuf v1.30.0
 )
@@ -24,8 +24,8 @@ require (
  github.com/google/go-cmp v0.5.9 // indirect
  github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- go.opentelemetry.io/otel/sdk v1.15.0 // indirect
- go.opentelemetry.io/otel/trace v1.15.0 // indirect
+ go.opentelemetry.io/otel/sdk v1.15.1 // indirect
+ go.opentelemetry.io/otel/trace v1.15.1 // indirect
  golang.org/x/net v0.8.0 // indirect
  golang.org/x/sys v0.7.0 // indirect
  golang.org/x/text v0.8.0 // indirect

diff --git a/exporters/otlp/otlpmetric/version.go b/exporters/otlp/otlpmetric/version.go
@@ -16,5 +16,5 @@ package otlpmetric // import "go.opentelemetry.io/otel/exporters/otlp/otlpmetric
 
 // Version is the current release version of the OpenTelemetry OTLP metrics exporter in use.
 func Version() string {
- return "0.38.0"
+ return "0.38.1"
 }