Skip to content

Commit f284e28

Browse files
MrAliasMrAlias
authored
Release v0.14.0 (#461)
* Bump version to v0.14.0 * Update code to use otel v0.14.0 * Go mod tidy * Update changelog
1 parent b83f931 commit f284e28

File tree

176 files changed

+984
-1005
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+984
-1005
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
88

99
## [Unreleased]
1010

11+
## [0.14.0] - 2020-11-20
12+
1113
### Added
1214

1315
- `otelhttp.{Get,Head,Post,PostForm}` convenience wrappers for their `http` counterparts. (#390)
16+
- The AWS detector now adds the cloud zone, host image ID, host type, and host name to the returned `Resource`. (#410)
1417

1518
### Changed
1619

@@ -22,6 +25,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
2225
## Fixed
2326

2427
- `/detectors/aws` no longer fails if instance metadata is not available (e.g. not running in AWS) (#401)
28+
- The AWS detector now returns a partial resource and an appropriate error if it encounters an error part way through determining a `Resource` identity. (#410)
29+
- The `host` instrumentation unit test has been updated to not depend on the system it runs on. (#426)
2530

2631
## [0.13.0] - 2020-10-09
2732

@@ -224,7 +229,8 @@ First official tagged release of `contrib` repository.
224229
- Prefix support for dogstatsd (#34)
225230
- Update Go Runtime package to use batch observer (#44)
226231

227-
[Unreleased]: https://github.com/open-telemetry/opentelemetry-go-contrib/compare/v0.13.0...HEAD
232+
[Unreleased]: https://github.com/open-telemetry/opentelemetry-go-contrib/compare/v0.14.0...HEAD
233+
[0.14.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.14.0
228234
[0.13.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.13.0
229235
[0.12.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.12.0
230236
[0.11.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.11.0

‎contrib.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package contrib // import "go.opentelemetry.io/contrib"
1818

1919
// Version is the current release version of OpenTelemetry Contrib in use.
2020
func Version() string {
21-
return "0.13.0"
21+
return "0.14.0"
2222
// This string is updated by the pre_release.sh script during release
2323
}
2424

‎detectors/aws/aws.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (aws *AWS) Detect(ctx context.Context) (*resource.Resource, error) {
7777
err = fmt.Errorf("%w: %s", resource.ErrPartialResource, m.errs)
7878
}
7979

80-
return resource.New(labels...), err
80+
return resource.NewWithAttributes(labels...), err
8181
}
8282

8383
func (aws *AWS) client() (client, error) {

‎detectors/aws/aws_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func TestAWS_Detect(t *testing.T) {
9090
Fields: fields{
9191
Client: &clientMock{available: true, idDoc: usWestInst, metadata: map[string]meta{}},
9292
},
93-
Want: want{Resource: resource.New(usWestIDLabels...)},
93+
Want: want{Resource: resource.NewWithAttributes(usWestIDLabels...)},
9494
},
9595
"Hostname Response Error": {
9696
Fields: fields{
@@ -105,7 +105,7 @@ func TestAWS_Detect(t *testing.T) {
105105
Want: want{
106106
Error: `partial resource: ["hostname": 500 EC2MetadataError]`,
107107
Partial: true,
108-
Resource: resource.New(usWestIDLabels...),
108+
Resource: resource.NewWithAttributes(usWestIDLabels...),
109109
},
110110
},
111111
"Hostname General Error": {
@@ -121,7 +121,7 @@ func TestAWS_Detect(t *testing.T) {
121121
Want: want{
122122
Error: `partial resource: ["hostname": unknown error]`,
123123
Partial: true,
124-
Resource: resource.New(usWestIDLabels...),
124+
Resource: resource.NewWithAttributes(usWestIDLabels...),
125125
},
126126
},
127127
"All Available": {
@@ -134,7 +134,7 @@ func TestAWS_Detect(t *testing.T) {
134134
},
135135
},
136136
},
137-
Want: want{Resource: resource.New(
137+
Want: want{Resource: resource.NewWithAttributes(
138138
semconv.CloudProviderAWS,
139139
semconv.CloudRegionKey.String("us-west-2"),
140140
semconv.CloudZoneKey.String("us-west-2b"),

‎detectors/aws/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ go 1.14
55
require (
66
github.com/aws/aws-sdk-go v1.35.28
77
github.com/stretchr/testify v1.6.1
8-
go.opentelemetry.io/otel v0.13.0
9-
go.opentelemetry.io/otel/sdk v0.13.0
8+
go.opentelemetry.io/otel v0.14.0
9+
go.opentelemetry.io/otel/sdk v0.14.0
1010
)

‎detectors/aws/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJy
55
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
66
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
77
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
8-
github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
9-
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
8+
github.com/google/go-cmp v0.5.3 h1:x95R7cp+rSeeqAMI2knLtQ0DKlaBhv2NrtrOvafPHRo=
9+
github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
1010
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
1111
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
1212
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
@@ -18,10 +18,10 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
1818
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
1919
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
2020
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
21-
go.opentelemetry.io/otel v0.13.0 h1:2isEnyzjjJZq6r2EKMsFj4TxiQiexsM04AVhwbR/oBA=
22-
go.opentelemetry.io/otel v0.13.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY=
23-
go.opentelemetry.io/otel/sdk v0.13.0 h1:4VCfpKamZ8GtnepXxMRurSpHpMKkcxhtO33z1S4rGDQ=
24-
go.opentelemetry.io/otel/sdk v0.13.0/go.mod h1:dKvLH8Uu8LcEPlSAUsfW7kMGaJBhk/1NYvpPZ6wIMbU=
21+
go.opentelemetry.io/otel v0.14.0 h1:YFBEfjCk9MTjaytCNSUkp9Q8lF7QJezA06T71FbQxLQ=
22+
go.opentelemetry.io/otel v0.14.0/go.mod h1:vH5xEuwy7Rts0GNtsCW3HYQoZDY+OmBJ6t1bFGGlxgw=
23+
go.opentelemetry.io/otel/sdk v0.14.0 h1:Pqgd85y5XhyvHQlOxkKW+FD4DAX7AoeaNIDKC2VhfHQ=
24+
go.opentelemetry.io/otel/sdk v0.14.0/go.mod h1:kGO5pEMSNqSJppHAm8b73zztLxB5fgDQnD56/dl5xqE=
2525
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
2626
golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI=
2727
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

‎detectors/gcp/gce.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func (gce *GCE) Detect(ctx context.Context) (*resource.Resource, error) {
9191
aggregatedErr = fmt.Errorf("detecting GCE resources: %s", errInfo)
9292
}
9393

94-
return resource.New(labels...), aggregatedErr
94+
return resource.NewWithAttributes(labels...), aggregatedErr
9595
}
9696

9797
// hasProblem checks if the err is not nil or for missing resources

‎detectors/gcp/gke.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (gke *GKE) Detect(ctx context.Context) (*resource.Resource, error) {
6161
labels = append(labels, semconv.K8SClusterNameKey.String(clusterName))
6262
}
6363

64-
k8sLabelRes := resource.New(labels...)
64+
k8sLabelRes := resource.NewWithAttributes(labels...)
6565
var aggregatedErr error
6666
if len(errInfo) > 0 {
6767
aggregatedErr = fmt.Errorf("detecting GKE resources: %s", errInfo)

‎detectors/gcp/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ go 1.14
44

55
require (
66
cloud.google.com/go v0.72.0
7-
go.opentelemetry.io/otel v0.13.0
8-
go.opentelemetry.io/otel/sdk v0.13.0
7+
go.opentelemetry.io/otel v0.14.0
8+
go.opentelemetry.io/otel/sdk v0.14.0
99
)

‎detectors/gcp/go.sum‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k=
9494
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
9595
github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
9696
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
97+
github.com/google/go-cmp v0.5.3 h1:x95R7cp+rSeeqAMI2knLtQ0DKlaBhv2NrtrOvafPHRo=
98+
github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
9799
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
98100
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
99101
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -141,10 +143,10 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
141143
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
142144
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
143145
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
144-
go.opentelemetry.io/otel v0.13.0 h1:2isEnyzjjJZq6r2EKMsFj4TxiQiexsM04AVhwbR/oBA=
145-
go.opentelemetry.io/otel v0.13.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY=
146-
go.opentelemetry.io/otel/sdk v0.13.0 h1:4VCfpKamZ8GtnepXxMRurSpHpMKkcxhtO33z1S4rGDQ=
147-
go.opentelemetry.io/otel/sdk v0.13.0/go.mod h1:dKvLH8Uu8LcEPlSAUsfW7kMGaJBhk/1NYvpPZ6wIMbU=
146+
go.opentelemetry.io/otel v0.14.0 h1:YFBEfjCk9MTjaytCNSUkp9Q8lF7QJezA06T71FbQxLQ=
147+
go.opentelemetry.io/otel v0.14.0/go.mod h1:vH5xEuwy7Rts0GNtsCW3HYQoZDY+OmBJ6t1bFGGlxgw=
148+
go.opentelemetry.io/otel/sdk v0.14.0 h1:Pqgd85y5XhyvHQlOxkKW+FD4DAX7AoeaNIDKC2VhfHQ=
149+
go.opentelemetry.io/otel/sdk v0.14.0/go.mod h1:kGO5pEMSNqSJppHAm8b73zztLxB5fgDQnD56/dl5xqE=
148150
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
149151
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
150152
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

0 commit comments

Comments
 (0)