From bcd7ff7ba28a14d7c84229727063e634b84f2183 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 29 Aug 2021 07:27:40 -0700 Subject: [PATCH 1/6] Bump codecov/codecov-action from 2.0.2 to 2.0.3 (#2205) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 2.0.2 to 2.0.3. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v2.0.2...v2.0.3) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f52d1392cb..1dfbaa3ec77 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,7 +95,7 @@ jobs: cp coverage.txt $TEST_RESULTS cp coverage.html $TEST_RESULTS - name: Upload coverage report - uses: codecov/codecov-action@v2.0.2 + uses: codecov/codecov-action@v2.0.3 with: file: ./coverage.txt fail_ci_if_error: true From 3b05ba021c0c779283854a01ade4f547436b0b84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 29 Aug 2021 14:59:58 -0700 Subject: [PATCH 2/6] Bump actions/setup-go from 2.1.3 to 2.1.4 (#2206) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 2.1.3 to 2.1.4. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/v2.1.3...v2.1.4) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/dependabot.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1dfbaa3ec77..ddb5e79b982 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Go - uses: actions/setup-go@v2.1.3 + uses: actions/setup-go@v2.1.4 with: go-version: ${{ env.DEFAULT_GO_VERSION }} - name: Checkout Repo @@ -48,7 +48,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Go - uses: actions/setup-go@v2.1.3 + uses: actions/setup-go@v2.1.4 with: go-version: ${{ env.DEFAULT_GO_VERSION }} - name: Checkout Repo @@ -71,7 +71,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Go - uses: actions/setup-go@v2.1.3 + uses: actions/setup-go@v2.1.4 with: go-version: ${{ env.DEFAULT_GO_VERSION }} - name: Checkout Repo @@ -123,7 +123,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install Go - uses: actions/setup-go@v2.1.3 + uses: actions/setup-go@v2.1.4 with: go-version: ${{ matrix.go-version }} - name: Checkout code diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index 8de285f94e2..727c6ec9bfe 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ github.head_ref }} - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v2.1.4 with: go-version: '^1.15.0' - uses: evantorrie/mott-the-tidier@v1-beta From abf6afe00ebfa8f282959c74ecb88340bb3126af Mon Sep 17 00:00:00 2001 From: tomas-mota Date: Mon, 30 Aug 2021 17:09:46 +0200 Subject: [PATCH 3/6] Update otel example guide (#2210) --- example/otel-collector/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/otel-collector/README.md b/example/otel-collector/README.md index 765071f1f02..5a1e937dd5b 100644 --- a/example/otel-collector/README.md +++ b/example/otel-collector/README.md @@ -132,7 +132,7 @@ need to create the Jaeger and Prometheus exporters: ```yml ... exporters: - jaeger_grpc: + jaeger: endpoint: "jaeger-collector.observability.svc.cluster.local:14250" prometheus: From c0c5ef65ebff4bc5bc5f48a73036964810952958 Mon Sep 17 00:00:00 2001 From: Roni Lichtman Date: Mon, 30 Aug 2021 21:22:06 +0300 Subject: [PATCH 4/6] Fix typos in resource.go. (#2201) * Fix typos in resource.go. * Add a line to CHANGELOG.md with an identifier for the relevant PR. Co-authored-by: Anthony Mirabella --- CHANGELOG.md | 1 + sdk/resource/resource.go | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8b5d5d0d71..99a38bd437a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - The `"go.opentelemetry.io/otel/attribute".Any` function now supports `int32` values. (#2169) - Multiple calls to `"go.opentelemetry.io/otel/sdk/metric/controller/basic".WithResource()` are handled correctly, and when no resources are provided `"go.opentelemetry.io/otel/sdk/resource".Default()` is used. (#2120) - The `WithoutTimestamps` option for the `go.opentelemetry.io/otel/exporters/stdout/stdouttrace` exporter causes the exporter to correctly ommit timestamps. (#2195) +- Fixed typos in resources.go. (#2201) ### Security diff --git a/sdk/resource/resource.go b/sdk/resource/resource.go index 0d442f91716..2ebf5fae4b6 100644 --- a/sdk/resource/resource.go +++ b/sdk/resource/resource.go @@ -135,7 +135,7 @@ func (r *Resource) SchemaURL() string { return r.schemaURL } -// Iter returns an interator of the Resource attributes. +// Iter returns an iterator of the Resource attributes. // This is ideal to use if you do not want a copy of the attributes. func (r *Resource) Iter() attribute.Iterator { if r == nil { @@ -199,14 +199,14 @@ func Merge(a, b *Resource) (*Resource, error) { return merged, nil } -// Empty returns an instance of Resource with no attributes. It is +// Empty returns an instance of Resource with no attributes. It is // equivalent to a `nil` Resource. func Empty() *Resource { return &emptyResource } // Default returns an instance of Resource with a default -// "service.name" and OpenTelemetrySDK attributes +// "service.name" and OpenTelemetrySDK attributes. func Default() *Resource { return defaultResource } @@ -223,13 +223,13 @@ func Environment() *Resource { } // Equivalent returns an object that can be compared for equality -// between two resources. This value is suitable for use as a key in +// between two resources. This value is suitable for use as a key in // a map. func (r *Resource) Equivalent() attribute.Distinct { return r.Set().Equivalent() } -// Set returns the equivalent *attribute.Set of this resources attributes. +// Set returns the equivalent *attribute.Set of this resource's attributes. func (r *Resource) Set() *attribute.Set { if r == nil { r = Empty() From e209ee7585bcb307539a4d58ff16d39b640f58f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Ch=C3=A1vez?= Date: Mon, 30 Aug 2021 20:29:22 +0200 Subject: [PATCH 5/6] chore(exporter/zipkin): improves logging on invalid collector. (#2191) * chore(exporter/zipkin): improves logging on invalid collector. * tests: fixes tests. Co-authored-by: Anthony Mirabella --- exporters/zipkin/zipkin.go | 4 ++-- exporters/zipkin/zipkin_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exporters/zipkin/zipkin.go b/exporters/zipkin/zipkin.go index d9fb1604fda..8de40472224 100644 --- a/exporters/zipkin/zipkin.go +++ b/exporters/zipkin/zipkin.go @@ -91,10 +91,10 @@ func New(collectorURL string, opts ...Option) (*Exporter, error) { } u, err := url.Parse(collectorURL) if err != nil { - return nil, fmt.Errorf("invalid collector URL: %v", err) + return nil, fmt.Errorf("invalid collector URL %q: %v", collectorURL, err) } if u.Scheme == "" || u.Host == "" { - return nil, errors.New("invalid collector URL") + return nil, fmt.Errorf("invalid collector URL %q: no scheme or host", collectorURL) } cfg := config{} diff --git a/exporters/zipkin/zipkin_test.go b/exporters/zipkin/zipkin_test.go index bac8cdc2950..3e8e9c910ff 100644 --- a/exporters/zipkin/zipkin_test.go +++ b/exporters/zipkin/zipkin_test.go @@ -71,7 +71,7 @@ func TestNewRawExporterShouldFailInvalidCollectorURL(t *testing.T) { ) assert.Error(t, err) - assert.EqualError(t, err, "invalid collector URL") + assert.EqualError(t, err, "invalid collector URL \"localhost\": no scheme or host") assert.Nil(t, exp) } From 361a20968073b9f3cb16ea324064a9953414a3c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Paj=C4=85k?= Date: Wed, 1 Sep 2021 17:53:11 +0200 Subject: [PATCH 6/6] Fix RC2 header in changelog (#2215) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99a38bd437a..5a6c4748c4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,7 +48,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Security -## [v1.0.0-RC2] - 2021-07-26 +## [1.0.0-RC2] - 2021-07-26 ### Added