-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
[kafkareceiver] Add Azure Resource Log Support #28626
Merged
mx-psi
merged 4 commits into
open-telemetry:main
from
AmadeusITGroup:receiver/kafka-receiver/add-azure-resource-log-support
Dec 7, 2023
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
5e53194
[kafkareceiver] Add Azure Resource Log Support
cparkins 7e7611a
Merge branch 'main' into receiver/kafka-receiver/add-azure-resource-l…
cparkins 44f3b68
Merge branch 'open-telemetry:main' into receiver/kafka-receiver/add-a…
cparkins 91a3bb2
Make changes suggested in PR
cparkins 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
16 changes: 16 additions & 0 deletions
16
.chloggen/kafka-receiver-add-azureresourcelog-support.yaml
This file contains 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,16 @@ | ||
# 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: Add the ability to consume logs from Azure Diagnostic Settings streamed through Event Hubs using the Kafka API. | ||
|
||
# One or more tracking issues related to the change | ||
issues: [18210] | ||
|
||
# (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 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 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,32 @@ | ||||||
// Copyright The OpenTelemetry Authors | ||||||
// SPDX-License-Identifier: Apache-2.0 | ||||||
|
||||||
package kafkareceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver" | ||||||
|
||||||
import ( | ||||||
"go.opentelemetry.io/collector/pdata/plog" | ||||||
"go.uber.org/zap" | ||||||
|
||||||
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure" | ||||||
) | ||||||
|
||||||
type AzureResourceLogsUnmarshaler struct { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should not be exported
Suggested change
|
||||||
unmarshaler *azure.ResourceLogsUnmarshaler | ||||||
} | ||||||
|
||||||
func newAzureResourceLogsUnmarshaler(version string, logger *zap.Logger) LogsUnmarshaler { | ||||||
return AzureResourceLogsUnmarshaler{ | ||||||
unmarshaler: &azure.ResourceLogsUnmarshaler{ | ||||||
Version: version, | ||||||
Logger: logger, | ||||||
}, | ||||||
} | ||||||
} | ||||||
|
||||||
func (r AzureResourceLogsUnmarshaler) Unmarshal(buf []byte) (plog.Logs, error) { | ||||||
return r.unmarshaler.UnmarshalLogs(buf) | ||||||
} | ||||||
|
||||||
func (r AzureResourceLogsUnmarshaler) Encoding() string { | ||||||
return "azureresourcelogs" | ||||||
} |
16 changes: 16 additions & 0 deletions
16
receiver/kafkareceiver/azureresourcelogs_unmarshaler_test.go
This file contains 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,16 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package kafkareceiver | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
"go.uber.org/zap" | ||
) | ||
|
||
func TestNewAzureResourceLogsUnmarshaler(t *testing.T) { | ||
um := newAzureResourceLogsUnmarshaler("Test Version", zap.NewNop()) | ||
assert.Equal(t, "azureresourcelogs", um.Encoding()) | ||
} |
This file contains 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 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 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be
azure_resource_logs
instead for consistency in the casing style?