Skip to content

Commit 465a284

Browse files
herin049herin049
committed
remove deprecated collector semconv package
1 parent 9cb540a commit 465a284

6 files changed

Lines changed: 71 additions & 75 deletions

File tree

‎collector/receiver/telemetryapireceiver/go.mod‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ go 1.24.4
55
replace github.com/open-telemetry/opentelemetry-lambda/collector => ../../
66

77
require (
8-
github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259
98
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.138.0
109
github.com/open-telemetry/opentelemetry-lambda/collector v0.98.0
1110
github.com/stretchr/testify v1.11.1
1211
go.opentelemetry.io/collector/component v1.44.0
1312
go.opentelemetry.io/collector/component/componenttest v0.138.0
1413
go.opentelemetry.io/collector/confmap v1.44.0
14+
go.opentelemetry.io/collector/confmap/xconfmap v0.138.0
1515
go.opentelemetry.io/collector/consumer v1.44.0
1616
go.opentelemetry.io/collector/consumer/consumertest v0.138.0
1717
go.opentelemetry.io/collector/pdata v1.44.0
1818
go.opentelemetry.io/collector/receiver v1.44.0
1919
go.opentelemetry.io/collector/receiver/receivertest v0.138.0
20-
go.opentelemetry.io/collector/semconv v0.128.0
20+
go.opentelemetry.io/otel v1.38.0
2121
go.uber.org/zap v1.27.1
2222
)
2323

@@ -33,6 +33,7 @@ require (
3333
github.com/go-logr/stdr v1.2.2 // indirect
3434
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
3535
github.com/gogo/protobuf v1.3.2 // indirect
36+
github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259 // indirect
3637
github.com/google/uuid v1.6.0 // indirect
3738
github.com/hashicorp/go-version v1.7.0 // indirect
3839
github.com/json-iterator/go v1.1.12 // indirect
@@ -45,7 +46,6 @@ require (
4546
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
4647
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
4748
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
48-
go.opentelemetry.io/collector/confmap/xconfmap v0.138.0 // indirect
4949
go.opentelemetry.io/collector/consumer/consumererror v0.138.0 // indirect
5050
go.opentelemetry.io/collector/consumer/xconsumer v0.138.0 // indirect
5151
go.opentelemetry.io/collector/featuregate v1.44.0 // indirect
@@ -54,7 +54,6 @@ require (
5454
go.opentelemetry.io/collector/pipeline v1.44.0 // indirect
5555
go.opentelemetry.io/collector/receiver/xreceiver v0.138.0 // indirect
5656
go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect
57-
go.opentelemetry.io/otel v1.38.0 // indirect
5857
go.opentelemetry.io/otel/log v0.14.0 // indirect
5958
go.opentelemetry.io/otel/metric v1.38.0 // indirect
6059
go.opentelemetry.io/otel/sdk v1.38.0 // indirect

‎collector/receiver/telemetryapireceiver/go.sum‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ go.opentelemetry.io/collector/receiver/receivertest v0.138.0 h1:K6kZ/epuAjjCCr1U
100100
go.opentelemetry.io/collector/receiver/receivertest v0.138.0/go.mod h1:p3cGSplwwp71r7R6u0e8N0rP/mmPsFjJ4WFV2Bhv7os=
101101
go.opentelemetry.io/collector/receiver/xreceiver v0.138.0 h1:wspJazZc4htPBT08JpUI6gq+qeUUxSOhxXwWGn+QnlM=
102102
go.opentelemetry.io/collector/receiver/xreceiver v0.138.0/go.mod h1:+S/AsbEs1geUt3B+HAhdSjd+3hPkjtmcSBltKwpCBik=
103-
go.opentelemetry.io/collector/semconv v0.128.0 h1:MzYOz7Vgb3Kf5D7b49pqqgeUhEmOCuT10bIXb/Cc+k4=
104-
go.opentelemetry.io/collector/semconv v0.128.0/go.mod h1:OPXer4l43X23cnjLXIZnRj/qQOjSuq4TgBLI76P9hns=
105103
go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw=
106104
go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4=
107105
go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=

‎collector/receiver/telemetryapireceiver/metric_builder.go‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil"
2121
"go.opentelemetry.io/collector/pdata/pcommon"
2222
"go.opentelemetry.io/collector/pdata/pmetric"
23-
semconv2 "go.opentelemetry.io/otel/semconv/v1.24.0"
23+
semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
2424
)
2525

2626
const MiB = float64(1 << 20)
@@ -285,9 +285,9 @@ func (c *CounterMetricBuilder) AppendDataPoints(scopeMetrics pmetric.ScopeMetric
285285

286286
func NewFaaSInvokeDurationMetricBuilder(startTime pcommon.Timestamp, temporality pmetric.AggregationTemporality) *HistogramMetricBuilder {
287287
return NewHistogramMetricBuilder(
288-
semconv2.FaaSInvokeDurationName,
289-
semconv2.FaaSInvokeDurationDescription,
290-
semconv2.FaaSInvokeDurationUnit,
288+
semconv.FaaSInvokeDurationName,
289+
semconv.FaaSInvokeDurationDescription,
290+
semconv.FaaSInvokeDurationUnit,
291291
DurationHistogramBounds,
292292
startTime,
293293
temporality,
@@ -296,9 +296,9 @@ func NewFaaSInvokeDurationMetricBuilder(startTime pcommon.Timestamp, temporality
296296

297297
func NewFaaSInitDurationMetricBuilder(startTime pcommon.Timestamp, temporality pmetric.AggregationTemporality) *HistogramMetricBuilder {
298298
return NewHistogramMetricBuilder(
299-
semconv2.FaaSInitDurationName,
300-
semconv2.FaaSInitDurationDescription,
301-
semconv2.FaaSInitDurationUnit,
299+
semconv.FaaSInitDurationName,
300+
semconv.FaaSInitDurationDescription,
301+
semconv.FaaSInitDurationUnit,
302302
DurationHistogramBounds,
303303
startTime,
304304
temporality,
@@ -307,9 +307,9 @@ func NewFaaSInitDurationMetricBuilder(startTime pcommon.Timestamp, temporality p
307307

308308
func NewFaaSMemUsageMetricBuilder(startTime pcommon.Timestamp, temporality pmetric.AggregationTemporality) *HistogramMetricBuilder {
309309
return NewHistogramMetricBuilder(
310-
semconv2.FaaSMemUsageName,
311-
semconv2.FaaSMemUsageDescription,
312-
semconv2.FaaSMemUsageUnit,
310+
semconv.FaaSMemUsageName,
311+
semconv.FaaSMemUsageDescription,
312+
semconv.FaaSMemUsageUnit,
313313
MemUsageHistogramBounds,
314314
startTime,
315315
temporality,
@@ -318,9 +318,9 @@ func NewFaaSMemUsageMetricBuilder(startTime pcommon.Timestamp, temporality pmetr
318318

319319
func NewFaaSColdstartsMetricBuilder(startTime pcommon.Timestamp, temporality pmetric.AggregationTemporality) *CounterMetricBuilder {
320320
return NewCounterMetricBuilder(
321-
semconv2.FaaSColdstartsName,
322-
semconv2.FaaSColdstartsDescription,
323-
semconv2.FaaSColdstartsUnit,
321+
semconv.FaaSColdstartsName,
322+
semconv.FaaSColdstartsDescription,
323+
semconv.FaaSColdstartsUnit,
324324
true,
325325
startTime,
326326
temporality,
@@ -329,9 +329,9 @@ func NewFaaSColdstartsMetricBuilder(startTime pcommon.Timestamp, temporality pme
329329

330330
func NewFaaSErrorsMetricBuilder(startTime pcommon.Timestamp, temporality pmetric.AggregationTemporality) *CounterMetricBuilder {
331331
return NewCounterMetricBuilder(
332-
semconv2.FaaSErrorsName,
333-
semconv2.FaaSErrorsDescription,
334-
semconv2.FaaSErrorsUnit,
332+
semconv.FaaSErrorsName,
333+
semconv.FaaSErrorsDescription,
334+
semconv.FaaSErrorsUnit,
335335
true,
336336
startTime,
337337
temporality,
@@ -340,9 +340,9 @@ func NewFaaSErrorsMetricBuilder(startTime pcommon.Timestamp, temporality pmetric
340340

341341
func NewFaaSInvocationsMetricBuilder(startTime pcommon.Timestamp, temporality pmetric.AggregationTemporality) *CounterMetricBuilder {
342342
return NewCounterMetricBuilder(
343-
semconv2.FaaSInvocationsName,
344-
semconv2.FaaSInvocationsDescription,
345-
semconv2.FaaSInvocationsUnit,
343+
semconv.FaaSInvocationsName,
344+
semconv.FaaSInvocationsDescription,
345+
semconv.FaaSInvocationsUnit,
346346
true,
347347
startTime,
348348
temporality,
@@ -351,9 +351,9 @@ func NewFaaSInvocationsMetricBuilder(startTime pcommon.Timestamp, temporality pm
351351

352352
func NewFaaSTimeoutsMetricBuilder(startTime pcommon.Timestamp, temporality pmetric.AggregationTemporality) *CounterMetricBuilder {
353353
return NewCounterMetricBuilder(
354-
semconv2.FaaSTimeoutsName,
355-
semconv2.FaaSTimeoutsDescription,
356-
semconv2.FaaSTimeoutsUnit,
354+
semconv.FaaSTimeoutsName,
355+
semconv.FaaSTimeoutsDescription,
356+
semconv.FaaSTimeoutsUnit,
357357
true,
358358
startTime,
359359
temporality,

‎collector/receiver/telemetryapireceiver/metric_builder_test.go‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/stretchr/testify/require"
2323
"go.opentelemetry.io/collector/pdata/pcommon"
2424
"go.opentelemetry.io/collector/pdata/pmetric"
25-
semconv2 "go.opentelemetry.io/otel/semconv/v1.24.0"
25+
semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
2626
)
2727

2828
func TestHistogramMetricBuilder_AppendDataPoint(t *testing.T) {
@@ -202,69 +202,69 @@ func TestFaaSMetricBuilderFactories(t *testing.T) {
202202

203203
t.Run("NewFasSInvokeDurationMetricBuilder", func(t *testing.T) {
204204
builder := NewFaaSInvokeDurationMetricBuilder(startTime, pmetric.AggregationTemporalityCumulative)
205-
assert.Equal(t, semconv2.FaaSInvokeDurationName, builder.name)
206-
assert.Equal(t, semconv2.FaaSInvokeDurationDescription, builder.description)
207-
assert.Equal(t, semconv2.FaaSInvokeDurationUnit, builder.unit)
205+
assert.Equal(t, semconv.FaaSInvokeDurationName, builder.name)
206+
assert.Equal(t, semconv.FaaSInvokeDurationDescription, builder.description)
207+
assert.Equal(t, semconv.FaaSInvokeDurationUnit, builder.unit)
208208
assert.Equal(t, DurationHistogramBounds, builder.bounds)
209209
assert.Equal(t, pmetric.AggregationTemporalityCumulative, builder.temporality)
210210
assert.Equal(t, startTime, builder.startTime)
211211
})
212212

213213
t.Run("NewFasSInitDurationMetricBuilder", func(t *testing.T) {
214214
builder := NewFaaSInitDurationMetricBuilder(startTime, pmetric.AggregationTemporalityCumulative)
215-
assert.Equal(t, semconv2.FaaSInitDurationName, builder.name)
216-
assert.Equal(t, semconv2.FaaSInitDurationDescription, builder.description)
217-
assert.Equal(t, semconv2.FaaSInitDurationUnit, builder.unit)
215+
assert.Equal(t, semconv.FaaSInitDurationName, builder.name)
216+
assert.Equal(t, semconv.FaaSInitDurationDescription, builder.description)
217+
assert.Equal(t, semconv.FaaSInitDurationUnit, builder.unit)
218218
assert.Equal(t, DurationHistogramBounds, builder.bounds)
219219
assert.Equal(t, pmetric.AggregationTemporalityCumulative, builder.temporality)
220220
assert.Equal(t, startTime, builder.startTime)
221221
})
222222

223223
t.Run("NewFaaSMemUsageMetricBuilder", func(t *testing.T) {
224224
builder := NewFaaSMemUsageMetricBuilder(startTime, pmetric.AggregationTemporalityCumulative)
225-
assert.Equal(t, semconv2.FaaSMemUsageName, builder.name)
226-
assert.Equal(t, semconv2.FaaSMemUsageDescription, builder.description)
227-
assert.Equal(t, semconv2.FaaSMemUsageUnit, builder.unit)
225+
assert.Equal(t, semconv.FaaSMemUsageName, builder.name)
226+
assert.Equal(t, semconv.FaaSMemUsageDescription, builder.description)
227+
assert.Equal(t, semconv.FaaSMemUsageUnit, builder.unit)
228228
assert.Equal(t, MemUsageHistogramBounds, builder.bounds)
229229
assert.Equal(t, pmetric.AggregationTemporalityCumulative, builder.temporality)
230230
assert.Equal(t, startTime, builder.startTime)
231231
})
232232

233233
t.Run("NewFaaSColdstartsMetricBuilder", func(t *testing.T) {
234234
builder := NewFaaSColdstartsMetricBuilder(startTime, pmetric.AggregationTemporalityCumulative)
235-
assert.Equal(t, semconv2.FaaSColdstartsName, builder.name)
236-
assert.Equal(t, semconv2.FaaSColdstartsDescription, builder.description)
237-
assert.Equal(t, semconv2.FaaSColdstartsUnit, builder.unit)
235+
assert.Equal(t, semconv.FaaSColdstartsName, builder.name)
236+
assert.Equal(t, semconv.FaaSColdstartsDescription, builder.description)
237+
assert.Equal(t, semconv.FaaSColdstartsUnit, builder.unit)
238238
assert.True(t, builder.isMonotonic)
239239
assert.Equal(t, pmetric.AggregationTemporalityCumulative, builder.temporality)
240240
assert.Equal(t, startTime, builder.startTime)
241241
})
242242

243243
t.Run("NewFaaSErrorsMetricBuilder", func(t *testing.T) {
244244
builder := NewFaaSErrorsMetricBuilder(startTime, pmetric.AggregationTemporalityCumulative)
245-
assert.Equal(t, semconv2.FaaSErrorsName, builder.name)
246-
assert.Equal(t, semconv2.FaaSErrorsDescription, builder.description)
247-
assert.Equal(t, semconv2.FaaSErrorsUnit, builder.unit)
245+
assert.Equal(t, semconv.FaaSErrorsName, builder.name)
246+
assert.Equal(t, semconv.FaaSErrorsDescription, builder.description)
247+
assert.Equal(t, semconv.FaaSErrorsUnit, builder.unit)
248248
assert.True(t, builder.isMonotonic)
249249
assert.Equal(t, pmetric.AggregationTemporalityCumulative, builder.temporality)
250250
assert.Equal(t, startTime, builder.startTime)
251251
})
252252

253253
t.Run("NewFaaSInvocationsMetricBuilder", func(t *testing.T) {
254254
builder := NewFaaSInvocationsMetricBuilder(startTime, pmetric.AggregationTemporalityCumulative)
255-
assert.Equal(t, semconv2.FaaSInvocationsName, builder.name)
256-
assert.Equal(t, semconv2.FaaSInvocationsDescription, builder.description)
257-
assert.Equal(t, semconv2.FaaSInvocationsUnit, builder.unit)
255+
assert.Equal(t, semconv.FaaSInvocationsName, builder.name)
256+
assert.Equal(t, semconv.FaaSInvocationsDescription, builder.description)
257+
assert.Equal(t, semconv.FaaSInvocationsUnit, builder.unit)
258258
assert.True(t, builder.isMonotonic)
259259
assert.Equal(t, pmetric.AggregationTemporalityCumulative, builder.temporality)
260260
assert.Equal(t, startTime, builder.startTime)
261261
})
262262

263263
t.Run("NewFaaSTimeoutsMetricBuilder", func(t *testing.T) {
264264
builder := NewFaaSTimeoutsMetricBuilder(startTime, pmetric.AggregationTemporalityCumulative)
265-
assert.Equal(t, semconv2.FaaSTimeoutsName, builder.name)
266-
assert.Equal(t, semconv2.FaaSTimeoutsDescription, builder.description)
267-
assert.Equal(t, semconv2.FaaSTimeoutsUnit, builder.unit)
265+
assert.Equal(t, semconv.FaaSTimeoutsName, builder.name)
266+
assert.Equal(t, semconv.FaaSTimeoutsDescription, builder.description)
267+
assert.Equal(t, semconv.FaaSTimeoutsUnit, builder.unit)
268268
assert.True(t, builder.isMonotonic)
269269
assert.Equal(t, pmetric.AggregationTemporalityCumulative, builder.temporality)
270270
assert.Equal(t, startTime, builder.startTime)
@@ -284,13 +284,13 @@ func TestNewFaaSMetricBuilders(t *testing.T) {
284284
require.NotNil(t, builders.invocationsMetric)
285285
require.NotNil(t, builders.timeoutsMetric)
286286

287-
assert.Equal(t, semconv2.FaaSInvokeDurationName, builders.invokeDurationMetric.name)
288-
assert.Equal(t, semconv2.FaaSInitDurationName, builders.initDurationMetric.name)
289-
assert.Equal(t, semconv2.FaaSMemUsageName, builders.memUsageMetric.name)
290-
assert.Equal(t, semconv2.FaaSColdstartsName, builders.coldstartsMetric.name)
291-
assert.Equal(t, semconv2.FaaSErrorsName, builders.errorsMetric.name)
292-
assert.Equal(t, semconv2.FaaSInvocationsName, builders.invocationsMetric.name)
293-
assert.Equal(t, semconv2.FaaSTimeoutsName, builders.timeoutsMetric.name)
287+
assert.Equal(t, semconv.FaaSInvokeDurationName, builders.invokeDurationMetric.name)
288+
assert.Equal(t, semconv.FaaSInitDurationName, builders.initDurationMetric.name)
289+
assert.Equal(t, semconv.FaaSMemUsageName, builders.memUsageMetric.name)
290+
assert.Equal(t, semconv.FaaSColdstartsName, builders.coldstartsMetric.name)
291+
assert.Equal(t, semconv.FaaSErrorsName, builders.errorsMetric.name)
292+
assert.Equal(t, semconv.FaaSInvocationsName, builders.invocationsMetric.name)
293+
assert.Equal(t, semconv.FaaSTimeoutsName, builders.timeoutsMetric.name)
294294
}
295295

296296
func TestDefaultHistogramBounds(t *testing.T) {

‎collector/receiver/telemetryapireceiver/receiver.go‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ import (
3737
"go.opentelemetry.io/collector/pdata/pmetric"
3838
"go.opentelemetry.io/collector/pdata/ptrace"
3939
"go.opentelemetry.io/collector/receiver"
40-
semconv "go.opentelemetry.io/collector/semconv/v1.25.0"
41-
semconv2 "go.opentelemetry.io/otel/semconv/v1.24.0"
40+
semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
4241
"go.uber.org/zap"
4342

4443
"github.com/open-telemetry/opentelemetry-lambda/collector/internal/telemetryapi"
@@ -283,7 +282,7 @@ func (r *telemetryAPIReceiver) createMetrics(slice []event) (pmetric.Metrics, er
283282
r.resource.CopyTo(resourceMetric.Resource())
284283
scopeMetric := resourceMetric.ScopeMetrics().AppendEmpty()
285284
scopeMetric.Scope().SetName(scopeName)
286-
scopeMetric.SetSchemaUrl(semconv2.SchemaURL)
285+
scopeMetric.SetSchemaUrl(semconv.SchemaURL)
287286

288287
for _, el := range slice {
289288
r.logger.Debug(fmt.Sprintf("Event: %s", el.Type), zap.Any("event", el))
@@ -385,7 +384,7 @@ func (r *telemetryAPIReceiver) createLogs(slice []event) (plog.Logs, error) {
385384
if record, ok := el.Record.(map[string]interface{}); ok {
386385
requestId := r.getRecordRequestId(record)
387386
if requestId != "" {
388-
logRecord.Attributes().PutStr(semconv.AttributeFaaSInvocationID, requestId)
387+
logRecord.Attributes().PutStr(string(semconv.FaaSInvocationIDKey), requestId)
389388

390389
// If this is the first event in the invocation with a request id (i.e. the "platform.start" event),
391390
// set the current invocation id to this request id.
@@ -425,7 +424,7 @@ func (r *telemetryAPIReceiver) createLogs(slice []event) (plog.Logs, error) {
425424
}
426425
} else {
427426
if r.currentFaasInvocationID != "" {
428-
logRecord.Attributes().PutStr(semconv.AttributeFaaSInvocationID, r.currentFaasInvocationID)
427+
logRecord.Attributes().PutStr(string(semconv.FaaSInvocationIDKey), r.currentFaasInvocationID)
429428
}
430429
// in plain text https://docs.aws.amazon.com/lambda/latest/dg/telemetry-schema-reference.html#telemetry-api-function
431430
if line, ok := el.Record.(string); ok {
@@ -629,7 +628,7 @@ func (r *telemetryAPIReceiver) createPlatformInitSpan(record map[string]any, sta
629628
span.SetSpanID(newSpanID())
630629
span.SetName(fmt.Sprintf("init %s", r.faasName))
631630
span.SetKind(ptrace.SpanKindInternal)
632-
span.Attributes().PutBool(semconv.AttributeFaaSColdstart, true)
631+
span.Attributes().PutBool(string(semconv.FaaSColdstartKey), true)
633632
startTime, err := time.Parse(time.RFC3339, start)
634633
if err != nil {
635634
return ptrace.Traces{}, err
@@ -646,9 +645,9 @@ func (r *telemetryAPIReceiver) createPlatformInitSpan(record map[string]any, sta
646645
span.Status().SetCode(ptrace.StatusCodeError)
647646
errorType, _ := record["errorType"].(string)
648647
if errorType != "" {
649-
span.Attributes().PutStr(semconv.AttributeErrorType, errorType)
648+
span.Attributes().PutStr(string(semconv.ErrorTypeKey), errorType)
650649
} else {
651-
span.Attributes().PutStr(semconv.AttributeErrorType, status)
650+
span.Attributes().PutStr(string(semconv.ErrorTypeKey), status)
652651
}
653652
}
654653
return traceData, nil
@@ -675,21 +674,21 @@ func newTelemetryAPIReceiver(
675674
set receiver.Settings,
676675
) (*telemetryAPIReceiver, error) {
677676
envResourceMap := map[string]string{
678-
"AWS_LAMBDA_FUNCTION_MEMORY_SIZE": semconv.AttributeFaaSMaxMemory,
679-
"AWS_LAMBDA_FUNCTION_VERSION": semconv.AttributeFaaSVersion,
680-
"AWS_REGION": semconv.AttributeFaaSInvokedRegion,
677+
"AWS_LAMBDA_FUNCTION_MEMORY_SIZE": string(semconv.FaaSMaxMemoryKey),
678+
"AWS_LAMBDA_FUNCTION_VERSION": string(semconv.FaaSVersionKey),
679+
"AWS_REGION": string(semconv.FaaSInvokedRegionKey),
681680
}
682681
r := pcommon.NewResource()
683-
r.Attributes().PutStr(semconv.AttributeFaaSInvokedProvider, semconv.AttributeFaaSInvokedProviderAWS)
682+
r.Attributes().PutStr(string(semconv.FaaSInvokedProviderKey), semconv.FaaSInvokedProviderAWS.Value.AsString())
684683
if val, ok := os.LookupEnv("AWS_LAMBDA_FUNCTION_NAME"); ok {
685-
r.Attributes().PutStr(semconv.AttributeServiceName, val)
686-
r.Attributes().PutStr(semconv.AttributeFaaSName, val)
684+
r.Attributes().PutStr(string(semconv.ServiceNameKey), val)
685+
r.Attributes().PutStr(string(semconv.FaaSNameKey), val)
687686
} else {
688-
r.Attributes().PutStr(semconv.AttributeServiceName, "unknown_service")
687+
r.Attributes().PutStr(string(semconv.ServiceNameKey), "unknown_service")
689688
}
690689

691690
if val, ok := os.LookupEnv("OTEL_SERVICE_NAME"); ok {
692-
r.Attributes().PutStr(semconv.AttributeServiceName, val)
691+
r.Attributes().PutStr(string(semconv.ServiceNameKey), val)
693692
}
694693

695694
for env, resourceAttribute := range envResourceMap {

‎collector/receiver/telemetryapireceiver/receiver_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"go.opentelemetry.io/collector/pdata/plog"
2828
"go.opentelemetry.io/collector/pdata/ptrace"
2929
"go.opentelemetry.io/collector/receiver/receivertest"
30-
semconv "go.opentelemetry.io/collector/semconv/v1.25.0"
30+
semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
3131
)
3232

3333
func TestListenOnAddress(t *testing.T) {
@@ -640,7 +640,7 @@ func TestCreateLogs(t *testing.T) {
640640
require.NoError(t, err)
641641
require.Equal(t, pcommon.NewTimestampFromTime(expectedTime), logRecord.Timestamp())
642642

643-
requestId, ok := logRecord.Attributes().Get(semconv.AttributeFaaSInvocationID)
643+
requestId, ok := logRecord.Attributes().Get(string(semconv.FaaSInvocationIDKey))
644644
require.Equal(t, expected.containsRequestId, ok)
645645
if ok {
646646
require.Equal(t, expected.requestId, requestId.Str())

0 commit comments

Comments
 (0)