-
Notifications
You must be signed in to change notification settings - Fork 3k
Kafka extract header metada #24367
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
Merged
evan-bradley
merged 19 commits into
open-telemetry:main
from
VihasMakwana:kafka-header-extract
Sep 29, 2023
Merged
Kafka extract header metada #24367
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
7bc2f19
chore: add header extractor
b50f28e
chore: add test cases
9984940
chore: address review comments, fix testcases and improve readability
b8769b6
chore: add doc
019d5dc
chore: add changelog
2c283ee
fix: use test logger
d7e367f
chore: use nop-header extractir
8ceb897
Merge remote-tracking branch 'origin/main' into kafka-header-extract
1b12926
update changelog
a3b0446
Merge remote-tracking branch 'origin/main' into kafka-header-extract
07e6720
fix: Shopify -> IBM
7286eee
fix: linting
c51b42d
Merge branch 'main' into kafka-header-extract
VihasMakwana af0fa99
Merge branch 'main' into kafka-header-extract
VihasMakwana fc4cb77
Merge branch 'main' into kafka-header-extract
8c81cfe
fix: run go mod tidy
3514800
Merge branch 'main' into kafka-header-extract
VihasMakwana bc01580
remove deprecated obsreport.NewReceiver
b84cdaa
Merge branch 'main' into kafka-header-extract
VihasMakwana File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# Use this changelog template to create an entry for release notes. | ||
# If your change doesn't affect end users, such as a test fix or a tooling change, | ||
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. | ||
|
||
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
change_type: 'enhancement' | ||
|
||
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) | ||
component: kafkareceiver | ||
|
||
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
note: Allow users to attach kafka header metadata with the log/metric/trace record in the pipeline. Introduce a new config param, 'header_extraction' and some examples. | ||
|
||
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. | ||
issues: [24367] | ||
|
||
# (Optional) One or more lines of additional information to render under the primary note. | ||
# These lines will be padded with 2 spaces and then inserted directly into the document. | ||
# Use pipe (|) for multiline entries. | ||
subtext: |
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package kafkareceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver" | ||
|
||
import ( | ||
"fmt" | ||
|
||
"github.com/IBM/sarama" | ||
"go.opentelemetry.io/collector/pdata/plog" | ||
"go.opentelemetry.io/collector/pdata/pmetric" | ||
"go.opentelemetry.io/collector/pdata/ptrace" | ||
"go.uber.org/zap" | ||
) | ||
|
||
func getAttribute(key string) string { | ||
return fmt.Sprintf("kafka.header.%s", key) | ||
} | ||
|
||
type HeaderExtractor interface { | ||
extractHeadersTraces(ptrace.Traces, *sarama.ConsumerMessage) | ||
extractHeadersMetrics(pmetric.Metrics, *sarama.ConsumerMessage) | ||
extractHeadersLogs(plog.Logs, *sarama.ConsumerMessage) | ||
} | ||
|
||
type headerExtractor struct { | ||
logger *zap.Logger | ||
headers []string | ||
} | ||
|
||
func (he *headerExtractor) extractHeadersTraces(traces ptrace.Traces, message *sarama.ConsumerMessage) { | ||
for _, header := range he.headers { | ||
value, ok := getHeaderValue(message.Headers, header) | ||
if !ok { | ||
he.logger.Debug("Header key not found in the trace: ", zap.String("key", header)) | ||
continue | ||
} | ||
for i := 0; i < traces.ResourceSpans().Len(); i++ { | ||
rs := traces.ResourceSpans().At(i) | ||
rs.Resource().Attributes().PutStr(getAttribute(header), value) | ||
} | ||
} | ||
} | ||
|
||
func (he *headerExtractor) extractHeadersLogs(logs plog.Logs, message *sarama.ConsumerMessage) { | ||
for _, header := range he.headers { | ||
value, ok := getHeaderValue(message.Headers, header) | ||
if !ok { | ||
he.logger.Debug("Header key not found in the log: ", zap.String("key", header)) | ||
continue | ||
} | ||
for i := 0; i < logs.ResourceLogs().Len(); i++ { | ||
rl := logs.ResourceLogs().At(i) | ||
rl.Resource().Attributes().PutStr(getAttribute(header), value) | ||
} | ||
} | ||
} | ||
|
||
func (he *headerExtractor) extractHeadersMetrics(metrics pmetric.Metrics, message *sarama.ConsumerMessage) { | ||
for _, header := range he.headers { | ||
value, ok := getHeaderValue(message.Headers, header) | ||
if !ok { | ||
he.logger.Debug("Header key not found in the metric: ", zap.String("key", header)) | ||
continue | ||
} | ||
for i := 0; i < metrics.ResourceMetrics().Len(); i++ { | ||
rm := metrics.ResourceMetrics().At(i) | ||
rm.Resource().Attributes().PutStr(getAttribute(header), value) | ||
} | ||
} | ||
} | ||
|
||
func getHeaderValue(headers []*sarama.RecordHeader, header string) (string, bool) { | ||
for _, kafkaHeader := range headers { | ||
headerKey := string(kafkaHeader.Key) | ||
if headerKey == header { | ||
// matching header found | ||
return string(kafkaHeader.Value), true | ||
} | ||
} | ||
// no header found matching the key, report to the user | ||
return "", false | ||
} | ||
|
||
type nopHeaderExtractor struct{} | ||
|
||
func (he *nopHeaderExtractor) extractHeadersTraces(_ ptrace.Traces, _ *sarama.ConsumerMessage) { | ||
} | ||
|
||
func (he *nopHeaderExtractor) extractHeadersLogs(_ plog.Logs, _ *sarama.ConsumerMessage) { | ||
} | ||
|
||
func (he *nopHeaderExtractor) extractHeadersMetrics(_ pmetric.Metrics, _ *sarama.ConsumerMessage) { | ||
} |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.