From 6ae62d25cb2afe05cce4dd6e7ee31e8c183e0406 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Thu, 28 Apr 2022 07:57:41 -0700 Subject: [PATCH 1/5] Bump versions --- versions.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/versions.yaml b/versions.yaml index 286c8c077b9..b992d0fb06d 100644 --- a/versions.yaml +++ b/versions.yaml @@ -14,7 +14,7 @@ module-sets: stable-v1: - version: v1.6.3 + version: v1.7.0 modules: - go.opentelemetry.io/otel - go.opentelemetry.io/otel/bridge/opentracing @@ -34,7 +34,7 @@ module-sets: - go.opentelemetry.io/otel/trace - go.opentelemetry.io/otel/sdk experimental-metrics: - version: v0.29.0 + version: v0.30.0 modules: - go.opentelemetry.io/otel/example/prometheus - go.opentelemetry.io/otel/exporters/otlp/otlpmetric @@ -49,7 +49,7 @@ module-sets: modules: - go.opentelemetry.io/otel/schema bridge: - version: v0.29.0 + version: v0.30.0 modules: - go.opentelemetry.io/otel/bridge/opencensus - go.opentelemetry.io/otel/bridge/opencensus/test From 009a3ba80212c03a2aef4c1eb473a83112b7e017 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Thu, 28 Apr 2022 07:58:32 -0700 Subject: [PATCH 2/5] Prepare stable-v1 for version v1.7.0 --- bridge/opencensus/go.mod | 6 +++--- bridge/opencensus/test/go.mod | 6 +++--- bridge/opentracing/go.mod | 4 ++-- example/fib/go.mod | 8 ++++---- example/jaeger/go.mod | 6 +++--- example/namedtracer/go.mod | 8 ++++---- example/opencensus/go.mod | 6 +++--- example/otel-collector/go.mod | 8 ++++---- example/passthrough/go.mod | 8 ++++---- example/prometheus/go.mod | 2 +- example/zipkin/go.mod | 8 ++++---- exporters/jaeger/go.mod | 6 +++--- exporters/otlp/otlpmetric/go.mod | 6 +++--- exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod | 6 +++--- exporters/otlp/otlpmetric/otlpmetrichttp/go.mod | 4 ++-- exporters/otlp/otlptrace/go.mod | 8 ++++---- exporters/otlp/otlptrace/otlptracegrpc/go.mod | 8 ++++---- exporters/otlp/otlptrace/otlptracehttp/go.mod | 10 +++++----- exporters/prometheus/go.mod | 4 ++-- exporters/stdout/stdoutmetric/go.mod | 4 ++-- exporters/stdout/stdouttrace/go.mod | 6 +++--- exporters/zipkin/go.mod | 6 +++--- go.mod | 2 +- metric/go.mod | 2 +- sdk/go.mod | 4 ++-- sdk/metric/go.mod | 4 ++-- trace/go.mod | 2 +- version.go | 2 +- 28 files changed, 77 insertions(+), 77 deletions(-) diff --git a/bridge/opencensus/go.mod b/bridge/opencensus/go.mod index 468ec0fb503..424f8fed581 100644 --- a/bridge/opencensus/go.mod +++ b/bridge/opencensus/go.mod @@ -4,11 +4,11 @@ go 1.16 require ( go.opencensus.io v0.22.6-0.20201102222123-380f4078db9f - go.opentelemetry.io/otel v1.6.3 + go.opentelemetry.io/otel v1.7.0 go.opentelemetry.io/otel/metric v0.29.0 - go.opentelemetry.io/otel/sdk v1.6.3 + go.opentelemetry.io/otel/sdk v1.7.0 go.opentelemetry.io/otel/sdk/metric v0.29.0 - go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel/trace v1.7.0 ) replace go.opentelemetry.io/otel => ../.. diff --git a/bridge/opencensus/test/go.mod b/bridge/opencensus/test/go.mod index 2780a4ddb21..13a061351fb 100644 --- a/bridge/opencensus/test/go.mod +++ b/bridge/opencensus/test/go.mod @@ -4,10 +4,10 @@ go 1.16 require ( go.opencensus.io v0.23.0 - go.opentelemetry.io/otel v1.6.3 + go.opentelemetry.io/otel v1.7.0 go.opentelemetry.io/otel/bridge/opencensus v0.29.0 - go.opentelemetry.io/otel/sdk v1.6.3 - go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel/sdk v1.7.0 + go.opentelemetry.io/otel/trace v1.7.0 ) replace go.opentelemetry.io/otel => ../../.. diff --git a/bridge/opentracing/go.mod b/bridge/opentracing/go.mod index 5d669f351c4..58504ffe18d 100644 --- a/bridge/opentracing/go.mod +++ b/bridge/opentracing/go.mod @@ -6,8 +6,8 @@ replace go.opentelemetry.io/otel => ../.. require ( github.com/opentracing/opentracing-go v1.2.0 - go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/trace v1.7.0 ) replace go.opentelemetry.io/otel/bridge/opencensus => ../opencensus diff --git a/example/fib/go.mod b/example/fib/go.mod index a4418942414..579478f06b5 100644 --- a/example/fib/go.mod +++ b/example/fib/go.mod @@ -3,10 +3,10 @@ module go.opentelemetry.io/otel/example/fib go 1.16 require ( - go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.6.3 - go.opentelemetry.io/otel/sdk v1.6.3 - go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.7.0 + go.opentelemetry.io/otel/sdk v1.7.0 + go.opentelemetry.io/otel/trace v1.7.0 ) replace go.opentelemetry.io/otel => ../.. diff --git a/example/jaeger/go.mod b/example/jaeger/go.mod index 7f4bfc853ae..a3aa6e7a2c9 100644 --- a/example/jaeger/go.mod +++ b/example/jaeger/go.mod @@ -9,9 +9,9 @@ replace ( ) require ( - go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/exporters/jaeger v1.6.3 - go.opentelemetry.io/otel/sdk v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/exporters/jaeger v1.7.0 + go.opentelemetry.io/otel/sdk v1.7.0 ) replace go.opentelemetry.io/otel/bridge/opencensus => ../../bridge/opencensus diff --git a/example/namedtracer/go.mod b/example/namedtracer/go.mod index 2759dc8fb80..2e7fbe73c1a 100644 --- 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.6.3 - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.6.3 - go.opentelemetry.io/otel/sdk v1.6.3 - go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.7.0 + go.opentelemetry.io/otel/sdk v1.7.0 + go.opentelemetry.io/otel/trace v1.7.0 ) replace go.opentelemetry.io/otel/bridge/opencensus => ../../bridge/opencensus diff --git a/example/opencensus/go.mod b/example/opencensus/go.mod index 9ae6e9d54bb..00ca782d3d2 100644 --- a/example/opencensus/go.mod +++ b/example/opencensus/go.mod @@ -10,11 +10,11 @@ replace ( require ( go.opencensus.io v0.22.6-0.20201102222123-380f4078db9f - go.opentelemetry.io/otel v1.6.3 + go.opentelemetry.io/otel v1.7.0 go.opentelemetry.io/otel/bridge/opencensus v0.29.0 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.29.0 - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.6.3 - go.opentelemetry.io/otel/sdk v1.6.3 + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.7.0 + go.opentelemetry.io/otel/sdk v1.7.0 go.opentelemetry.io/otel/sdk/metric v0.29.0 ) diff --git a/example/otel-collector/go.mod b/example/otel-collector/go.mod index d1d13628dd7..3c6f108a3dd 100644 --- a/example/otel-collector/go.mod +++ b/example/otel-collector/go.mod @@ -8,10 +8,10 @@ replace ( ) require ( - go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.3 - go.opentelemetry.io/otel/sdk v1.6.3 - go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.7.0 + go.opentelemetry.io/otel/sdk v1.7.0 + go.opentelemetry.io/otel/trace v1.7.0 google.golang.org/grpc v1.46.0 ) diff --git a/example/passthrough/go.mod b/example/passthrough/go.mod index 266846853bc..09df93d9fd3 100644 --- a/example/passthrough/go.mod +++ b/example/passthrough/go.mod @@ -3,10 +3,10 @@ module go.opentelemetry.io/otel/example/passthrough go 1.16 require ( - go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.6.3 - go.opentelemetry.io/otel/sdk v1.6.3 - go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.7.0 + go.opentelemetry.io/otel/sdk v1.7.0 + go.opentelemetry.io/otel/trace v1.7.0 ) replace ( diff --git a/example/prometheus/go.mod b/example/prometheus/go.mod index 80b68b0351d..e08d8f8aa18 100644 --- a/example/prometheus/go.mod +++ b/example/prometheus/go.mod @@ -9,7 +9,7 @@ replace ( ) require ( - go.opentelemetry.io/otel v1.6.3 + go.opentelemetry.io/otel v1.7.0 go.opentelemetry.io/otel/exporters/prometheus v0.29.0 go.opentelemetry.io/otel/metric v0.29.0 go.opentelemetry.io/otel/sdk/metric v0.29.0 diff --git a/example/zipkin/go.mod b/example/zipkin/go.mod index bee194c5a8c..d11b2597ea5 100644 --- a/example/zipkin/go.mod +++ b/example/zipkin/go.mod @@ -9,10 +9,10 @@ replace ( ) require ( - go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/exporters/zipkin v1.6.3 - go.opentelemetry.io/otel/sdk v1.6.3 - go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/exporters/zipkin v1.7.0 + go.opentelemetry.io/otel/sdk v1.7.0 + go.opentelemetry.io/otel/trace v1.7.0 ) replace go.opentelemetry.io/otel/bridge/opencensus => ../../bridge/opencensus diff --git a/exporters/jaeger/go.mod b/exporters/jaeger/go.mod index 724a3a07816..4f43d3dee94 100644 --- a/exporters/jaeger/go.mod +++ b/exporters/jaeger/go.mod @@ -5,9 +5,9 @@ go 1.16 require ( github.com/google/go-cmp v0.5.7 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/sdk v1.6.3 - go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/sdk v1.7.0 + go.opentelemetry.io/otel/trace v1.7.0 ) replace go.opentelemetry.io/otel/bridge/opencensus => ../../bridge/opencensus diff --git a/exporters/otlp/otlpmetric/go.mod b/exporters/otlp/otlpmetric/go.mod index 71c1a59480c..c2a6f268595 100644 --- a/exporters/otlp/otlpmetric/go.mod +++ b/exporters/otlp/otlpmetric/go.mod @@ -5,10 +5,10 @@ go 1.16 require ( github.com/google/go-cmp v0.5.7 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 go.opentelemetry.io/otel/metric v0.29.0 - go.opentelemetry.io/otel/sdk v1.6.3 + go.opentelemetry.io/otel/sdk v1.7.0 go.opentelemetry.io/otel/sdk/metric v0.29.0 go.opentelemetry.io/proto/otlp v0.16.0 google.golang.org/grpc v1.46.0 diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod b/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod index d26194c2489..ac84fc60cbf 100644 --- a/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod +++ b/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod @@ -4,11 +4,11 @@ go 1.16 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.29.0 go.opentelemetry.io/otel/metric v0.29.0 - go.opentelemetry.io/otel/sdk v1.6.3 + go.opentelemetry.io/otel/sdk v1.7.0 go.opentelemetry.io/otel/sdk/metric v0.29.0 go.opentelemetry.io/proto/otlp v0.16.0 google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod b/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod index 5a5daa5aaf1..52a0089cd6b 100644 --- a/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod +++ b/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod @@ -4,9 +4,9 @@ go 1.16 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.3 + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.29.0 - go.opentelemetry.io/otel/sdk v1.6.3 + go.opentelemetry.io/otel/sdk v1.7.0 go.opentelemetry.io/proto/otlp v0.16.0 google.golang.org/protobuf v1.28.0 ) diff --git a/exporters/otlp/otlptrace/go.mod b/exporters/otlp/otlptrace/go.mod index 5501c87ca07..d4914ea0b93 100644 --- a/exporters/otlp/otlptrace/go.mod +++ b/exporters/otlp/otlptrace/go.mod @@ -5,10 +5,10 @@ go 1.16 require ( github.com/google/go-cmp v0.5.7 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.3 - go.opentelemetry.io/otel/sdk v1.6.3 - go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 + go.opentelemetry.io/otel/sdk v1.7.0 + go.opentelemetry.io/otel/trace v1.7.0 go.opentelemetry.io/proto/otlp v0.16.0 google.golang.org/grpc v1.46.0 google.golang.org/protobuf v1.28.0 diff --git a/exporters/otlp/otlptrace/otlptracegrpc/go.mod b/exporters/otlp/otlptrace/otlptracegrpc/go.mod index 129b7e830a1..2a760b0320f 100644 --- a/exporters/otlp/otlptrace/otlptracegrpc/go.mod +++ b/exporters/otlp/otlptrace/otlptracegrpc/go.mod @@ -4,10 +4,10 @@ go 1.16 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.3 - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.6.3 - go.opentelemetry.io/otel/sdk v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.7.0 + go.opentelemetry.io/otel/sdk v1.7.0 go.opentelemetry.io/proto/otlp v0.16.0 go.uber.org/goleak v1.1.12 google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 diff --git a/exporters/otlp/otlptrace/otlptracehttp/go.mod b/exporters/otlp/otlptrace/otlptracehttp/go.mod index 60091c2507a..a49ca02e574 100644 --- a/exporters/otlp/otlptrace/otlptracehttp/go.mod +++ b/exporters/otlp/otlptrace/otlptracehttp/go.mod @@ -4,11 +4,11 @@ go 1.16 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.3 - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.6.3 - go.opentelemetry.io/otel/sdk v1.6.3 - go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.7.0 + go.opentelemetry.io/otel/sdk v1.7.0 + go.opentelemetry.io/otel/trace v1.7.0 go.opentelemetry.io/proto/otlp v0.16.0 google.golang.org/protobuf v1.28.0 ) diff --git a/exporters/prometheus/go.mod b/exporters/prometheus/go.mod index 4db0f072a95..c84e5c0dc4d 100644 --- a/exporters/prometheus/go.mod +++ b/exporters/prometheus/go.mod @@ -5,9 +5,9 @@ go 1.16 require ( github.com/prometheus/client_golang v1.12.1 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel v1.6.3 + go.opentelemetry.io/otel v1.7.0 go.opentelemetry.io/otel/metric v0.29.0 - go.opentelemetry.io/otel/sdk v1.6.3 + go.opentelemetry.io/otel/sdk v1.7.0 go.opentelemetry.io/otel/sdk/metric v0.29.0 ) diff --git a/exporters/stdout/stdoutmetric/go.mod b/exporters/stdout/stdoutmetric/go.mod index 82efdb5dea7..4d13fed3170 100644 --- a/exporters/stdout/stdoutmetric/go.mod +++ b/exporters/stdout/stdoutmetric/go.mod @@ -9,9 +9,9 @@ replace ( require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel v1.6.3 + go.opentelemetry.io/otel v1.7.0 go.opentelemetry.io/otel/metric v0.29.0 - go.opentelemetry.io/otel/sdk v1.6.3 + go.opentelemetry.io/otel/sdk v1.7.0 go.opentelemetry.io/otel/sdk/metric v0.29.0 ) diff --git a/exporters/stdout/stdouttrace/go.mod b/exporters/stdout/stdouttrace/go.mod index 8a960973ac4..586949a1157 100644 --- a/exporters/stdout/stdouttrace/go.mod +++ b/exporters/stdout/stdouttrace/go.mod @@ -9,9 +9,9 @@ replace ( require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/sdk v1.6.3 - go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/sdk v1.7.0 + go.opentelemetry.io/otel/trace v1.7.0 ) replace go.opentelemetry.io/otel/bridge/opencensus => ../../../bridge/opencensus diff --git a/exporters/zipkin/go.mod b/exporters/zipkin/go.mod index 9522e3bb11d..ed86a58d189 100644 --- a/exporters/zipkin/go.mod +++ b/exporters/zipkin/go.mod @@ -6,9 +6,9 @@ require ( github.com/google/go-cmp v0.5.7 github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/sdk v1.6.3 - go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/sdk v1.7.0 + go.opentelemetry.io/otel/trace v1.7.0 ) replace go.opentelemetry.io/otel/bridge/opencensus => ../../bridge/opencensus diff --git a/go.mod b/go.mod index 34e9276f6fa..cb026c095e3 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/go-logr/stdr v1.2.2 github.com/google/go-cmp v0.5.7 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel/trace v1.7.0 ) replace go.opentelemetry.io/otel => ./ diff --git a/metric/go.mod b/metric/go.mod index cbc5cf20905..02e82e3601f 100644 --- a/metric/go.mod +++ b/metric/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel v1.6.3 + go.opentelemetry.io/otel v1.7.0 ) replace go.opentelemetry.io/otel => ../ diff --git a/sdk/go.mod b/sdk/go.mod index b839715678c..00e876eead3 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -8,8 +8,8 @@ require ( github.com/go-logr/logr v1.2.3 github.com/google/go-cmp v0.5.7 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/trace v1.7.0 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 ) diff --git a/sdk/metric/go.mod b/sdk/metric/go.mod index 14031ee16d6..4c746bb0c97 100644 --- a/sdk/metric/go.mod +++ b/sdk/metric/go.mod @@ -41,9 +41,9 @@ replace go.opentelemetry.io/otel/trace => ../../trace require ( github.com/benbjohnson/clock v1.3.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel v1.6.3 + go.opentelemetry.io/otel v1.7.0 go.opentelemetry.io/otel/metric v0.29.0 - go.opentelemetry.io/otel/sdk v1.6.3 + go.opentelemetry.io/otel/sdk v1.7.0 ) replace go.opentelemetry.io/otel/example/passthrough => ../../example/passthrough diff --git a/trace/go.mod b/trace/go.mod index 2c8851bb0d1..7496b0f2dac 100644 --- a/trace/go.mod +++ b/trace/go.mod @@ -41,7 +41,7 @@ replace go.opentelemetry.io/otel/trace => ./ require ( github.com/google/go-cmp v0.5.7 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel v1.6.3 + go.opentelemetry.io/otel v1.7.0 ) replace go.opentelemetry.io/otel/example/passthrough => ../example/passthrough diff --git a/version.go b/version.go index e36a226325a..da940c6323f 100644 --- a/version.go +++ b/version.go @@ -16,5 +16,5 @@ package otel // import "go.opentelemetry.io/otel" // Version is the current release version of OpenTelemetry in use. func Version() string { - return "1.6.3" + return "1.7.0" } From 15bf26fe47219d7b33b9a999d27da8385539f454 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Thu, 28 Apr 2022 08:00:04 -0700 Subject: [PATCH 3/5] Prepare experimental-metrics for version v0.30.0 --- bridge/opencensus/go.mod | 4 ++-- example/opencensus/go.mod | 4 ++-- example/prometheus/go.mod | 6 +++--- exporters/otlp/otlpmetric/go.mod | 4 ++-- exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod | 6 +++--- exporters/otlp/otlpmetric/otlpmetrichttp/go.mod | 2 +- exporters/prometheus/go.mod | 4 ++-- exporters/stdout/stdoutmetric/go.mod | 4 ++-- sdk/metric/go.mod | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bridge/opencensus/go.mod b/bridge/opencensus/go.mod index 424f8fed581..8acc612e542 100644 --- a/bridge/opencensus/go.mod +++ b/bridge/opencensus/go.mod @@ -5,9 +5,9 @@ go 1.16 require ( go.opencensus.io v0.22.6-0.20201102222123-380f4078db9f go.opentelemetry.io/otel v1.7.0 - go.opentelemetry.io/otel/metric v0.29.0 + go.opentelemetry.io/otel/metric v0.30.0 go.opentelemetry.io/otel/sdk v1.7.0 - go.opentelemetry.io/otel/sdk/metric v0.29.0 + go.opentelemetry.io/otel/sdk/metric v0.30.0 go.opentelemetry.io/otel/trace v1.7.0 ) diff --git a/example/opencensus/go.mod b/example/opencensus/go.mod index 00ca782d3d2..5ce86b7633b 100644 --- a/example/opencensus/go.mod +++ b/example/opencensus/go.mod @@ -12,10 +12,10 @@ require ( go.opencensus.io v0.22.6-0.20201102222123-380f4078db9f go.opentelemetry.io/otel v1.7.0 go.opentelemetry.io/otel/bridge/opencensus v0.29.0 - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.29.0 + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.30.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.7.0 go.opentelemetry.io/otel/sdk v1.7.0 - go.opentelemetry.io/otel/sdk/metric v0.29.0 + go.opentelemetry.io/otel/sdk/metric v0.30.0 ) replace go.opentelemetry.io/otel/bridge/opentracing => ../../bridge/opentracing diff --git a/example/prometheus/go.mod b/example/prometheus/go.mod index e08d8f8aa18..0a4d2c1236c 100644 --- a/example/prometheus/go.mod +++ b/example/prometheus/go.mod @@ -10,9 +10,9 @@ replace ( require ( go.opentelemetry.io/otel v1.7.0 - go.opentelemetry.io/otel/exporters/prometheus v0.29.0 - go.opentelemetry.io/otel/metric v0.29.0 - go.opentelemetry.io/otel/sdk/metric v0.29.0 + go.opentelemetry.io/otel/exporters/prometheus v0.30.0 + go.opentelemetry.io/otel/metric v0.30.0 + go.opentelemetry.io/otel/sdk/metric v0.30.0 ) replace go.opentelemetry.io/otel/bridge/opencensus => ../../bridge/opencensus diff --git a/exporters/otlp/otlpmetric/go.mod b/exporters/otlp/otlpmetric/go.mod index c2a6f268595..14df2170083 100644 --- a/exporters/otlp/otlpmetric/go.mod +++ b/exporters/otlp/otlpmetric/go.mod @@ -7,9 +7,9 @@ require ( github.com/stretchr/testify v1.7.1 go.opentelemetry.io/otel v1.7.0 go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 - go.opentelemetry.io/otel/metric v0.29.0 + go.opentelemetry.io/otel/metric v0.30.0 go.opentelemetry.io/otel/sdk v1.7.0 - go.opentelemetry.io/otel/sdk/metric v0.29.0 + go.opentelemetry.io/otel/sdk/metric v0.30.0 go.opentelemetry.io/proto/otlp v0.16.0 google.golang.org/grpc v1.46.0 google.golang.org/protobuf v1.28.0 diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod b/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod index ac84fc60cbf..9cb6acc30db 100644 --- a/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod +++ b/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod @@ -6,10 +6,10 @@ require ( github.com/stretchr/testify v1.7.1 go.opentelemetry.io/otel v1.7.0 go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.29.0 - go.opentelemetry.io/otel/metric v0.29.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.30.0 + go.opentelemetry.io/otel/metric v0.30.0 go.opentelemetry.io/otel/sdk v1.7.0 - go.opentelemetry.io/otel/sdk/metric v0.29.0 + go.opentelemetry.io/otel/sdk/metric v0.30.0 go.opentelemetry.io/proto/otlp v0.16.0 google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 google.golang.org/grpc v1.46.0 diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod b/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod index 52a0089cd6b..7515cc11d9a 100644 --- a/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod +++ b/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( github.com/stretchr/testify v1.7.1 go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.29.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.30.0 go.opentelemetry.io/otel/sdk v1.7.0 go.opentelemetry.io/proto/otlp v0.16.0 google.golang.org/protobuf v1.28.0 diff --git a/exporters/prometheus/go.mod b/exporters/prometheus/go.mod index c84e5c0dc4d..bdd037be053 100644 --- a/exporters/prometheus/go.mod +++ b/exporters/prometheus/go.mod @@ -6,9 +6,9 @@ require ( github.com/prometheus/client_golang v1.12.1 github.com/stretchr/testify v1.7.1 go.opentelemetry.io/otel v1.7.0 - go.opentelemetry.io/otel/metric v0.29.0 + go.opentelemetry.io/otel/metric v0.30.0 go.opentelemetry.io/otel/sdk v1.7.0 - go.opentelemetry.io/otel/sdk/metric v0.29.0 + go.opentelemetry.io/otel/sdk/metric v0.30.0 ) replace go.opentelemetry.io/otel => ../.. diff --git a/exporters/stdout/stdoutmetric/go.mod b/exporters/stdout/stdoutmetric/go.mod index 4d13fed3170..3902d39bc3a 100644 --- a/exporters/stdout/stdoutmetric/go.mod +++ b/exporters/stdout/stdoutmetric/go.mod @@ -10,9 +10,9 @@ replace ( require ( github.com/stretchr/testify v1.7.1 go.opentelemetry.io/otel v1.7.0 - go.opentelemetry.io/otel/metric v0.29.0 + go.opentelemetry.io/otel/metric v0.30.0 go.opentelemetry.io/otel/sdk v1.7.0 - go.opentelemetry.io/otel/sdk/metric v0.29.0 + go.opentelemetry.io/otel/sdk/metric v0.30.0 ) replace go.opentelemetry.io/otel/bridge/opencensus => ../../../bridge/opencensus diff --git a/sdk/metric/go.mod b/sdk/metric/go.mod index 4c746bb0c97..f81c840dfc0 100644 --- a/sdk/metric/go.mod +++ b/sdk/metric/go.mod @@ -42,7 +42,7 @@ require ( github.com/benbjohnson/clock v1.3.0 github.com/stretchr/testify v1.7.1 go.opentelemetry.io/otel v1.7.0 - go.opentelemetry.io/otel/metric v0.29.0 + go.opentelemetry.io/otel/metric v0.30.0 go.opentelemetry.io/otel/sdk v1.7.0 ) From f0e97129462628ab984d524334362be52dd946b5 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Thu, 28 Apr 2022 08:02:40 -0700 Subject: [PATCH 4/5] Prepare bridge for version v0.30.0 --- bridge/opencensus/test/go.mod | 2 +- example/opencensus/go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bridge/opencensus/test/go.mod b/bridge/opencensus/test/go.mod index 13a061351fb..7ac137e1291 100644 --- a/bridge/opencensus/test/go.mod +++ b/bridge/opencensus/test/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( go.opencensus.io v0.23.0 go.opentelemetry.io/otel v1.7.0 - go.opentelemetry.io/otel/bridge/opencensus v0.29.0 + go.opentelemetry.io/otel/bridge/opencensus v0.30.0 go.opentelemetry.io/otel/sdk v1.7.0 go.opentelemetry.io/otel/trace v1.7.0 ) diff --git a/example/opencensus/go.mod b/example/opencensus/go.mod index 5ce86b7633b..d595ae6a99b 100644 --- a/example/opencensus/go.mod +++ b/example/opencensus/go.mod @@ -11,7 +11,7 @@ replace ( require ( go.opencensus.io v0.22.6-0.20201102222123-380f4078db9f go.opentelemetry.io/otel v1.7.0 - go.opentelemetry.io/otel/bridge/opencensus v0.29.0 + go.opentelemetry.io/otel/bridge/opencensus v0.30.0 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.30.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.7.0 go.opentelemetry.io/otel/sdk v1.7.0 From 753d43177e5d350fda8e96e49a028ba22633d5e3 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Thu, 28 Apr 2022 08:12:12 -0700 Subject: [PATCH 5/5] Update changelog --- CHANGELOG.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 444429393c7..1bdedced0fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +## [1.7.0/0.30.0] - 2022-04-28 + ### Added - Add the `go.opentelemetry.io/otel/semconv/v1.8.0` package. @@ -20,14 +22,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Fixed -- Delegated instruments are unwrapped before delegating Callbacks. (#2784) -- Resolve supply-chain failure for the markdown-link-checker GitHub action by calling the CLI directly. (#2834) -- Remove import of `testing` package in non-tests builds. (#2786) +- Globally delegated instruments are unwrapped before delegating asynchronous callbacks. (#2784) +- Remove import of `testing` package in non-tests builds of the `go.opentelemetry.io/otel` package. (#2786) ### Changed - The `WithLabelEncoder` option from the `go.opentelemetry.io/otel/exporters/stdout/stdoutmetric` package is renamed to `WithAttributeEncoder`. (#2790) -- The `Batch.Labels` field from the `go.opentelemetry.io/otel/sdk/metric/metrictest` package is renamed to `Batch.Attributes`. (#2790) - The `LabelFilterSelector` interface from `go.opentelemetry.io/otel/sdk/metric/processor/reducer` is renamed to `AttributeFilterSelector`. The method included in the renamed interface also changed from `LabelFilterFor` to `AttributeFilterFor`. (#2790) - The `Metadata.Labels` method from the `go.opentelemetry.io/otel/sdk/metric/export` package is renamed to `Metadata.Attributes`. @@ -1852,7 +1852,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/metric/v0.29.0...HEAD +[Unreleased]: https://github.com/open-telemetry/opentelemetry-go/compare/v1.7.0...HEAD +[1.7.0/0.30.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.7.0 [0.29.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/metric/v0.29.0 [1.6.3]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.6.3 [1.6.2]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.6.2