Skip to content

Commit 6c2051a

Browse files
antonjim-teantonjim-te
committed
Merge master
1 parent b6ac5ac commit 6c2051a

File tree

91 files changed

+1908
-1010
lines changed

Some content is hidden

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

91 files changed

+1908
-1010
lines changed

‎.chloggen/components-command-with-stability-levels.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: components command
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: The "components" command now lists the component's stability levels.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [8289]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext: Note that the format of this output is NOT stable and can change between versions.
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []

‎.github/workflows/scripts/release-create-tracking-issue.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if [ "${CANDIDATE_BETA}" == "" ]; then
1111
RELEASE_VERSION="v${CANDIDATE_STABLE}"
1212
fi
1313

14-
EXISTING_ISSUE=$( gh issue list --search "Release ${RELEASE_VERSION}" --json url --jq '.[].url' --repo "${REPO}" )
14+
EXISTING_ISSUE=$( gh issue list --search "in:title Release ${RELEASE_VERSION}" --json url --jq '.[].url' --repo "${REPO}" --state open --label release )
1515

1616
if [ "${EXISTING_ISSUE}" != "" ]; then
1717
echo "Issue already exists: ${EXISTING_ISSUE}"

‎CHANGELOG-API.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,25 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG
77

88
<!-- next version -->
99

10+
## v0.84.0
11+
12+
### 💡 Enhancements 💡
13+
14+
- `exporter/exporterhelper`: Introduce a new exporter helper that operates over client-provided requests instead of pdata (#7874)
15+
The following experimental API is introduced in exporter/exporterhelper package:
16+
- `NewLogsRequestExporter`: a new exporter helper for logs.
17+
- `NewMetricsRequestExporter`: a new exporter helper for metrics.
18+
- `NewTracesRequestExporter`: a new exporter helper for traces.
19+
- `Request`: an interface for client-defined requests.
20+
- `RequestItemsCounter`: an optional interface for counting the number of items in a Request.
21+
- `LogsConverter`: an interface for converting plog.Logs to Request.
22+
- `MetricsConverter`: an interface for converting pmetric.Metrics to Request.
23+
- `TracesConverter`: an interface for converting ptrace.Traces to Request.
24+
All the new APIs are intended to be used by exporters that need to operate over client-provided requests instead of pdata.
25+
26+
- `otlpreceiver`: Export HTTPConfig as part of the API for creating the otlpreceiver configuration. (#8175)
27+
Changes signature of receiver/otlpreceiver/config.go type httpServerSettings to HTTPConfig.
28+
1029
## v0.83.0
1130

1231
### 🛑 Breaking changes 🛑

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,19 @@ If you are looking for developer-facing changes, check out [CHANGELOG-API.md](./
77

88
<!-- next version -->
99

10+
## v0.84.0
11+
12+
### 💡 Enhancements 💡
13+
14+
- `loggingexporter`: Adds exemplars logging to the logging exporter when `detailed` verbosity level is set. (#7912)
15+
- `configgrpc`: Allow any registered gRPC load balancer name to be used. (#8262)
16+
- `service`: add OTLP export for internal traces (#8106)
17+
- `configgrpc`: Add support for :authority pseudo-header in grpc client (#8228)
18+
19+
### 🧰 Bug fixes 🧰
20+
21+
- `otlphttpexporter`: Fix the handling of the HTTP response to ignore responses not encoded as protobuf (#8263)
22+
1023
## v0.83.0
1124

1225
### 💡 Enhancements 💡

‎CONTRIBUTING.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,50 @@ that each of the following steps is done in a separate version:
494494
1. On `v0.N+2`, we change `func GetFoo() Foo` to `func GetFoo(context.Context) Foo` if desired or remove it entirely if
495495
needed.
496496

497+
#### Configuration changes
498+
499+
##### Alpha components
500+
501+
Configuration for alpha components can be changed with minimal notice. Documenting them as part of the changelog is
502+
sufficient. We still recommend giving users one or two minor version's notice before breaking the configuration, such as
503+
when removing or renaming a configuration option. Providing a migration path in the component's repository is NOT
504+
required for alpha components, although still recommended.
505+
506+
- when adding a new configuration option, components MAY mark the new option as required and are not required to provide
507+
a reasonable default.
508+
- when renaming a configuration option, components MAY treat the old name as an alias to the new one and log a WARN
509+
level message in case the old option is being used.
510+
- when removing a configuration option, components MAY keep the old option for a few minor releases and log a WARN level
511+
message instructing users to remove the option.
512+
513+
##### Beta components
514+
515+
One of the requirements for a component to be marked as beta is to have its configuration options stabilized. Therefore,
516+
backward incompatible changes should be rare events for beta components. Users of those components are not expecting to
517+
have their Collector instances failing at startup because of a configuration change. When doing backward incompatible
518+
changes, component owners should add the migration path to a place within the component's repository, linked from the
519+
component's main README. This is to ensure that people using older instructions can understand how to migrate to the
520+
latest version of the component.
521+
522+
When adding a new required option:
523+
- the option MUST come with a sensible default value
524+
525+
When renaming or removing a configuration option:
526+
- the option MUST be deprecated in one version
527+
- a WARN level message should be logged, with a link to a place within the component's repository where the change is
528+
documented and a migration path is provided
529+
- the option MUST be kept for at least N+1 version, and MAY be hidden behind a feature gate in N+2
530+
- the option and the WARN level message MAY be removed after N+2 or 6 months, whichever comes later
531+
532+
Additionally, when removing an option:
533+
- the option MAY be made non operational already by the same version where it is deprecated
534+
535+
##### Stable components
536+
537+
Stable component MUST be compatible between minor versions, unless critical security issues are found. In that case, the
538+
component owner MUST provide a migration path and a reasonable time frame for users to upgrade. The same rules from beta
539+
components apply to stable when it comes to configuration changes.
540+
497541
### Specification Tracking
498542

499543
The [OpenTelemetry Specification](https://github.com/open-telemetry/opentelemetry-specification) can be a rapidly

‎cmd/builder/internal/builder/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"go.uber.org/zap"
1616
)
1717

18-
const defaultOtelColVersion = "0.83.0"
18+
const defaultOtelColVersion = "0.84.0"
1919

2020
// ErrInvalidGoMod indicates an invalid gomod
2121
var ErrInvalidGoMod = errors.New("invalid gomod specification for module")

‎cmd/builder/internal/builder/templates/go.mod.tmpl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ require (
2323
go.opentelemetry.io/collector v{{.Distribution.OtelColVersion}}
2424
)
2525

26+
require (
27+
github.com/knadh/koanf/maps v0.1.1 // indirect
28+
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
29+
)
30+
2631
{{- range .Connectors}}
2732
{{if ne .Path ""}}replace {{.GoMod}} => {{.Path}}{{end}}
2833
{{- end}}

‎cmd/builder/internal/config/default.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ dist:
22
module: go.opentelemetry.io/collector/cmd/otelcorecol
33
name: otelcorecol
44
description: Local OpenTelemetry Collector binary, testing only.
5-
version: 0.83.0-dev
6-
otelcol_version: 0.83.0
5+
version: 0.84.0-dev
6+
otelcol_version: 0.84.0
77

88
receivers:
9-
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.83.0
9+
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.84.0
1010
exporters:
11-
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.83.0
12-
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.83.0
13-
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.83.0
11+
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.84.0
12+
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.84.0
13+
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.84.0
1414
extensions:
15-
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.83.0
16-
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.83.0
15+
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.84.0
16+
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.84.0
1717
processors:
18-
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.83.0
19-
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.83.0
18+
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.84.0
19+
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.84.0
2020
connectors:
21-
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.83.0
21+
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.84.0
2222

‎cmd/builder/test/core.builder.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
dist:
22
module: go.opentelemetry.io/collector/builder/test/core
3-
otelcol_version: 0.83.0
3+
otelcol_version: 0.84.0
44

55
extensions:
66
- import: go.opentelemetry.io/collector/extension/zpagesextension
7-
gomod: go.opentelemetry.io/collector v0.83.0
7+
gomod: go.opentelemetry.io/collector v0.84.0
88
path: ${WORKSPACE_DIR}
99

1010
receivers:
1111
- import: go.opentelemetry.io/collector/receiver/otlpreceiver
12-
gomod: go.opentelemetry.io/collector v0.83.0
12+
gomod: go.opentelemetry.io/collector v0.84.0
1313
path: ${WORKSPACE_DIR}
1414

1515
exporters:
1616
- import: go.opentelemetry.io/collector/exporter/loggingexporter
17-
gomod: go.opentelemetry.io/collector v0.83.0
17+
gomod: go.opentelemetry.io/collector v0.84.0
1818
path: ${WORKSPACE_DIR}
1919

2020
replaces:

‎cmd/otelcorecol/builder-config.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@ dist:
22
module: go.opentelemetry.io/collector/cmd/otelcorecol
33
name: otelcorecol
44
description: Local OpenTelemetry Collector binary, testing only.
5-
version: 0.83.0-dev
6-
otelcol_version: 0.83.0
5+
version: 0.84.0-dev
6+
otelcol_version: 0.84.0
77

88
receivers:
9-
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.83.0
9+
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.84.0
1010
exporters:
11-
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.83.0
12-
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.83.0
13-
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.83.0
11+
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.84.0
12+
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.84.0
13+
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.84.0
1414
extensions:
15-
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.83.0
16-
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.83.0
15+
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.84.0
16+
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.84.0
1717
processors:
18-
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.83.0
19-
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.83.0
18+
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.84.0
19+
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.84.0
2020
connectors:
21-
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.83.0
21+
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.84.0
2222

2323
replaces:
2424
- go.opentelemetry.io/collector => ../../

‎cmd/otelcorecol/go.mod

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ go 1.20
66

77
require (
88
github.com/stretchr/testify v1.8.4
9-
go.opentelemetry.io/collector v0.83.0
10-
go.opentelemetry.io/collector/component v0.83.0
11-
go.opentelemetry.io/collector/connector v0.83.0
12-
go.opentelemetry.io/collector/connector/forwardconnector v0.83.0
13-
go.opentelemetry.io/collector/exporter v0.83.0
14-
go.opentelemetry.io/collector/exporter/loggingexporter v0.83.0
15-
go.opentelemetry.io/collector/exporter/otlpexporter v0.83.0
16-
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.83.0
17-
go.opentelemetry.io/collector/extension v0.83.0
18-
go.opentelemetry.io/collector/extension/ballastextension v0.83.0
19-
go.opentelemetry.io/collector/extension/zpagesextension v0.83.0
20-
go.opentelemetry.io/collector/processor v0.83.0
21-
go.opentelemetry.io/collector/processor/batchprocessor v0.83.0
22-
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.83.0
23-
go.opentelemetry.io/collector/receiver v0.83.0
24-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.83.0
9+
go.opentelemetry.io/collector v0.84.0
10+
go.opentelemetry.io/collector/component v0.84.0
11+
go.opentelemetry.io/collector/connector v0.84.0
12+
go.opentelemetry.io/collector/connector/forwardconnector v0.84.0
13+
go.opentelemetry.io/collector/exporter v0.84.0
14+
go.opentelemetry.io/collector/exporter/loggingexporter v0.84.0
15+
go.opentelemetry.io/collector/exporter/otlpexporter v0.84.0
16+
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.84.0
17+
go.opentelemetry.io/collector/extension v0.84.0
18+
go.opentelemetry.io/collector/extension/ballastextension v0.84.0
19+
go.opentelemetry.io/collector/extension/zpagesextension v0.84.0
20+
go.opentelemetry.io/collector/processor v0.84.0
21+
go.opentelemetry.io/collector/processor/batchprocessor v0.84.0
22+
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.84.0
23+
go.opentelemetry.io/collector/receiver v0.84.0
24+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.84.0
2525
golang.org/x/sys v0.11.0
2626
)
2727

@@ -42,7 +42,7 @@ require (
4242
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4343
github.com/golang/protobuf v1.5.3 // indirect
4444
github.com/golang/snappy v0.0.4 // indirect
45-
github.com/google/uuid v1.3.0 // indirect
45+
github.com/google/uuid v1.3.1 // indirect
4646
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
4747
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4848
github.com/json-iterator/go v1.1.12 // indirect
@@ -74,21 +74,21 @@ require (
7474
github.com/tklauser/numcpus v0.6.0 // indirect
7575
github.com/yusufpapurcu/wmi v1.2.3 // indirect
7676
go.opencensus.io v0.24.0 // indirect
77-
go.opentelemetry.io/collector/config/configauth v0.83.0 // indirect
78-
go.opentelemetry.io/collector/config/configcompression v0.83.0 // indirect
79-
go.opentelemetry.io/collector/config/configgrpc v0.83.0 // indirect
80-
go.opentelemetry.io/collector/config/confighttp v0.83.0 // indirect
81-
go.opentelemetry.io/collector/config/confignet v0.83.0 // indirect
82-
go.opentelemetry.io/collector/config/configopaque v0.83.0 // indirect
83-
go.opentelemetry.io/collector/config/configtelemetry v0.83.0 // indirect
84-
go.opentelemetry.io/collector/config/configtls v0.83.0 // indirect
85-
go.opentelemetry.io/collector/config/internal v0.83.0 // indirect
86-
go.opentelemetry.io/collector/confmap v0.83.0 // indirect
87-
go.opentelemetry.io/collector/consumer v0.83.0 // indirect
88-
go.opentelemetry.io/collector/extension/auth v0.83.0 // indirect
77+
go.opentelemetry.io/collector/config/configauth v0.84.0 // indirect
78+
go.opentelemetry.io/collector/config/configcompression v0.84.0 // indirect
79+
go.opentelemetry.io/collector/config/configgrpc v0.84.0 // indirect
80+
go.opentelemetry.io/collector/config/confighttp v0.84.0 // indirect
81+
go.opentelemetry.io/collector/config/confignet v0.84.0 // indirect
82+
go.opentelemetry.io/collector/config/configopaque v0.84.0 // indirect
83+
go.opentelemetry.io/collector/config/configtelemetry v0.84.0 // indirect
84+
go.opentelemetry.io/collector/config/configtls v0.84.0 // indirect
85+
go.opentelemetry.io/collector/config/internal v0.84.0 // indirect
86+
go.opentelemetry.io/collector/confmap v0.84.0 // indirect
87+
go.opentelemetry.io/collector/consumer v0.84.0 // indirect
88+
go.opentelemetry.io/collector/extension/auth v0.84.0 // indirect
8989
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect
9090
go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 // indirect
91-
go.opentelemetry.io/collector/semconv v0.83.0 // indirect
91+
go.opentelemetry.io/collector/semconv v0.84.0 // indirect
9292
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 // indirect
9393
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
9494
go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect
@@ -99,6 +99,9 @@ require (
9999
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect
100100
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 // indirect
101101
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0 // indirect
102+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
103+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect
104+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 // indirect
102105
go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect
103106
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.39.0 // indirect
104107
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 // indirect
@@ -111,7 +114,7 @@ require (
111114
go.uber.org/zap v1.25.0 // indirect
112115
golang.org/x/net v0.14.0 // indirect
113116
golang.org/x/text v0.12.0 // indirect
114-
gonum.org/v1/gonum v0.13.0 // indirect
117+
gonum.org/v1/gonum v0.14.0 // indirect
115118
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
116119
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
117120
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect

0 commit comments

Comments
 (0)