Skip to content

Commit 1d1617b

Browse files
cparkinsRoryCrispin
authored andcommitted
[pkg/translator/azure] New component for translating from Azure native formats (open-telemetry#25096)
**Description:** <Describe what has changed.> <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> Adding a Translator to convert from Azure Resource Log format (for now) to OTel. **Link to tracking Issue:** <Issue number if applicable> open-telemetry#18210 **Testing:** <Describe what testing was performed and which tests were added.> Performed manual validation testing between Event Hubs and OTel and added unit tests to cover new use case to allow multiple resources to be included in a batch. Existing tests moved to new package. **Documentation:** <Describe the documentation added.> None was necessary as this format is already supported by the Event Hub Receiver.
1 parent e643615 commit 1d1617b

28 files changed

+982
-249
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: 'new_component'
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
5+
component: pkg/translator/azure
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Create a translator for Azure Resource Log format
9+
10+
# One or more tracking issues related to the change
11+
issues: [18210]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext:

.github/CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ pkg/pdatatest/ @open-te
136136
pkg/pdatautil/ @open-telemetry/collector-contrib-approvers @dmitryax
137137
pkg/resourcetotelemetry/ @open-telemetry/collector-contrib-approvers @mx-psi
138138
pkg/stanza/ @open-telemetry/collector-contrib-approvers @djaglowski
139+
pkg/translator/azure/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers @atoulme
139140
pkg/translator/jaeger/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers @frzifus
140141
pkg/translator/loki/ @open-telemetry/collector-contrib-approvers @gouthamve @jpkrohling @mar4uk
141142
pkg/translator/opencensus/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers

.github/ISSUE_TEMPLATE/bug_report.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ body:
126126
- pkg/pdatautil
127127
- pkg/resourcetotelemetry
128128
- pkg/stanza
129+
- pkg/translator/azure
129130
- pkg/translator/jaeger
130131
- pkg/translator/loki
131132
- pkg/translator/opencensus

.github/ISSUE_TEMPLATE/feature_request.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ body:
120120
- pkg/pdatautil
121121
- pkg/resourcetotelemetry
122122
- pkg/stanza
123+
- pkg/translator/azure
123124
- pkg/translator/jaeger
124125
- pkg/translator/loki
125126
- pkg/translator/opencensus

.github/ISSUE_TEMPLATE/other.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ body:
120120
- pkg/pdatautil
121121
- pkg/resourcetotelemetry
122122
- pkg/stanza
123+
- pkg/translator/azure
123124
- pkg/translator/jaeger
124125
- pkg/translator/loki
125126
- pkg/translator/opencensus

.github/dependabot.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@ updates:
88
interval: "weekly"
99
day: "wednesday"
1010
- package-ecosystem: "gomod"
11-
directory: "/cmd/otelcontribcol"
12-
schedule:
13-
interval: "weekly"
14-
day: "wednesday"
15-
- package-ecosystem: "gomod"
16-
directory: "/cmd/oteltestbedcol"
11+
directory: "/cmd/githubgen"
1712
schedule:
1813
interval: "weekly"
1914
day: "wednesday"
@@ -487,6 +482,11 @@ updates:
487482
schedule:
488483
interval: "weekly"
489484
day: "wednesday"
485+
- package-ecosystem: "gomod"
486+
directory: "/pkg/translator/azure"
487+
schedule:
488+
interval: "weekly"
489+
day: "wednesday"
490490
- package-ecosystem: "gomod"
491491
directory: "/pkg/translator/jaeger"
492492
schedule:

cmd/configschema/go.mod

+10-7
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ require (
429429
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect
430430
github.com/kr/fs v0.1.0 // indirect
431431
github.com/kylelemons/godebug v1.1.0 // indirect
432-
github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165 // indirect
432+
github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect
433433
github.com/leoluk/perflib_exporter v0.2.1 // indirect
434434
github.com/lib/pq v1.10.9 // indirect
435435
github.com/lightstep/go-expohisto v1.0.0 // indirect
@@ -497,6 +497,7 @@ require (
497497
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.88.0 // indirect
498498
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.88.0 // indirect
499499
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.88.0 // indirect
500+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.88.0 // indirect
500501
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.88.0 // indirect
501502
github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.88.0 // indirect
502503
github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.88.0 // indirect
@@ -671,9 +672,9 @@ require (
671672
gonum.org/v1/gonum v0.14.0 // indirect
672673
google.golang.org/api v0.148.0 // indirect
673674
google.golang.org/appengine v1.6.7 // indirect
674-
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
675+
google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect
675676
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
676-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a // indirect
677+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
677678
google.golang.org/grpc v1.59.0 // indirect
678679
google.golang.org/protobuf v1.31.0 // indirect
679680
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -700,8 +701,6 @@ require (
700701
// Replace references to modules that are in this repository with their relateive paths
701702
// so that we always build with current (latest) version of the source code.
702703

703-
replace github.com/open-telemetry/opentelemetry-collector-contrib => ../..
704-
705704
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => ../../internal/aws/awsutil
706705

707706
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => ../../internal/aws/containerinsight
@@ -868,6 +867,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest
868867

869868
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
870869

870+
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure => ../../pkg/translator/azure
871+
871872
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger => ../../pkg/translator/jaeger
872873

873874
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki => ../../pkg/translator/loki
@@ -940,8 +941,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxr
940941

941942
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver => ../../receiver/azureblobreceiver
942943

943-
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver => ../../receiver/azureeventhubreceiver
944-
945944
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorreceiver => ../../receiver/azuremonitorreceiver
946945

947946
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver => ../../receiver/bigipreceiver
@@ -1118,3 +1117,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8ste
11181117
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog
11191118

11201119
replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling => ../../extension/jaegerremotesampling
1120+
1121+
replace github.com/open-telemetry/opentelemetry-collector-contrib => ../..
1122+
1123+
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver => ../../receiver/azureeventhubreceiver

cmd/configschema/go.sum

+6-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcontribcol/builder-config.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -416,3 +416,4 @@ replaces:
416416
- github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector => ../../connector/spanmetricsconnector
417417
- github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37
418418
- github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1
419+
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure => ../../pkg/translator/azure

cmd/otelcontribcol/go.mod

+5-2
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,7 @@ require (
533533
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.88.0 // indirect
534534
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.88.0 // indirect
535535
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.88.0 // indirect
536+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.88.0 // indirect
536537
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.88.0 // indirect
537538
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.88.0 // indirect
538539
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.88.0 // indirect
@@ -680,9 +681,9 @@ require (
680681
gonum.org/v1/gonum v0.14.0 // indirect
681682
google.golang.org/api v0.148.0 // indirect
682683
google.golang.org/appengine v1.6.7 // indirect
683-
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
684+
google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect
684685
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
685-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a // indirect
686+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
686687
google.golang.org/grpc v1.59.0 // indirect
687688
google.golang.org/protobuf v1.31.0 // indirect
688689
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -1133,5 +1134,7 @@ replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api
11331134

11341135
replace github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1
11351136

1137+
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure => ../../pkg/translator/azure
1138+
11361139
// ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules
11371140
replace cloud.google.com/go => cloud.google.com/go v0.110.9

cmd/otelcontribcol/go.sum

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

+7-4
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,7 @@ require (
513513
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.88.0 // indirect
514514
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.88.0 // indirect
515515
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.88.0 // indirect
516+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.88.0 // indirect
516517
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.88.0 // indirect
517518
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.88.0 // indirect
518519
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.88.0 // indirect
@@ -668,9 +669,9 @@ require (
668669
gonum.org/v1/gonum v0.14.0 // indirect
669670
google.golang.org/api v0.148.0 // indirect
670671
google.golang.org/appengine v1.6.7 // indirect
671-
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
672+
google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect
672673
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
673-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a // indirect
674+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
674675
google.golang.org/grpc v1.59.0 // indirect
675676
google.golang.org/protobuf v1.31.0 // indirect
676677
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -869,6 +870,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourceto
869870

870871
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => ./pkg/stanza
871872

873+
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure => ./pkg/translator/azure
874+
872875
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger => ./pkg/translator/jaeger
873876

874877
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki => ./pkg/translator/loki
@@ -941,8 +944,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxr
941944

942945
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver => ./receiver/azureblobreceiver
943946

944-
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver => ./receiver/azureeventhubreceiver
945-
946947
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorreceiver => ./receiver/azuremonitorreceiver
947948

948949
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver => ./receiver/bigipreceiver
@@ -1122,3 +1123,5 @@ replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api
11221123
replace github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1
11231124

11241125
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snowflakereceiver => ./receiver/snowflakereceiver
1126+
1127+
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver => ./receiver/azureeventhubreceiver

0 commit comments

Comments
 (0)