Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

autoexport: OTLP exporter defaults to http/protobuf protocol instead of grpc #4100

Merged
merged 6 commits into from
Jul 27, 2023
Merged

autoexport: OTLP exporter defaults to http/protobuf protocol instead of grpc #4100

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4229702
autoexport: OTEL_EXPORTER_OTLP_PROTOCOL defaults to http/protobuf
pellared Jul 26, 2023
9182dc3
Update changelog
pellared Jul 26, 2023
f949102
Fix
pellared Jul 26, 2023
76780c6
Update CHANGELOG.md
pellared Jul 26, 2023
11302f7
Merge branch 'main' into autoexport-default-to-otlp-http
pellared Jul 27, 2023
8a1cf4e
Add tests
pellared Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

- Add `NewMiddleware` function in `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp`. (#2964)
- Add the new `go.opentelemetry.io/contrib/instrgen` package to provide auto-generated source code instrumentation. (#3068, #3108)
- The `go.opentelemetry.io/contrib/exporters/autoexport` package to provide configuration of trace exporters with useful defaults and envar support. (#2753)
- The `go.opentelemetry.io/contrib/exporters/autoexport` package to provide configuration of trace exporters with useful defaults and envar support. (#2753, #4100)

### Fixed

Expand Down
4 changes: 2 additions & 2 deletions exporters/autoexport/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ func NewSpanExporter(ctx context.Context, opts ...Option) (trace.SpanExporter, e
// environment variable.
// nil is returned if no exporter is defined for the environment variable.
func makeExporterFromEnv(ctx context.Context) (trace.SpanExporter, error) {
expType, defined := os.LookupEnv(otelTracesExportersEnvKey)
if !defined {
expType := os.Getenv(otelTracesExportersEnvKey)
if expType == "" {
return nil, nil
}
return spanExporter(ctx, expType)
Expand Down
7 changes: 4 additions & 3 deletions exporters/autoexport/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,11 @@ func spanExporter(ctx context.Context, name string) (trace.SpanExporter, error)

// buildOTLPExporter creates an OTLP exporter using the environment variable
// OTEL_EXPORTER_OTLP_PROTOCOL to determine the exporter protocol.
// Defaults to http/protobuf protocol.
func buildOTLPExporter(ctx context.Context) (trace.SpanExporter, error) {
proto := "grpc"
if protoStr, ok := os.LookupEnv(otelExporterOTLPProtoEnvKey); ok {
proto = protoStr
proto := os.Getenv(otelExporterOTLPProtoEnvKey)
if proto == "" {
proto = "http/protobuf"
}

switch proto {
Expand Down