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

Embed noop into sdk instead of embedded #1230

Merged
merged 4 commits into from
Oct 30, 2024
Merged

Embed noop into sdk instead of embedded #1230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbc3e10
Embed noop into sdk instead of embedded
MrAlias Oct 29, 2024
5270016
Add a changelog entry
MrAlias Oct 29, 2024
b259274
Merge branch 'main' into sdk-noop
MrAlias Oct 29, 2024
7372692
Merge branch 'main' into sdk-noop
MrAlias Oct 30, 2024
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ OpenTelemetry Go Automatic Instrumentation adheres to [Semantic Versioning](http

### Changed

- The SDK provided in `go.opentelemtry.io/auto/sdk` now defaults to NoOp behavior for unimplemented methods of the OpenTelemetry API.
This is changed from causing a compilation error for unimplemented methods. ([#1230](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/1230))
- The `GetTracerProvider` fucntion in `go.opentelemtry.io/auto/sdk` is renamed to `TracerProvider`. ([#1231](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/1231))

### Fixed
Expand Down
8 changes: 4 additions & 4 deletions sdk/trace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"go.opentelemetry.io/otel/codes"
semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
"go.opentelemetry.io/otel/trace"
"go.opentelemetry.io/otel/trace/embedded"
"go.opentelemetry.io/otel/trace/noop"

"go.opentelemetry.io/auto/sdk/telemetry"
)
Expand All @@ -31,7 +31,7 @@ func TracerProvider() trace.TracerProvider { return tracerProviderInstance }

var tracerProviderInstance = tracerProvider{}

type tracerProvider struct{ embedded.TracerProvider }
type tracerProvider struct{ noop.TracerProvider }

var _ trace.TracerProvider = tracerProvider{}

Expand All @@ -45,7 +45,7 @@ func (p tracerProvider) Tracer(name string, opts ...trace.TracerOption) trace.Tr
}

type tracer struct {
embedded.Tracer
noop.Tracer

name, schemaURL, version string
}
Expand Down Expand Up @@ -140,7 +140,7 @@ func spanKind(kind trace.SpanKind) telemetry.SpanKind {
}

type span struct {
embedded.Span
noop.Span

sampled bool
spanContext trace.SpanContext
Expand Down
Loading