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

Update core version during build #1379

Merged
merged 2 commits into from
Mar 21, 2022
Merged

Update core version during build #1379

merged 2 commits into from
Mar 21, 2022

Conversation

emaderer
Copy link
Contributor

During build we need to also update the core version file, otherwise, the internal metrics show "latest" instead of the real version.

During build we need to also update the core version file, otherwise, the internal metrics show "latest" instead of the real version.
@emaderer emaderer requested review from a team as code owners March 21, 2022 18:24
Makefile Outdated Show resolved Hide resolved
@dmitryax dmitryax self-requested a review March 21, 2022 18:34
@dmitryax
Copy link
Contributor

Approved by accident. Not sure this solution will solve the problem

Makefile Outdated
@@ -37,10 +37,12 @@ LINT=golangci-lint
MISSPELL=misspell -error
MISSPELL_CORRECTION=misspell -w

BUILD_INFO_IMPORT_PATH=github.com/signalfx/splunk-otel-collector/internal/version
BUILD_INFO_IMPORT_PATH=go.opentelemetry.io/collector/internal/version
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we keep github.com/signalfx/splunk-otel-collector/internal/version, otherwise how will the version get set for https://github.com/signalfx/splunk-otel-collector/blob/main/cmd/otelcol/main.go#L83?

Copy link
Contributor

Choose a reason for hiding this comment

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

Right. I think it should be

BUILD_INFO_IMPORT_PATH=github.com/signalfx/splunk-otel-collector/internal/version
BUILD_INFO_IMPORT_PATH_CORE=go.opentelemetry.io/collector/internal/version

I didn't notice that it was replacement for splunk distro. Now it makes sense why it didn't work before

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right. I think it should be

BUILD_INFO_IMPORT_PATH=github.com/signalfx/splunk-otel-collector/internal/version
BUILD_INFO_IMPORT_PATH_CORE=go.opentelemetry.io/collector/internal/version

I didn't notice that it was replacement for splunk distro. Now it makes sense why it didn't work before

Sorry, my bad, it was actually pointing to the version in our distro when I tested it but for the PR somehow I replaced that line, thanks for catching that!

@emaderer emaderer merged commit ba22ba3 into main Mar 21, 2022
@delete-merged-branch delete-merged-branch bot deleted the update-core-version branch March 21, 2022 20:31
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.

3 participants