diff --git a/CHANGELOG.md b/CHANGELOG.md index 33f6a162..aca1551d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,11 +8,15 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## Unreleased -## [1.18.2](https://github.com/lightstep/otel-launcher-go/releases/tag/v1.18.0) - 2023-06-21) +## [1.18.3](https://github.com/lightstep/otel-launcher-go/releases/tag/v1.18.3) - 2023-06-21) + +- Re-release. [#492](https://github.com/lightstep/otel-launcher-go/pull/492) + +## [1.18.2](https://github.com/lightstep/otel-launcher-go/releases/tag/v1.18.2) - 2023-06-21) - Support for multi-resource export pipelines as a special case. [#490](https://github.com/lightstep/otel-launcher-go/pull/490) -## [1.18.1](https://github.com/lightstep/otel-launcher-go/releases/tag/v1.18.0) - 2023-06-16) +## [1.18.1](https://github.com/lightstep/otel-launcher-go/releases/tag/v1.18.1) - 2023-06-16) - Modifies the exporter names used in the two OTel-Collector-based exporters. [#480](https://github.com/lightstep/otel-launcher-go/pull/480) diff --git a/VERSION b/VERSION index b57fc722..b9fb27ab 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.2 +1.18.3 diff --git a/go.mod b/go.mod index f3d30144..b45ec9a7 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/lightstep/otel-launcher-go go 1.18 require ( - github.com/lightstep/otel-launcher-go/lightstep/sdk/metric v1.18.2 - github.com/lightstep/otel-launcher-go/pipelines v1.18.2 + github.com/lightstep/otel-launcher-go/lightstep/sdk/metric v1.18.3 + github.com/lightstep/otel-launcher-go/pipelines v1.18.3 github.com/sethvargo/go-envconfig v0.8.3 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/otel v1.16.0 @@ -42,8 +42,8 @@ require ( github.com/klauspost/cpuid/v2 v2.0.9 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/lightstep/go-expohisto v1.0.0 // indirect - github.com/lightstep/otel-launcher-go/lightstep/instrumentation v1.18.2 // indirect - github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v1.18.2 // indirect + github.com/lightstep/otel-launcher-go/lightstep/instrumentation v1.18.3 // indirect + github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v1.18.3 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect @@ -115,3 +115,6 @@ replace github.com/lightstep/otel-launcher-go/lightstep/instrumentation => ./lig // default temporality preference; use 1.10.1 instead or consider // upgrading to a 2.x release. retract v1.10.0 + +// 1.18.2 has a broken lightstep/sdk/internal dependency. +retract v1.18.2 diff --git a/launcher/version.go b/launcher/version.go index 47e3e7ef..9145005f 100644 --- a/launcher/version.go +++ b/launcher/version.go @@ -14,4 +14,4 @@ package launcher -const version = "1.18.2" +const version = "1.18.3" diff --git a/lightstep/sdk/metric/example/go.mod b/lightstep/sdk/metric/example/go.mod index 389a543c..356f0ff9 100644 --- a/lightstep/sdk/metric/example/go.mod +++ b/lightstep/sdk/metric/example/go.mod @@ -3,7 +3,7 @@ module github.com/lightstep/otel-launcher-go/lightstep/sdk/metric/example go 1.18 require ( - github.com/lightstep/otel-launcher-go/lightstep/sdk/metric v1.18.2 + github.com/lightstep/otel-launcher-go/lightstep/sdk/metric v1.18.3 github.com/lightstep/otel-launcher-go/pipelines v1.8.0 go.opentelemetry.io/proto/otlp v0.20.0 ) @@ -35,7 +35,7 @@ require ( github.com/klauspost/cpuid/v2 v2.0.9 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/lightstep/go-expohisto v1.0.0 // indirect - github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v1.18.2 // indirect + github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v1.18.3 // indirect github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect diff --git a/lightstep/sdk/metric/go.mod b/lightstep/sdk/metric/go.mod index a7214285..38dcda01 100644 --- a/lightstep/sdk/metric/go.mod +++ b/lightstep/sdk/metric/go.mod @@ -10,7 +10,7 @@ require ( github.com/golang/mock v1.6.0 github.com/google/go-cmp v0.5.9 github.com/lightstep/go-expohisto v1.0.0 - github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v1.18.2 + github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v1.18.3 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.79.0 go.opentelemetry.io/collector/component v0.79.0 @@ -86,3 +86,6 @@ require ( ) replace github.com/lightstep/otel-launcher-go/lightstep/sdk/internal => ../internal + +// 1.18.2 has a broken lightstep/sdk/internal dependency. +retract v1.18.2 diff --git a/lightstep/sdk/trace/go.mod b/lightstep/sdk/trace/go.mod index 025630a1..44fa2810 100644 --- a/lightstep/sdk/trace/go.mod +++ b/lightstep/sdk/trace/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/f5/otel-arrow-adapter v0.0.0-20230612212022-445aac7c6ae8 github.com/google/go-cmp v0.5.9 - github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v1.18.2 + github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v1.18.3 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.79.0 go.opentelemetry.io/collector/component v0.79.0 diff --git a/pipelines/go.mod b/pipelines/go.mod index f0e6f386..162e1b5a 100644 --- a/pipelines/go.mod +++ b/pipelines/go.mod @@ -50,8 +50,8 @@ require ( ) require ( - github.com/lightstep/otel-launcher-go/lightstep/instrumentation v1.18.2 - github.com/lightstep/otel-launcher-go/lightstep/sdk/metric v1.18.2 + github.com/lightstep/otel-launcher-go/lightstep/instrumentation v1.18.3 + github.com/lightstep/otel-launcher-go/lightstep/sdk/metric v1.18.3 go.opentelemetry.io/collector v0.79.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 ) @@ -79,7 +79,7 @@ require ( github.com/klauspost/cpuid/v2 v2.0.9 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/lightstep/go-expohisto v1.0.0 // indirect - github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v1.18.2 // indirect + github.com/lightstep/otel-launcher-go/lightstep/sdk/internal v1.18.3 // indirect github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect