Skip to content

[Feature]: Upgrade to OTEL Collector 1.37 #7400

Merged
yurishkuro merged 3 commits into
jaegertracing:mainfrom
wololowarrior:fix-ci-failing-due-to-configgrpc-version-upgrade
Jul 30, 2025
Merged

[Feature]: Upgrade to OTEL Collector 1.37 #7400
yurishkuro merged 3 commits into
jaegertracing:mainfrom
wololowarrior:fix-ci-failing-due-to-configgrpc-version-upgrade

Conversation

@wololowarrior
Copy link
Copy Markdown
Contributor

@wololowarrior wololowarrior commented Jul 30, 2025

Fixes #7398

Description of the changes

  • This pr resolves build issues in Update All OTEL Collector packages - autoclosed #7397
  • Mainly changes due to how some parameters were passed were changed due to version upgrade
  • Some changes in tests as well.
  • i ran REGENERATE_SNAPSHOTS=true make test to update snapshots

How was this change tested?

  • REGENERATE_SNAPSHOTS=true make test

Checklist

@wololowarrior wololowarrior requested a review from a team as a code owner July 30, 2025 09:02
@dosubot dosubot Bot added the go label Jul 30, 2025
Signed-off-by: Harshil Gupta <harshilgupta1808@gmail.com>
Signed-off-by: Harshil Gupta <harshilgupta1808@gmail.com>
@wololowarrior wololowarrior force-pushed the fix-ci-failing-due-to-configgrpc-version-upgrade branch from c1c8286 to 139d50a Compare July 30, 2025 09:09
@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 30, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 96.44%. Comparing base (c3bc9e3) to head (ee43963).
⚠️ Report is 2 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #7400   +/-   ##
=======================================
  Coverage   96.44%   96.44%           
=======================================
  Files         375      375           
  Lines       22951    22951           
=======================================
  Hits        22135    22135           
  Misses        617      617           
  Partials      199      199           
Flag Coverage Δ
badger_v1 9.06% <ø> (ø)
badger_v2 1.71% <ø> (ø)
cassandra-4.x-v1-manual 11.77% <ø> (ø)
cassandra-4.x-v2-auto 1.70% <ø> (ø)
cassandra-4.x-v2-manual 1.70% <ø> (ø)
cassandra-5.x-v1-manual 11.77% <ø> (ø)
cassandra-5.x-v2-auto 1.70% <ø> (ø)
cassandra-5.x-v2-manual 1.70% <ø> (ø)
elasticsearch-6.x-v1 16.72% <ø> (ø)
elasticsearch-7.x-v1 16.76% <ø> (ø)
elasticsearch-8.x-v1 16.90% <ø> (ø)
elasticsearch-8.x-v2 1.71% <ø> (ø)
elasticsearch-9.x-v2 1.71% <ø> (ø)
grpc_v1 10.29% <ø> (ø)
grpc_v2 1.71% <ø> (ø)
kafka-3.x-v1 9.22% <ø> (ø)
kafka-3.x-v2 1.71% <ø> (ø)
memory_v2 1.71% <ø> (ø)
opensearch-1.x-v1 16.81% <ø> (ø)
opensearch-2.x-v1 16.81% <ø> (ø)
opensearch-2.x-v2 1.71% <ø> (ø)
opensearch-3.x-v2 1.71% <ø> (ø)
query 1.71% <ø> (ø)
tailsampling-processor 0.47% <ø> (ø)
unittests 95.42% <100.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ 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.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Signed-off-by: Harshil Gupta <harshilgupta1808@gmail.com>
@wololowarrior wololowarrior force-pushed the fix-ci-failing-due-to-configgrpc-version-upgrade branch from 5a31590 to ee43963 Compare July 30, 2025 09:45
{
"kind": 2,
"name": "foobar",
"parentSpanId": "",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Unexpected, what is changed upstream to cause this?

Copy link
Copy Markdown
Contributor Author

@wololowarrior wololowarrior Jul 30, 2025

Choose a reason for hiding this comment

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

Yeah, it made me curious as well. Though I'm not versed with opentelemetry-collector repo, using claude I was probably able to identify the root cause. Lemme know if it makes sense:

  • This adds a marshal template which omits the field if its equal to the default.
    Resovles to:
if ms.orig.ParentSpanId != data.SpanID([8]byte{}) {
    dest.WriteObjectField("parentSpanId")
    ms.orig.ParentSpanId.MarshalJSONStream(dest)
}
  • ParentSpanId is not being set in the test thus it gets the default value of SpanID, i.e. data.SpanID([8]byte{})

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

cool, thanks for finding the reference (open-telemetry/opentelemetry-collector#13450). It's not a deal-breaker change, but I commented on that PR because they were saying "no changes to marshaling".

@yurishkuro yurishkuro added the dependencies Pull requests that update a dependency file label Jul 30, 2025
@yurishkuro
Copy link
Copy Markdown
Member

Please change pr title to be about OTEL upgrade

@wololowarrior wololowarrior changed the title Fix ci failing due to configgrpc version upgrade [Feature]: Upgrade to OTEL Collector 1.37 Jul 30, 2025
@yurishkuro yurishkuro added the changelog:dependencies Update to dependencies label Jul 30, 2025
@yurishkuro yurishkuro merged commit 14a5f79 into jaegertracing:main Jul 30, 2025
63 of 65 checks passed
@yurishkuro
Copy link
Copy Markdown
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog:dependencies Update to dependencies dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature]: Upgrade to OTEL Collector 1.37

2 participants