Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .chloggen/codeboten_otlp_grpc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: deprecation

# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
component: exporter/otlp_grpc

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Rename `otlp` exporter to `otlp_grpc` exporter and add deprecated alias `otlp`.

# One or more tracking issues or pull requests related to the change
issues: [14403]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
2 changes: 1 addition & 1 deletion .chloggen/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ components:
- docs/rfcs
- exporter/debug
- exporter/nop
- exporter/otlp
- exporter/otlp_grpc
- exporter/otlp_http
- extension/memory_limiter
- extension/xextension
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ body:
- exporter/exporterhelper/internal/queuebatch
- exporter/exporterhelper/xexporterhelper
- exporter/nop
- exporter/otlp
- exporter/otlp_grpc
- exporter/otlp_http
- exporter/x
- extension/memorylimiter
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/other.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ body:
- exporter/exporterhelper/internal/queuebatch
- exporter/exporterhelper/xexporterhelper
- exporter/nop
- exporter/otlp
- exporter/otlp_grpc
- exporter/otlp_http
- exporter/x
- extension/memorylimiter
Expand Down
2 changes: 1 addition & 1 deletion config/configgrpc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Example:

```yaml
exporters:
otlp:
otlp_grpc:
endpoint: otelcol2:55690
auth:
authenticator: some-authenticator-extension
Expand Down
4 changes: 2 additions & 2 deletions config/configtls/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Example:

```yaml
exporters:
otlp:
otlp_grpc:
endpoint: myserver.local:55690
tls:
insecure: false
Expand Down Expand Up @@ -174,7 +174,7 @@ Example:

```yaml
exporters:
otlp:
otlp_grpc:
endpoint: myserver.local:55690
tls:
ca_file: ca.crt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ receivers:

exporters:
nop:
otlp:
otlp_grpc:
endpoint: localhost:4317

service:
Expand Down
2 changes: 1 addition & 1 deletion confmap/internal/e2e/types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ func TestIndirectSliceEnvVar(t *testing.T) {
Exporters struct {
OTLP struct {
Endpoint string `mapstructure:"endpoint"`
} `mapstructure:"otlp"`
} `mapstructure:"otlp_grpc"`
Nop struct{} `mapstructure:"nop"`
} `mapstructure:"exporters"`
Receivers struct {
Expand Down
10 changes: 5 additions & 5 deletions confmap/provider/envprovider/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const validYAML = `
processors:
testprocessor:
exporters:
otlp:
otlp_grpc:
endpoint: "localhost:4317"
`

Expand Down Expand Up @@ -68,8 +68,8 @@ func TestEnv(t *testing.T) {
retMap, err := ret.AsConf()
require.NoError(t, err)
expectedMap := confmap.NewFromStringMap(map[string]any{
"processors::testprocessor": nil,
"exporters::otlp::endpoint": "localhost:4317",
"processors::testprocessor": nil,
"exporters::otlp_grpc::endpoint": "localhost:4317",
})
assert.Equal(t, expectedMap.ToStringMap(), retMap.ToStringMap())

Expand All @@ -88,8 +88,8 @@ func TestEnvWithLogger(t *testing.T) {
retMap, err := ret.AsConf()
require.NoError(t, err)
expectedMap := confmap.NewFromStringMap(map[string]any{
"processors::testprocessor": nil,
"exporters::otlp::endpoint": "localhost:4317",
"processors::testprocessor": nil,
"exporters::otlp_grpc::endpoint": "localhost:4317",
})
assert.Equal(t, expectedMap.ToStringMap(), retMap.ToStringMap())

Expand Down
8 changes: 4 additions & 4 deletions confmap/provider/fileprovider/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ func TestRelativePath(t *testing.T) {
retMap, err := ret.AsConf()
require.NoError(t, err)
expectedMap := confmap.NewFromStringMap(map[string]any{
"processors::testprocessor": nil,
"exporters::otlp::endpoint": "localhost:4317",
"processors::testprocessor": nil,
"exporters::otlp_grpc::endpoint": "localhost:4317",
})
assert.Equal(t, expectedMap, retMap)
assert.NoError(t, fp.Shutdown(context.Background()))
Expand All @@ -83,8 +83,8 @@ func TestAbsolutePath(t *testing.T) {
retMap, err := ret.AsConf()
require.NoError(t, err)
expectedMap := confmap.NewFromStringMap(map[string]any{
"processors::testprocessor": nil,
"exporters::otlp::endpoint": "localhost:4317",
"processors::testprocessor": nil,
"exporters::otlp_grpc::endpoint": "localhost:4317",
})
assert.Equal(t, expectedMap, retMap)
assert.NoError(t, fp.Shutdown(context.Background()))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
processors:
testprocessor:
exporters:
otlp:
otlp_grpc:
endpoint: "localhost:4317"
2 changes: 1 addition & 1 deletion docs/rfcs/processing.md
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ receivers:
otlp:

exporters:
otlp:
otlp_grpc:

processors:
transform:
Expand Down
4 changes: 2 additions & 2 deletions examples/k8s/otel-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ data:
http:
endpoint: ${env:MY_POD_IP}:4318
exporters:
otlp:
otlp_grpc:
endpoint: "otel-collector.default:4317"
tls:
insecure: true
Expand Down Expand Up @@ -122,7 +122,7 @@ data:
extensions:
zpages: {}
exporters:
otlp:
otlp_grpc:
endpoint: "http://someotlp.target.com:4317" # Replace with a real endpoint.
tls:
insecure: true
Expand Down
2 changes: 1 addition & 1 deletion exporter/exporterhelper/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ receivers:
protocols:
grpc:
exporters:
otlp:
otlp_grpc:
endpoint: <ENDPOINT>
sending_queue:
storage: file_storage/otc
Expand Down
4 changes: 2 additions & 2 deletions exporter/otlpexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Example:

```yaml
exporters:
otlp:
otlp_grpc:
endpoint: otelcol2:4317
tls:
cert_file: file.cert
Expand All @@ -52,7 +52,7 @@ By default, `gzip` compression is enabled. See [compression comparison](../../co

```yaml
exporters:
otlp:
otlp_grpc:
...
compression: none
```
Expand Down
1 change: 1 addition & 0 deletions exporter/otlpexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ func NewFactory() exporter.Factory {
return xexporter.NewFactory(
metadata.Type,
createDefaultConfig,
xexporter.WithDeprecatedTypeAlias(component.MustNewType("otlp")),
xexporter.WithTraces(createTraces, metadata.TracesStability),
xexporter.WithMetrics(createMetrics, metadata.MetricsStability),
xexporter.WithLogs(createLogs, metadata.LogsStability),
Expand Down
2 changes: 1 addition & 1 deletion exporter/otlpexporter/generated_component_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporter/otlpexporter/metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: otlp
type: otlp_grpc
github_project: open-telemetry/opentelemetry-collector

status:
Expand Down
2 changes: 1 addition & 1 deletion reports/distributions/contrib.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ components:
exporter:
- debug
- nop
- otlp
- otlp_grpc
- otlp_http
extension:
- zpages
Expand Down
2 changes: 1 addition & 1 deletion reports/distributions/core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ components:
exporter:
- debug
- nop
- otlp
- otlp_grpc
- otlp_http
extension:
- zpages
Expand Down
2 changes: 1 addition & 1 deletion reports/distributions/k8s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ components:
exporter:
- debug
- nop
- otlp
- otlp_grpc
- otlp_http
extension:
- zpages
Expand Down
2 changes: 1 addition & 1 deletion reports/distributions/otlp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ url: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/mai
maintainers: []
components:
exporter:
- otlp
- otlp_grpc
- otlp_http
receiver:
- otlp
Loading