Skip to content

Commit

Permalink
Merge branch 'fix/invalid-percent-encoded-octet-sequences' of github.…
Browse files Browse the repository at this point in the history
…com:embrace-io/opentelemetry-go into fix/invalid-percent-encoded-octet-sequences
  • Loading branch information
santileira committed Jun 24, 2024
2 parents 94dc3ef + edc4fa2 commit 6408a5f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ linters:
- misspell
- revive
- staticcheck
- tenv
- typecheck
- unused

Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Fix panic in baggage creation when a member contains 0x80 char in key or value. (#5494)
- 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)
- Fix stale timestamps reported by the lastvalue aggregation. (#5517)
- Baggage propagation - replace invalid percent-encoded octet sequences with replacement char. (#5528)
- Replace invalid percent-encoded octet sequences with replacement char in `go.opentelemetry.io/otel/baggage`. (#5528)

## [1.27.0/0.49.0/0.3.0] 2024-05-21

Expand Down
4 changes: 2 additions & 2 deletions example/otel-collector/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@

services:
otel-collector:
image: otel/opentelemetry-collector-contrib:0.102.1
image: otel/opentelemetry-collector-contrib:0.103.0
command: ["--config=/etc/otel-collector.yaml"]
volumes:
- ./otel-collector.yaml:/etc/otel-collector.yaml
ports:
- 4317:4317

prometheus:
image: prom/prometheus:v2.52.0
image: prom/prometheus:v2.53.0
volumes:
- ./prometheus.yaml:/etc/prometheus/prometheus.yml
ports:
Expand Down

0 comments on commit 6408a5f

Please sign in to comment.