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

fix: pass ai metadata to telemetry during cni image build #3095

Merged
merged 7 commits into from
Nov 5, 2024

Conversation

QxBytes
Copy link
Contributor

@QxBytes QxBytes commented Oct 30, 2024

Updates the cni dockerfile to take in arguments for the ai metadata, similar to the cns dockerfile.

Reason for Change:

The ai instrumentation key previously was not passed when building the azure vnet telemetry binary when making a cni image. The instrumentation key was passed when making the binary with the make file command, however.

Also fixed an error message not logging which hid the above error.

Issue Fixed:

See above

Requirements:

Notes:
Tested on podsubnet cluster. No logs were found to be uploaded, and noticed telemetry logs showed an ai handle creation error. However, after applying the cni image with the fix using the cni installer, we started to receive logs. The telemetry logs also no longer produced the error message.

@QxBytes QxBytes self-assigned this Oct 30, 2024
@QxBytes QxBytes added cni Related to CNI. fix Fixes something. ci Infra or tooling. telemetry logging labels Oct 30, 2024
@QxBytes QxBytes marked this pull request as ready for review October 30, 2024 20:30
@QxBytes QxBytes requested review from a team as code owners October 30, 2024 20:30
@QxBytes QxBytes requested a review from vipul-21 October 30, 2024 20:30
@QxBytes QxBytes added the needs-backport Change needs to be backported to previous release trains label Oct 30, 2024
cni/telemetry/service/telemetrymain.go Outdated Show resolved Hide resolved
cni/Dockerfile Show resolved Hide resolved
@QxBytes QxBytes requested a review from a team as a code owner October 31, 2024 17:00
@QxBytes QxBytes requested a review from rbtr November 1, 2024 18:20
rbtr
rbtr previously approved these changes Nov 1, 2024
Copy link
Contributor

@rbtr rbtr left a comment

Choose a reason for hiding this comment

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

oops, thanks for fixing

cns/service/main.go Outdated Show resolved Hide resolved
@QxBytes
Copy link
Contributor Author

QxBytes commented Nov 4, 2024

/azp run Azure Container Networking PR

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@QxBytes QxBytes added this pull request to the merge queue Nov 4, 2024
Merged via the queue into master with commit 7f0339a Nov 5, 2024
14 checks passed
@QxBytes QxBytes deleted the alew/log-telemetry-error branch November 5, 2024 03:04
QxBytes added a commit that referenced this pull request Nov 7, 2024
* fix log on ai telemetry handle create error

* fix failure to pass cni ai id at build time for cni images

* address feedback

* move ai id to hardcoded variable

* update unit test

* Revert "move ai id to hardcoded variable"

This reverts commit 666c2b0.

* fix typo
QxBytes added a commit that referenced this pull request Nov 8, 2024
* fix log on ai telemetry handle create error

* fix failure to pass cni ai id at build time for cni images

* address feedback

* move ai id to hardcoded variable

* update unit test

* Revert "move ai id to hardcoded variable"

This reverts commit 666c2b0.

* fix typo
github-merge-queue bot pushed a commit that referenced this pull request Nov 14, 2024
…3095) (#3132)

* fix: pass ai metadata to telemetry during cni image build (#3095)

* fix log on ai telemetry handle create error

* fix failure to pass cni ai id at build time for cni images

* address feedback

* move ai id to hardcoded variable

* update unit test

* Revert "move ai id to hardcoded variable"

This reverts commit 666c2b0.

* fix typo

* add cni ai info to cni image args and linux dockerfile
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci Infra or tooling. cni Related to CNI. fix Fixes something. logging needs-backport Change needs to be backported to previous release trains telemetry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants