Skip to content

[pull] main from open-telemetry:main #373

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

Merged
merged 2 commits into from
Apr 22, 2025
Merged

[pull] main from open-telemetry:main #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acd4a0e
Fix the documention comments (#3371)
zurex Apr 21, 2025
674cc9e
[CI] fix artifacts download/upload (#3369)
esigo Apr 21, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
mv api-benchmark_result.json benchmarks
mv sdk-benchmark_result.json benchmarks
mv exporters-benchmark_result.json benchmarks
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
- uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47 # main March 2025
with:
name: benchmark_results
path: benchmarks
Expand All @@ -48,7 +48,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/download-artifact@2a5974104b6d5dbdb2f9468a3e54da3bdd241578 # v4.2.1
- uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # main March 2025
with:
name: benchmark_results
path: benchmarks
Expand Down
18 changes: 9 additions & 9 deletions api/include/opentelemetry/logs/logger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ class Logger
/**
* Emit a Log Record object
*
* @param log_record
* @param log_record Log record
*/
virtual void EmitLogRecord(nostd::unique_ptr<LogRecord> &&log_record) noexcept = 0;

/**
* Emit a Log Record object with arguments
*
* @param log_record Log record
* @tparam args Arguments which can be used to set data of log record by type.
* @param args Arguments which can be used to set data of log record by type.
* Severity -> severity, severity_text
* string_view -> body
* AttributeValue -> body
Expand Down Expand Up @@ -96,7 +96,7 @@ class Logger
/**
* Emit a Log Record object with arguments
*
* @tparam args Arguments which can be used to set data of log record by type.
* @param args Arguments which can be used to set data of log record by type.
* Severity -> severity, severity_text
* string_view -> body
* AttributeValue -> body
Expand All @@ -120,7 +120,7 @@ class Logger

/**
* Writes a log with a severity of trace.
* @tparam args Arguments which can be used to set data of log record by type.
* @param args Arguments which can be used to set data of log record by type.
* string_view -> body
* AttributeValue -> body
* SpanContext -> span_id,trace_id and trace_flags
Expand All @@ -144,7 +144,7 @@ class Logger

/**
* Writes a log with a severity of debug.
* @tparam args Arguments which can be used to set data of log record by type.
* @param args Arguments which can be used to set data of log record by type.
* string_view -> body
* AttributeValue -> body
* SpanContext -> span_id,trace_id and trace_flags
Expand All @@ -168,7 +168,7 @@ class Logger

/**
* Writes a log with a severity of info.
* @tparam args Arguments which can be used to set data of log record by type.
* @param args Arguments which can be used to set data of log record by type.
* string_view -> body
* AttributeValue -> body
* SpanContext -> span_id,trace_id and trace_flags
Expand All @@ -192,7 +192,7 @@ class Logger

/**
* Writes a log with a severity of warn.
* @tparam args Arguments which can be used to set data of log record by type.
* @param args Arguments which can be used to set data of log record by type.
* string_view -> body
* AttributeValue -> body
* SpanContext -> span_id,trace_id and trace_flags
Expand All @@ -216,7 +216,7 @@ class Logger

/**
* Writes a log with a severity of error.
* @tparam args Arguments which can be used to set data of log record by type.
* @param args Arguments which can be used to set data of log record by type.
* string_view -> body
* AttributeValue -> body
* SpanContext -> span_id,trace_id and trace_flags
Expand All @@ -240,7 +240,7 @@ class Logger

/**
* Writes a log with a severity of fatal.
* @tparam args Arguments which can be used to set data of log record by type.
* @param args Arguments which can be used to set data of log record by type.
* string_view -> body
* AttributeValue -> body
* SpanContext -> span_id,trace_id and trace_flags
Expand Down
Loading