fix(pdata/plog): unmarshal event_name from json #13123

IgorPidik · 2025-06-01T20:15:55Z

Description

This PR adds missing logic to process event_name field when unmarshaling LogRecords from JSON.

Testing

Added eventName to json (un)marshal tests.

Fixes #13127

codecov · 2025-06-01T21:51:57Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.26%. Comparing base (0f0e1f6) to head (042a30d).
Report is 5 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main   #13123   +/-   ##
=======================================
  Coverage   91.26%   91.26%           
=======================================
  Files         508      508           
  Lines       28747    28749    +2     
=======================================
+ Hits        26235    26237    +2     
  Misses       1994     1994           
  Partials      518      518

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

bogdandrutu · 2025-06-01T22:21:39Z

Please add a changelog entry

IgorPidik · 2025-06-02T06:30:04Z

Please add a changelog entry

Thank you for the review! I added the changelog entry.

#### Description This PR adds missing logic to process `event_name` field when unmarshaling LogRecords from JSON. #### Testing Added `eventName` to json (un)marshal tests. Fixes open-telemetry#13127

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [go.opentelemetry.io/collector/component](https://github.com/open-telemetry/opentelemetry-collector) | require | minor | `v1.31.0` -> `v1.35.0` | | [go.opentelemetry.io/collector/component/componenttest](https://github.com/open-telemetry/opentelemetry-collector) | require | minor | `v0.125.0` -> `v0.129.0` | | [go.opentelemetry.io/collector/confmap](https://github.com/open-telemetry/opentelemetry-collector) | require | minor | `v1.31.0` -> `v1.35.0` | | [go.opentelemetry.io/collector/consumer](https://github.com/open-telemetry/opentelemetry-collector) | require | minor | `v1.31.0` -> `v1.35.0` | | [go.opentelemetry.io/collector/consumer/consumertest](https://github.com/open-telemetry/opentelemetry-collector) | require | minor | `v0.125.0` -> `v0.129.0` | | [go.opentelemetry.io/collector/pdata](https://github.com/open-telemetry/opentelemetry-collector) | require | minor | `v1.31.0` -> `v1.35.0` | | [go.opentelemetry.io/collector/processor](https://github.com/open-telemetry/opentelemetry-collector) | require | minor | `v1.31.0` -> `v1.35.0` | | [go.opentelemetry.io/collector/processor/processortest](https://github.com/open-telemetry/opentelemetry-collector) | require | minor | `v0.125.0` -> `v0.129.0` | --- ### Release Notes <details> <summary>open-telemetry/opentelemetry-collector (go.opentelemetry.io/collector/component)</summary> ### [`v1.35.0`](https://github.com/open-telemetry/opentelemetry-collector/blob/HEAD/CHANGELOG.md#v1350v01290) ##### 🛑 Breaking changes 🛑 - `exporterhelper`: Remove deprecated sending_queue::blocking options, use sending_queue::block_on_overflow. ([#13211](open-telemetry/opentelemetry-collector#13211)) ##### 💡 Enhancements 💡 - `mdatagen`: Taught mdatagen to print the `go list` stderr output on failures, and to run `go list` where the metadata file is. ([#13205](open-telemetry/opentelemetry-collector#13205)) - `service`: Support setting `sampler` and `limits` under `service::telemetry::traces` ([#13201](open-telemetry/opentelemetry-collector#13201)) This allows users to enable sampling and set span limits on internal Collector traces using the OpenTelemetry SDK declarative configuration. - `pdata/pprofile`: Add new helper methods `FromLocationIndices` and `PutLocation` to read and modify the content of locations. ([#13150](open-telemetry/opentelemetry-collector#13150)) - `exporterhelper`: Preserve request span context and client information in the persistent queue. ([#11740](open-telemetry/opentelemetry-collector#11740), [#13220](open-telemetry/opentelemetry-collector#13220), [#13232](open-telemetry/opentelemetry-collector#13232)) It allows internal collector spans and client information to propagate through the persistent queue used by the exporters. The same way as it's done for the in-memory queue. Currently, it is behind the exporter.PersistRequestContext feature gate, which can be enabled by adding `--feature-gates=exporter.PersistRequestContext` to the collector command line. An exporter buffer stored by a previous version of the collector (or by a collector with the feature gate disabled) can be read by a newer collector with the feature enabled. However, the reverse is not supported: a buffer stored by a newer collector with the feature enabled cannot be read by an older collector (or by a collector with the feature gate disabled). ##### 🧰 Bug fixes 🧰 - `pdata`: Fix copying of optional fields when the source is unset. ([#13268](open-telemetry/opentelemetry-collector#13268)) - `service`: Only allocate one set of internal log sampling counters ([#13014](open-telemetry/opentelemetry-collector#13014)) The case where logs are only exported to stdout was fixed in v0.126.0; this new fix also covers the case where logs are exported through OTLP.  ### [`v1.34.0`](https://github.com/open-telemetry/opentelemetry-collector/blob/HEAD/CHANGELOG.md#v1340v01280) ##### 🛑 Breaking changes 🛑 - `service/telemetry`: Mark "telemetry.disableAddressFieldForInternalTelemetry" as stable ([#13152](open-telemetry/opentelemetry-collector#13152)) ##### 💡 Enhancements 💡 - `confighttp`: Update the HTTP server span naming to use the HTTP method and route pattern instead of the path. ([#12468](open-telemetry/opentelemetry-collector#12468)) The HTTP server span name will now be formatted as `<http.request.method> <http.route>`. If a route pattern is not available, it will fall back to `<http.request.method>`. - `service`: Use configured loggers to log errors as soon as it is available ([#13081](open-telemetry/opentelemetry-collector#13081)) - `service`: Remove stabilized featuregate useOtelWithSDKConfigurationForInternalTelemetry ([#13152](open-telemetry/opentelemetry-collector#13152)) ##### 🧰 Bug fixes 🧰 - `telemetry`: Add generated resource attributes to the printed log messages. ([#13110](open-telemetry/opentelemetry-collector#13110)) If service.name, service.version, or service.instance.id are not specified in the config, they will be generated automatically. This change ensures that these attributes are also included in the printed log messages. - `mdatagen`: Fix generation when there are no events in the metadata. ([#13123](open-telemetry/opentelemetry-collector#13123)) - `confmap`: Do not panic on assigning nil maps to non-nil maps ([#13117](open-telemetry/opentelemetry-collector#13117)) - `pdata`: Fix event_name skipped when unmarshalling LogRecord from JSON ([#13127](open-telemetry/opentelemetry-collector#13127))  ### [`v1.33.0`](https://github.com/open-telemetry/opentelemetry-collector/blob/HEAD/CHANGELOG.md#v1330v01270) ##### 🚩 Deprecations 🚩 - `semconv`: Deprecating the semconv package in favour of go.opentelemetry.io/otel/semconv ([#13012](open-telemetry/opentelemetry-collector#13012)) ##### 💡 Enhancements 💡 - `exporter/debug`: Display resource and scope in `normal` verbosity ([#10515](open-telemetry/opentelemetry-collector#10515)) - `service`: Add size metrics defined in Pipeline Component Telemetry RFC ([#13032](open-telemetry/opentelemetry-collector#13032)) See [Pipeline Component Telemetry RFC](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/component-universal-telemetry.md) for more details: - `otelcol.receiver.produced.size` - `otelcol.processor.consumed.size` - `otelcol.processor.produced.size` - `otelcol.connector.consumed.size` - `otelcol.connector.produced.size` - `otelcol.exporter.consumed.size`  ### [`v1.32.0`](https://github.com/open-telemetry/opentelemetry-collector/blob/HEAD/CHANGELOG.md#v1320v01260) ##### 🛑 Breaking changes 🛑 - `configauth`: Removes deprecated `configauth.Authentication` and `extensionauthtest.NewErrorClient` ([#12992](open-telemetry/opentelemetry-collector#12992)) The following have been removed: - `configauth.Authentication` use `configauth.Config` instead - `extensionauthtest.NewErrorClient` use `extensionauthtest.NewErr` instead ##### 💡 Enhancements 💡 - `service`: Replace `go.opentelemetry.io/collector/semconv` usage with `go.opentelemetry.io/otel/semconv` ([#12991](open-telemetry/opentelemetry-collector#12991)) - `confmap`: Update the behavior of the confmap.enableMergeAppendOption feature gate to merge only component lists. ([#12926](open-telemetry/opentelemetry-collector#12926)) - `service`: Add item count metrics defined in Pipeline Component Telemetry RFC ([#12812](open-telemetry/opentelemetry-collector#12812)) See [Pipeline Component Telemetry RFC](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/component-universal-telemetry.md) for more details: - `otelcol.receiver.produced.items` - `otelcol.processor.consumed.items` - `otelcol.processor.produced.items` - `otelcol.connector.consumed.items` - `otelcol.connector.produced.items` - `otelcol.exporter.consumed.items` - `tls`: Add trusted platform module (TPM) support to TLS authentication. ([#12801](open-telemetry/opentelemetry-collector#12801)) Now the TLS allows the use of TPM for loading private keys (e.g. in TSS2 format). ##### 🧰 Bug fixes 🧰 - `exporterhelper`: Add validation error for batch config if min_size is greater than queue_size. ([#12948](open-telemetry/opentelemetry-collector#12948)) - `telemetry`: Allocate less memory per component when OTLP exporting of logs is disabled ([#13014](open-telemetry/opentelemetry-collector#13014)) - `confmap`: Use reflect.DeepEqual to avoid panic when confmap.enableMergeAppendOption feature gate is enabled. ([#12932](open-telemetry/opentelemetry-collector#12932)) - `internal telemetry`: Add resource attributes from telemetry.resource to the logger ([#12582](open-telemetry/opentelemetry-collector#12582)) Resource attributes from telemetry.resource were not added to the internal console logs. Now, they are added to the logger as part of the "resource" field. - `confighttp and configcompression`: Fix handling of `snappy` content-encoding in a backwards-compatible way ([#10584](open-telemetry/opentelemetry-collector#10584), [#12825](open-telemetry/opentelemetry-collector#12825)) The collector used the Snappy compression type of "framed" to handle the HTTP content-encoding "snappy". However, this encoding is typically used to indicate the "block" compression variant of "snappy". This change allows the collector to: - When receiving a request with encoding 'snappy', the server endpoints will peek at the first bytes of the payload to determine if it is "framed" or "block" snappy, and will decompress accordingly. This is a backwards-compatible change. If the feature-gate "confighttp.framedSnappy" is enabled, you'll see new behavior for both client and server: - Client compression type "snappy" will now compress to the "block" variant of snappy instead of "framed". Client compression type "x-snappy-framed" will now compress to the "framed" variant of snappy. - Servers will accept both "snappy" and "x-snappy-framed" as valid content-encodings. - `tlsconfig`: Disable TPM tests on MacOS/Darwin ([#12964](open-telemetry/opentelemetry-collector#12964))  </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://gitea.t000-n.de/t.behrendt/tracebasedlogsampler/pulls/20 Reviewed-by: t.behrendt <[email protected]> Co-authored-by: Renovate Bot <[email protected]> Co-committed-by: Renovate Bot <[email protected]>

IgorPidik requested review from a team, bogdandrutu and dmitryax as code owners June 1, 2025 20:15

IgorPidik mentioned this pull request Jun 1, 2025

fix: OTLP JSON Event example body open-telemetry/opentelemetry-proto#666

Merged

bogdandrutu approved these changes Jun 1, 2025

View reviewed changes

bogdandrutu enabled auto-merge June 1, 2025 21:39

auto-merge was automatically disabled June 2, 2025 06:27
Head branch was pushed to by a user without write access

github-actions bot requested a review from bogdandrutu June 2, 2025 06:27

IgorPidik added 3 commits June 4, 2025 17:02

fix(pdata/plog): unmarshal event_name from json

d93e5bc

add changelog entry

ca4ec38

update changelog entry

042a30d

IgorPidik force-pushed the ip/fix-event-name-unmarshal-json branch from 5f69db2 to 042a30d Compare June 4, 2025 15:02

bogdandrutu enabled auto-merge June 4, 2025 16:01

bogdandrutu added this pull request to the merge queue Jun 4, 2025

Merged via the queue into open-telemetry:main with commit 8377ee7 Jun 4, 2025
55 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix(pdata/plog): unmarshal event_name from json #13123

fix(pdata/plog): unmarshal event_name from json #13123

Uh oh!

IgorPidik commented Jun 1, 2025 •

edited

Loading

Uh oh!

codecov bot commented Jun 1, 2025 •

edited

Loading

Uh oh!

bogdandrutu commented Jun 1, 2025

Uh oh!

IgorPidik commented Jun 2, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

fix(pdata/plog): unmarshal event_name from json #13123

fix(pdata/plog): unmarshal event_name from json #13123

Uh oh!

Conversation

IgorPidik commented Jun 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing

Uh oh!

codecov bot commented Jun 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

bogdandrutu commented Jun 1, 2025

Uh oh!

IgorPidik commented Jun 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

IgorPidik commented Jun 1, 2025 •

edited

Loading

codecov bot commented Jun 1, 2025 •

edited

Loading

IgorPidik commented Jun 2, 2025 •

edited

Loading