diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e39fca8fa4..04b99bfb807 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +## Samplers 0.2.0 - 2022-04-01 + +- Added AWS X-Ray remote sampling support. (#1859) + ## [1.6.0/0.31.0] - 2022-03-28 ### Added diff --git a/samplers/aws/xray/go.mod b/samplers/aws/xray/go.mod index 4a07f421d36..9908cd69f2b 100644 --- a/samplers/aws/xray/go.mod +++ b/samplers/aws/xray/go.mod @@ -6,8 +6,8 @@ require ( github.com/go-logr/logr v1.2.3 github.com/go-logr/stdr v1.2.2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/otel v1.6.0 - go.opentelemetry.io/otel/sdk v1.6.0 - go.opentelemetry.io/otel/trace v1.6.0 + go.opentelemetry.io/otel v1.6.1 + go.opentelemetry.io/otel/sdk v1.6.1 + go.opentelemetry.io/otel/trace v1.6.1 golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect ) diff --git a/samplers/aws/xray/go.sum b/samplers/aws/xray/go.sum index 8c5508c9615..c02eb7c676b 100644 --- a/samplers/aws/xray/go.sum +++ b/samplers/aws/xray/go.sum @@ -12,12 +12,12 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v1.6.0 h1:YV6GkGe/Ag2PKsm4rjlqdSNs0w0A5ZzxeGkxhx1T+t4= -go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ= -go.opentelemetry.io/otel/sdk v1.6.0 h1:JoriAoiNENuxxIQApR1O0k2h1Md5QegZhbentcRJpWk= -go.opentelemetry.io/otel/sdk v1.6.0/go.mod h1:PjLRUfDsoPy0zl7yrDGSUqjj43tL7rEtFdCEiGlxXRM= -go.opentelemetry.io/otel/trace v1.6.0 h1:NDzPermp9ISkhxIaJXjBTi2O60xOSHDHP/EezjOL2wo= -go.opentelemetry.io/otel/trace v1.6.0/go.mod h1:qs7BrU5cZ8dXQHBGxHMOxwME/27YH2qEp4/+tZLLwJE= +go.opentelemetry.io/otel v1.6.1 h1:6r1YrcTenBvYa1x491d0GGpTVBsNECmrc/K6b+zDeis= +go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwkAtrWQ= +go.opentelemetry.io/otel/sdk v1.6.1 h1:ZmcNyMhcuAYIb/Nr6QhBPTMopMTbov/47wHt1gibkoY= +go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E= +go.opentelemetry.io/otel/trace v1.6.1 h1:f8c93l5tboBYZna1nWk0W9DYyMzJXDWdZcJZ0Kb400U= +go.opentelemetry.io/otel/trace v1.6.1/go.mod h1:RkFRM1m0puWIq10oxImnGEduNBzxiN7TXluRBtE+5j0= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/samplers/aws/xray/version.go b/samplers/aws/xray/version.go new file mode 100644 index 00000000000..6654df1498b --- /dev/null +++ b/samplers/aws/xray/version.go @@ -0,0 +1,26 @@ +// Copyright The OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package xray // import "go.opentelemetry.io/contrib/samplers/aws/xray" + +// Version is the current release version of the AWS X-Ray remote sampler. +func Version() string { + return "0.2.0" + // This string is updated by the pre_release.sh script during release +} + +// SemVersion is the semantic version to be supplied to tracer/meter creation. +func SemVersion() string { + return "semver:" + Version() +} diff --git a/samplers/jaegerremote/example/go.mod b/samplers/jaegerremote/example/go.mod index 072daff6be9..532471e3d31 100644 --- a/samplers/jaegerremote/example/go.mod +++ b/samplers/jaegerremote/example/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/davecgh/go-spew v1.1.1 - go.opentelemetry.io/contrib/samplers/jaegerremote v0.1.0 + go.opentelemetry.io/contrib/samplers/jaegerremote v0.2.0 go.opentelemetry.io/otel v1.6.1 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.6.1 go.opentelemetry.io/otel/sdk v1.6.1 diff --git a/samplers/jaegerremote/version.go b/samplers/jaegerremote/version.go index a3259856b8a..efa686c09c9 100644 --- a/samplers/jaegerremote/version.go +++ b/samplers/jaegerremote/version.go @@ -16,7 +16,7 @@ package jaegerremote // import "go.opentelemetry.io/contrib/samplers/jaegerremot // Version is the current release version of the Jaeger remote sampler. func Version() string { - return "0.30.0" + return "0.2.0" // This string is updated by the pre_release.sh script during release } diff --git a/versions.yaml b/versions.yaml index b9f478e6d52..aecdfc5ef64 100644 --- a/versions.yaml +++ b/versions.yaml @@ -89,7 +89,8 @@ module-sets: - go.opentelemetry.io/contrib/instrumentation/runtime - go.opentelemetry.io/contrib/instrumentation/runtime/example experimental-samplers: - version: v0.1.0 + version: v0.2.0 modules: + - go.opentelemetry.io/contrib/samplers/aws/xray - go.opentelemetry.io/contrib/samplers/jaegerremote - go.opentelemetry.io/contrib/samplers/jaegerremote/example