-
Notifications
You must be signed in to change notification settings - Fork 790
Add SDK.Resource() to otelconf/v0.3.0 #8660
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
ca9498f
Add SDK.Resource() to otelconf/v0.3.0
iblancasa 1b67b28
Merge branch 'main' of github.com:open-telemetry/opentelemetry-go-con…
iblancasa a937d5f
Fix changelog
iblancasa 5101343
Merge branch 'main' of github.com:open-telemetry/opentelemetry-go-con…
iblancasa e0c5966
Ensure field is not mutable
iblancasa 21293fe
Update CHANGELOG.md
dmathieu 46c34e8
Address changes from code review
iblancasa a57dc33
Merge branch '8659' of github.com:iblancasa/opentelemetry-go-contrib …
iblancasa a4dd1f4
Merge branch 'main' of github.com:open-telemetry/opentelemetry-go-con…
iblancasa 958e8d4
Merge branch 'main' into 8659
iblancasa 0f36d7d
Merge branch 'main' into 8659
dmathieu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package otelconf | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "go.opentelemetry.io/otel/attribute" | ||
| sdkresource "go.opentelemetry.io/otel/sdk/resource" | ||
| ) | ||
|
|
||
| func TestSDKResource(t *testing.T) { | ||
| t.Run("returns nil for zero value sdk", func(t *testing.T) { | ||
| var sdk SDK | ||
| assert.Nil(t, sdk.Resource()) | ||
| }) | ||
|
|
||
| t.Run("returns resource even when providers are not configured", func(t *testing.T) { | ||
| sdk, err := NewSDK( | ||
| WithOpenTelemetryConfiguration(OpenTelemetryConfiguration{ | ||
| Resource: &Resource{ | ||
| Attributes: []AttributeNameValue{ | ||
| {Name: "service.name", Value: "collector"}, | ||
| }, | ||
| }, | ||
| }), | ||
| ) | ||
| assert.NoError(t, err) | ||
|
|
||
| res := sdk.Resource() | ||
| assert.NotNil(t, res) | ||
| assert.Contains(t, res.Attributes(), attribute.String("service.name", "collector")) | ||
| }) | ||
|
|
||
| t.Run("returns empty resource for disabled sdk", func(t *testing.T) { | ||
| sdk, err := NewSDK( | ||
| WithOpenTelemetryConfiguration(OpenTelemetryConfiguration{ | ||
| Disabled: ptr(true), | ||
| }), | ||
| ) | ||
| assert.NoError(t, err) | ||
| assert.NotNil(t, sdk.Resource()) | ||
| assert.Empty(t, sdk.Resource().Attributes()) | ||
| }) | ||
|
|
||
| t.Run("returns a defensive copy", func(t *testing.T) { | ||
| sdk, err := NewSDK( | ||
| WithOpenTelemetryConfiguration(OpenTelemetryConfiguration{ | ||
| Resource: &Resource{ | ||
| Attributes: []AttributeNameValue{ | ||
| {Name: "service.name", Value: "collector"}, | ||
| }, | ||
| }, | ||
| }), | ||
| ) | ||
| assert.NoError(t, err) | ||
|
|
||
| res := sdk.Resource() | ||
| assert.NotNil(t, res) | ||
|
|
||
| newRes := sdkresource.NewSchemaless(attribute.String("service.name", "mutated")) | ||
| *res = *newRes | ||
|
|
||
| assert.Contains(t, res.Attributes(), attribute.String("service.name", "mutated")) | ||
| assert.Contains(t, sdk.Resource().Attributes(), attribute.String("service.name", "collector")) | ||
| assert.NotContains(t, sdk.Resource().Attributes(), attribute.String("service.name", "mutated")) | ||
| }) | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.