[exporter/elasticsearch] fix panic when encoding scope attributes #40098
+46
−7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AndersonQ
force-pushed
the
37701-fix-es-exporter-scope-attr-panic
branch
3 times, most recently
from
6fd6d65 to
85b7f41
Compare
carsonip
reviewed
May 15, 2025
AndersonQ
force-pushed
the
37701-fix-es-exporter-scope-attr-panic
branch
from
85b7f41 to
0b2be72
Compare
AndersonQ
force-pushed
the
37701-fix-es-exporter-scope-attr-panic
branch
from
0b2be72 to
56ef63b
Compare
andrzej-stencel
approved these changes
May 15, 2025
| @@ -449,11 +449,12 @@ func durationAsMicroseconds(start, end time.Time) int64 { | |||
|
|
|||
| func scopeToAttributes(scope pcommon.InstrumentationScope) pcommon.Map { | |||
| attrs := pcommon.NewMap() | |||
|
|
|||
| scope.Attributes().CopyTo(attrs) | |||
There was a problem hiding this comment.
This reordering has the consequence that if a scope attribute named "name" or "version" exists, it will be overridden by scope name or version. I believe in general this is the right thing to do, with the exception of when the scope name or version is empty.
I'd like to see a follow-up change to only set scope name and version as attributes if they aren't empty.
lahsivjar
approved these changes
May 16, 2025
dragonlord93
pushed a commit
to dragonlord93/opentelemetry-collector-contrib
that referenced
this pull request
May 23, 2025
…en-telemetry#40098) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Previously, the code attempted to cast scope attribute values to strings, leading to a panic when incompatible types were encountered. When mapping scope to attributes, instead of trying to cast them to string now it just creates a new Map for the attributes and copies the cope entries to the new map. This avoids any cast and preserves the original types. <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes open-telemetry#37701 <!--Describe what testing was performed and which tests were added.--> #### Testing Run the exporter with the config that originally causes the panic, see config below. Running it on main will panic, running it on this PR will not panic. ``` ./bin/otelcontribcol_linux_amd64 --config otel-test.yaml ``` ``` receivers: hostmetrics: metadata_collection_interval: 1s scrapers: cpu: {} exporters: elasticsearch: mapping: mode: none endpoint: <redacted> user: <redacted> password: <redacted> flush: interval: 1s service: pipelines: logs: receivers: [hostmetrics] processors: [] exporters: [elasticsearch] ``` <!--Describe the documentation added.--> #### Documentation N/A <!--Please delete paragraphs that you did not use before submitting.-->
dd-jasminesun
pushed a commit
to DataDog/opentelemetry-collector-contrib
that referenced
this pull request
Jun 23, 2025
…en-telemetry#40098) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Previously, the code attempted to cast scope attribute values to strings, leading to a panic when incompatible types were encountered. When mapping scope to attributes, instead of trying to cast them to string now it just creates a new Map for the attributes and copies the cope entries to the new map. This avoids any cast and preserves the original types. <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes open-telemetry#37701 <!--Describe what testing was performed and which tests were added.--> #### Testing Run the exporter with the config that originally causes the panic, see config below. Running it on main will panic, running it on this PR will not panic. ``` ./bin/otelcontribcol_linux_amd64 --config otel-test.yaml ``` ``` receivers: hostmetrics: metadata_collection_interval: 1s scrapers: cpu: {} exporters: elasticsearch: mapping: mode: none endpoint: <redacted> user: <redacted> password: <redacted> flush: interval: 1s service: pipelines: logs: receivers: [hostmetrics] processors: [] exporters: [elasticsearch] ``` <!--Describe the documentation added.--> #### Documentation N/A <!--Please delete paragraphs that you did not use before submitting.-->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Previously, the code attempted to cast scope attribute values to strings, leading to a panic when incompatible types were encountered.
When mapping scope to attributes, instead of trying to cast them to string now it just creates a new Map for the attributes and copies the cope entries to the new map. This avoids any cast and preserves the original types.
Link to tracking issue
Fixes #37701
Testing
Run the exporter with the config that originally causes the panic, see config below.
Running it on main will panic, running it on this PR will not panic.
Documentation
N/A