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.

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

Migrate filelog operators to follow opentelemetry-log-collection v0.29.0 changes #436

Merged
merged 9 commits into from
Apr 28, 2022
Merged

Migrate filelog operators to follow opentelemetry-log-collection v0.29.0 changes #436

merged 9 commits into from
Apr 28, 2022

Conversation

hvaghani221
Copy link
Contributor

I have followed the upgrading guideline of opentelemetry-log-collection (https://github.com/open-telemetry/opentelemetry-log-collection/releases/tag/v0.29.0 ) to migrate to the new field syntax.
I have

  • Changed $$/$$.body, $$resources, $$attributes to body, resources, attributes accordingly
  • Updated regex_parser and json_parser accordingly
  • Renamed file.* fields to log.file.*

@hvaghani221 hvaghani221 requested review from a team as code owners April 21, 2022 11:31
@hvaghani221 hvaghani221 changed the title removed $$ from all field migrate filelog operators to follow v0.29.0 changes Apr 21, 2022
@jvoravong
Copy link
Contributor

Did some dog food testing with these changes, functionality looked good.

We will probably want to wait to merge this PR until Splunk Otel Collector v.049.0 is available.

@jvoravong
Copy link
Contributor

Please also add an entry for this PR to CHANGELOG.md.

@hvaghani221 hvaghani221 changed the title migrate filelog operators to follow v0.29.0 changes Migrate filelog operators to follow v0.29.0 changes Apr 22, 2022
attributes, or resource. Also they have updated/removed some of the operators.
If you are using `extraFileLogs` or `logsCollection.containers.extraOperators` config,
see [Upgrading Guideline](https://github.com/open-telemetry/opentelemetry-log-collection/blob/v0.29.0/CHANGELOG.md#upgrading-to-v0290)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A lot of this looks good, I'd suggest making these updates. We should also update the title of this PR to match this (include opentelemetry-log-collection v0.29.0).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Today my team merged in the code for the splunk-otel-collector v0.49.0 release. Let's try to update this, I'll approve it, and I'll merge it.

@hvaghani221 hvaghani221 changed the title Migrate filelog operators to follow v0.29.0 changes Migrate filelog operators to follow opentelemetry-log-collection v0.29.0 changes Apr 28, 2022
CHANGELOG.md Outdated
@@ -4,6 +4,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## Unreleased

### Changed

- Migrate filelog operators to follow opentelemetry-log-collection v0.29.0 changes ([Migrate filelog operators to follow v0.29.0 changes #436](https://github.com/signalfx/splunk-otel-collector-chart/pull/436))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit to avoid repeat

Suggested change
- Migrate filelog operators to follow opentelemetry-log-collection v0.29.0 changes ([Migrate filelog operators to follow v0.29.0 changes #436](https://github.com/signalfx/splunk-otel-collector-chart/pull/436))
- Migrate filelog operators to follow opentelemetry-log-collection v0.29.0 changes ([#436](https://github.com/signalfx/splunk-otel-collector-chart/pull/436))

### Changed

- Migrate filelog operators to follow opentelemetry-log-collection v0.29.0 changes ([Migrate filelog operators to follow v0.29.0 changes #436](https://github.com/signalfx/splunk-otel-collector-chart/pull/436))
- [BREAKING CHANGE] Several breaking changes were made that affect the
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may be a good time to add an unreleased section to https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md so we can associate some updated examples with these changes.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To move forward, I'd like to merge this PR the way it is. I'll open up a new PR today for updating UPGRADING.md.

Copy link
Contributor

@jvoravong jvoravong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We know the the functional test will not pass until we upgrade the Splunk Otel Collector to version v0.49.0 as part of the release process.

Everything else LGTM.

@jvoravong jvoravong merged commit 60ba465 into signalfx:main Apr 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants