Skip to content

Commit c29dd7b

Browse files
committed
Merge branch 'fix/invalid-percent-encoded-octet-sequences' of github.com:embrace-io/opentelemetry-go into fix/invalid-percent-encoded-octet-sequences
2 parents d9dc0e7 + f424cc0 commit c29dd7b

File tree

119 files changed

+2917
-533
lines changed

Some content is hidden

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

119 files changed

+2917
-533
lines changed

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
workflow_dispatch:
77

88
env:
9-
DEFAULT_GO_VERSION: "~1.22.4"
9+
DEFAULT_GO_VERSION: "~1.22.5"
1010
jobs:
1111
benchmark:
1212
name: Benchmarks

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
# backwards compatibility with the previous two minor releases and we
1313
# explicitly test our code for these versions so keeping this at prior
1414
# versions does not add value.
15-
DEFAULT_GO_VERSION: "~1.22.4"
15+
DEFAULT_GO_VERSION: "~1.22.5"
1616
jobs:
1717
lint:
1818
runs-on: ubuntu-latest
@@ -118,7 +118,7 @@ jobs:
118118
compatibility-test:
119119
strategy:
120120
matrix:
121-
go-version: ["~1.22.4", "~1.21.11"]
121+
go-version: ["~1.22.5", "~1.21.12"]
122122
platform:
123123
- os: ubuntu-latest
124124
arch: "386"

.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ linters:
1111
enable:
1212
- depguard
1313
- errcheck
14+
- errorlint
1415
- godot
1516
- gofumpt
1617
- goimports

CHANGELOG.md

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

99
## [Unreleased]
1010

11+
## [1.28.0/0.50.0/0.4.0] 2024-07-02
12+
1113
### Added
1214

13-
- The `go.opentelemetry.io/otel/semconv/v1.26.0` package.
14-
The package contains semantic conventions from the `v1.26.0` version of the OpenTelemetry Semantic Conventions. (#5476)
1515
- The `IsEmpty` method is added to the `Instrument` type in `go.opentelemetry.io/otel/sdk/metric`.
1616
This method is used to check if an `Instrument` instance is a zero-value. (#5431)
1717
- Store and provide the emitted `context.Context` in `ScopeRecords` of `go.opentelemetry.io/otel/sdk/log/logtest`. (#5468)
18-
- `SimpleProcessor.OnEmit` in `go.opentelemetry.io/otel/sdk/log` no longer allocates a slice which makes it possible to have a zero-allocation log processing using `SimpleProcessor`. (#5493)
18+
- The `go.opentelemetry.io/otel/semconv/v1.26.0` package.
19+
The package contains semantic conventions from the `v1.26.0` version of the OpenTelemetry Semantic Conventions. (#5476)
1920
- The `AssertRecordEqual` method to `go.opentelemetry.io/otel/log/logtest` to allow comparison of two log records in tests. (#5499)
20-
- `service.instance.id` is populated for a `Resource` created with `"go.opentelemetry.io/otel/sdk/resource".Default` with a default value when `OTEL_GO_X_RESOURCE` is set. (#5520)
21+
- The `WithHeaders` option to `go.opentelemetry.io/otel/exporters/zipkin` to allow configuring custom http headers while exporting spans. (#5530)
2122

2223
### Changed
2324

@@ -28,21 +29,26 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
2829
- The exporter no longer exports the deprecated "otel.library.name" or "otel.library.version" attributes.
2930
- Upgrade `go.opentelemetry.io/otel/semconv/v1.25.0` to `go.opentelemetry.io/otel/semconv/v1.26.0` in `go.opentelemetry.io/otel/sdk/resource`. (#5490)
3031
- Upgrade `go.opentelemetry.io/otel/semconv/v1.25.0` to `go.opentelemetry.io/otel/semconv/v1.26.0` in `go.opentelemetry.io/otel/sdk/trace`. (#5490)
32+
- `SimpleProcessor.OnEmit` in `go.opentelemetry.io/otel/sdk/log` no longer allocates a slice which makes it possible to have a zero-allocation log processing using `SimpleProcessor`. (#5493)
3133
- Use non-generic functions in the `Start` method of `"go.opentelemetry.io/otel/sdk/trace".Trace` to reduce memory allocation. (#5497)
34+
- `service.instance.id` is populated for a `Resource` created with `"go.opentelemetry.io/otel/sdk/resource".Default` with a default value when `OTEL_GO_X_RESOURCE` is set. (#5520)
35+
- Improve performance of metric instruments in `go.opentelemetry.io/otel/sdk/metric` by removing unnecessary calls to `time.Now`. (#5545)
3236

3337
### Fixed
3438

35-
- Retry trace and span ID generation if it generated an invalid one in `go.opentelemetry.io/otel/sdk/trace`. (#5514)
3639
- Log a warning to the OpenTelemetry internal logger when a `Record` in `go.opentelemetry.io/otel/sdk/log` drops an attribute due to a limit being reached. (#5376)
3740
- Identify the `Tracer` returned from the global `TracerProvider` in `go.opentelemetry.io/otel/global` with its schema URL. (#5426)
3841
- Identify the `Meter` returned from the global `MeterProvider` in `go.opentelemetry.io/otel/global` with its schema URL. (#5426)
3942
- Log a warning to the OpenTelemetry internal logger when a `Span` in `go.opentelemetry.io/otel/sdk/trace` drops an attribute, event, or link due to a limit being reached. (#5434)
4043
- Document instrument name requirements in `go.opentelemetry.io/otel/metric`. (#5435)
4144
- Prevent random number generation data-race for experimental rand exemplars in `go.opentelemetry.io/otel/sdk/metric`. (#5456)
4245
- Fix counting number of dropped attributes of `Record` in `go.opentelemetry.io/otel/sdk/log`. (#5464)
43-
- Fix panic in baggage creation when a member contains 0x80 char in key or value. (#5494)
44-
- Correct comments for the priority of the `WithEndpoint` and `WithEndpointURL` options and their coresponding environment variables in in `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc`. (#5508)
45-
- Fix stale timestamps reported by the lastvalue aggregation. (#5517)
46+
- Fix panic in baggage creation when a member contains `0x80` char in key or value. (#5494)
47+
- Correct comments for the priority of the `WithEndpoint` and `WithEndpointURL` options and their corresponding environment variables in `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc`. (#5508)
48+
- Retry trace and span ID generation if it generated an invalid one in `go.opentelemetry.io/otel/sdk/trace`. (#5514)
49+
- Fix stale timestamps reported by the last-value aggregation. (#5517)
50+
- Indicate the `Exporter` in `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp` must be created by the `New` method. (#5521)
51+
- Improved performance in all `{Bool,Int64,Float64,String}SliceValue` functions of `go.opentelemetry.io/attributes` by reducing the number of allocations. (#5549)
4652
- Replace invalid percent-encoded octet sequences with replacement char in `go.opentelemetry.io/otel/baggage`. (#5528)
4753

4854
## [1.27.0/0.49.0/0.3.0] 2024-05-21
@@ -2998,7 +3004,8 @@ It contains api and sdk for trace and meter.
29983004
- CircleCI build CI manifest files.
29993005
- CODEOWNERS file to track owners of this project.
30003006

3001-
[Unreleased]: https://github.com/open-telemetry/opentelemetry-go/compare/v1.27.0...HEAD
3007+
[Unreleased]: https://github.com/open-telemetry/opentelemetry-go/compare/v1.28.0...HEAD
3008+
[1.28.0/0.50.0/0.4.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.28.0
30023009
[1.27.0/0.49.0/0.3.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.27.0
30033010
[1.26.0/0.48.0/0.2.0-alpha]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.26.0
30043011
[1.25.0/0.47.0/0.0.8/0.1.0-alpha]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.25.0

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414

1515
* @MrAlias @XSAM @dashpole @MadVikingGod @pellared @hanyuancheung @dmathieu
1616

17-
CODEOWNERS @MrAlias @MadVikingGod @pellared @dashpole
17+
CODEOWNERS @MrAlias @MadVikingGod @pellared @dashpole @XSAM @dmathieu

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -628,15 +628,15 @@ should be canceled.
628628

629629
### Approvers
630630

631-
- [Sam Xie](https://github.com/XSAM), Cisco/AppDynamics
632631
- [Chester Cheung](https://github.com/hanyuancheung), Tencent
633-
- [Damien Mathieu](https://github.com/dmathieu), Elastic
634632

635633
### Maintainers
636634

637-
- [David Ashpole](https://github.com/dashpole), Google
638635
- [Aaron Clawson](https://github.com/MadVikingGod), LightStep
636+
- [Damien Mathieu](https://github.com/dmathieu), Elastic
637+
- [David Ashpole](https://github.com/dashpole), Google
639638
- [Robert Pająk](https://github.com/pellared), Splunk
639+
- [Sam Xie](https://github.com/XSAM), Cisco/AppDynamics
640640
- [Tyler Yahn](https://github.com/MrAlias), Splunk
641641

642642
### Emeritus

baggage/baggage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ func parseMember(member string) (Member, error) {
302302
// Decode a percent-encoded value.
303303
value, err := url.PathUnescape(val)
304304
if err != nil {
305-
return newInvalidMember(), fmt.Errorf("%w: %v", errInvalidValue, err)
305+
return newInvalidMember(), fmt.Errorf("%w: %w", errInvalidValue, err)
306306
}
307307

308308
if !utf8.ValidString(value) {

bridge/opencensus/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ go 1.21
55
require (
66
github.com/stretchr/testify v1.9.0
77
go.opencensus.io v0.24.0
8-
go.opentelemetry.io/otel v1.27.0
9-
go.opentelemetry.io/otel/sdk v1.27.0
10-
go.opentelemetry.io/otel/sdk/metric v1.27.0
11-
go.opentelemetry.io/otel/trace v1.27.0
8+
go.opentelemetry.io/otel v1.28.0
9+
go.opentelemetry.io/otel/sdk v1.28.0
10+
go.opentelemetry.io/otel/sdk/metric v1.28.0
11+
go.opentelemetry.io/otel/trace v1.28.0
1212
)
1313

1414
require (
@@ -18,7 +18,7 @@ require (
1818
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
1919
github.com/google/uuid v1.6.0 // indirect
2020
github.com/pmezard/go-difflib v1.0.0 // indirect
21-
go.opentelemetry.io/otel/metric v1.27.0 // indirect
21+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
2222
golang.org/x/sys v0.21.0 // indirect
2323
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
2424
gopkg.in/yaml.v3 v3.0.1 // indirect

bridge/opencensus/test/go.mod

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

55
require (
66
go.opencensus.io v0.24.0
7-
go.opentelemetry.io/otel v1.27.0
8-
go.opentelemetry.io/otel/bridge/opencensus v1.27.0
9-
go.opentelemetry.io/otel/sdk v1.27.0
10-
go.opentelemetry.io/otel/trace v1.27.0
7+
go.opentelemetry.io/otel v1.28.0
8+
go.opentelemetry.io/otel/bridge/opencensus v1.28.0
9+
go.opentelemetry.io/otel/sdk v1.28.0
10+
go.opentelemetry.io/otel/trace v1.28.0
1111
)
1212

1313
require (
1414
github.com/go-logr/logr v1.4.2 // indirect
1515
github.com/go-logr/stdr v1.2.2 // indirect
1616
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
1717
github.com/google/uuid v1.6.0 // indirect
18-
go.opentelemetry.io/otel/metric v1.27.0 // indirect
19-
go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect
18+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
19+
go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
2020
golang.org/x/sys v0.21.0 // indirect
2121
)
2222

bridge/opencensus/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ package opencensus // import "go.opentelemetry.io/otel/bridge/opencensus"
55

66
// Version is the current release version of the opencensus bridge.
77
func Version() string {
8-
return "1.27.0"
8+
return "1.28.0"
99
}

0 commit comments

Comments
 (0)