Skip to content

Commit 60e9864

Browse files
ran make gotidy
Signed-off-by: singhvibhanshu <singhvibhanshu@hotmail.com>
1 parent 963d8a9 commit 60e9864

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

extension/encoding/azureencodingextension/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ require (
1616
go.opentelemetry.io/collector/confmap/xconfmap v0.150.0
1717
go.opentelemetry.io/collector/extension v1.56.0
1818
go.opentelemetry.io/collector/extension/extensiontest v0.150.0
19+
go.opentelemetry.io/collector/featuregate v1.56.0
1920
go.opentelemetry.io/collector/pdata v1.56.0
2021
go.opentelemetry.io/otel v1.43.0
2122
go.opentelemetry.io/otel/trace v1.43.0
@@ -42,7 +43,6 @@ require (
4243
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.150.0 // indirect
4344
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
4445
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
45-
go.opentelemetry.io/collector/featuregate v1.56.0 // indirect
4646
go.opentelemetry.io/collector/internal/componentalias v0.150.0 // indirect
4747
go.opentelemetry.io/collector/pdata/pprofile v0.150.0 // indirect
4848
go.opentelemetry.io/collector/pdata/xpdata v0.150.0 // indirect

extension/encoding/azureencodingextension/internal/unmarshaler/logs/category_datafactory.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"fmt"
99

1010
"go.opentelemetry.io/collector/pdata/pcommon"
11-
conventionsv138 "go.opentelemetry.io/otel/semconv/v1.38.0"
11+
conventionsv139 "go.opentelemetry.io/otel/semconv/v1.39.0"
1212
conventions "go.opentelemetry.io/otel/semconv/v1.40.0"
1313

1414
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/azureencodingextension/internal/metadata"
@@ -152,7 +152,7 @@ func (r *azureDataFactoryBaseLog) PutProperties(attrs pcommon.Map, _ pcommon.Val
152152
unmarshaler.AttrPutMapIf(attrs, attributeDataFactoryTags, r.Properties.Tags)
153153
// Errors
154154
if !metadata.ExtensionAzureencodingDontEmitV0LogConventionsFeatureGate.IsEnabled() {
155-
unmarshaler.AttrPutStrIf(attrs, string(conventionsv138.ErrorMessageKey), r.Properties.Error.Message)
155+
unmarshaler.AttrPutStrIf(attrs, string(conventionsv139.ErrorMessageKey), r.Properties.Error.Message)
156156
}
157157
if metadata.ExtensionAzureencodingEmitV1LogConventionsFeatureGate.IsEnabled() {
158158
unmarshaler.AttrPutStrIf(attrs, string(conventions.ExceptionMessageKey), r.Properties.Error.Message)

extension/encoding/azureencodingextension/internal/unmarshaler/logs/category_messaging.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
jsoniter "github.com/json-iterator/go"
1313
"go.opentelemetry.io/collector/pdata/pcommon"
1414
"go.opentelemetry.io/collector/pdata/plog"
15-
conventionsv138 "go.opentelemetry.io/otel/semconv/v1.38.0"
15+
conventionsv139 "go.opentelemetry.io/otel/semconv/v1.39.0"
1616
conventions "go.opentelemetry.io/otel/semconv/v1.40.0"
1717

1818
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/azureencodingextension/internal/metadata"
@@ -166,7 +166,7 @@ func (r *azureMSDiagnosticErrorLog) PutCommonAttributes(attrs pcommon.Map, body
166166
// Then put custom top-level attributes
167167
unmarshaler.AttrPutStrIf(attrs, attributeAzureMSTaskName, r.TaskName)
168168
if !metadata.ExtensionAzureencodingDontEmitV0LogConventionsFeatureGate.IsEnabled() {
169-
unmarshaler.AttrPutStrIf(attrs, string(conventionsv138.ErrorMessageKey), r.ErrorMessage)
169+
unmarshaler.AttrPutStrIf(attrs, string(conventionsv139.ErrorMessageKey), r.ErrorMessage)
170170
}
171171
if metadata.ExtensionAzureencodingEmitV1LogConventionsFeatureGate.IsEnabled() {
172172
unmarshaler.AttrPutStrIf(attrs, string(conventions.ExceptionMessageKey), r.ErrorMessage)
@@ -316,7 +316,7 @@ func (r *azureMSOperationalLog) PutProperties(attrs pcommon.Map, _ pcommon.Value
316316
unmarshaler.AttrPutStrIf(attrs, string(conventions.AzureServiceRequestIDKey), r.Properties.TrackingID)
317317
unmarshaler.AttrPutStrIf(attrs, attributeErrorCode, r.Properties.ErrorCode)
318318
if !metadata.ExtensionAzureencodingDontEmitV0LogConventionsFeatureGate.IsEnabled() {
319-
unmarshaler.AttrPutStrIf(attrs, string(conventionsv138.ErrorMessageKey), r.Properties.ErrorMessage)
319+
unmarshaler.AttrPutStrIf(attrs, string(conventionsv139.ErrorMessageKey), r.Properties.ErrorMessage)
320320
}
321321
if metadata.ExtensionAzureencodingEmitV1LogConventionsFeatureGate.IsEnabled() {
322322
unmarshaler.AttrPutStrIf(attrs, string(conventions.ExceptionMessageKey), r.Properties.ErrorMessage)

0 commit comments

Comments
 (0)