-
Notifications
You must be signed in to change notification settings - Fork 857
[api-logs] Add internal artifacts for OTel spec log bridge API #4422
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 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
1f1edb2
Added internal artifacts for OTel spec log bridge api.
CodeBlanch 7ad9a39
CHANGELOG patch.
CodeBlanch 5cd13b8
Support clearing of LogRecordAttributeList.
CodeBlanch 6fe5185
Merge branch 'main' into log-api
CodeBlanch 10ea13a
Remove CHANGELOG entry.
CodeBlanch 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| // <copyright file="InstrumentationScope.cs" company="OpenTelemetry Authors"> | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // </copyright> | ||
|
|
||
| #nullable enable | ||
|
|
||
| namespace OpenTelemetry; | ||
|
|
||
| /// <summary> | ||
| /// Contains details about the library emitting telemetry. | ||
| /// </summary> | ||
| internal sealed class InstrumentationScope | ||
| { | ||
| /// <summary> | ||
| /// Initializes a new instance of the <see cref="InstrumentationScope"/> class. | ||
| /// </summary> | ||
| public InstrumentationScope() | ||
| : this(name: null) | ||
| { | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Initializes a new instance of the <see cref="InstrumentationScope"/> class. | ||
| /// </summary> | ||
| /// <param name="name">Optional name identifying the instrumentation library.</param> | ||
| public InstrumentationScope(string? name) | ||
| { | ||
| this.Name = string.IsNullOrWhiteSpace(name) | ||
| ? string.Empty | ||
| : name!; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Gets the name identifying the instrumentation library. | ||
| /// </summary> | ||
| public string Name { get; } | ||
|
|
||
| /// <summary> | ||
| /// Gets the version of the instrumentation library. | ||
| /// </summary> | ||
| public string? Version { get; init; } | ||
|
|
||
| /// <summary> | ||
| /// Gets the schema url of the instrumentation library. | ||
| /// </summary> | ||
| public string? SchemaUrl { get; init; } | ||
|
|
||
| /// <summary> | ||
| /// Gets the attributes which should be associated with log records created | ||
| /// by the instrumentation library. | ||
| /// </summary> | ||
| public IReadOnlyDictionary<string, object>? Attributes { get; init; } | ||
| } |
File renamed without changes.
36 changes: 36 additions & 0 deletions
36
src/OpenTelemetry.Api/Logs/IDeferredLoggerProviderBuilder.cs
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,36 @@ | ||
| // <copyright file="IDeferredLoggerProviderBuilder.cs" company="OpenTelemetry Authors"> | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // </copyright> | ||
|
|
||
| #nullable enable | ||
|
|
||
| namespace OpenTelemetry.Logs; | ||
|
|
||
| /// <summary> | ||
| /// Describes a logger provider builder that supports deferred | ||
| /// initialization using an <see cref="IServiceProvider"/> to perform | ||
| /// dependency injection. | ||
| /// </summary> | ||
| internal interface IDeferredLoggerProviderBuilder | ||
| { | ||
| /// <summary> | ||
| /// Register a callback action to configure the <see | ||
| /// cref="LoggerProviderBuilder"/> once the application <see | ||
| /// cref="IServiceProvider"/> is available. | ||
| /// </summary> | ||
| /// <param name="configure">Configuration callback.</param> | ||
| /// <returns>The supplied <see cref="LoggerProviderBuilder"/> for chaining.</returns> | ||
| LoggerProviderBuilder Configure(Action<IServiceProvider, LoggerProviderBuilder> configure); | ||
| } |
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.