Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ extension/sumologicextension/ @open-telemetry
internal/aws/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia
internal/collectd/ @open-telemetry/collector-contrib-approvers @atoulme
internal/common/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
internal/conventions/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
internal/coreinternal/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
internal/datadog/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @liustanley @songy23 @mackjmr @ankitpatel96 @jade-guiton-dd @IbraheemA
internal/datadog/e2e/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @liustanley @songy23 @mackjmr @ankitpatel96 @jade-guiton-dd @IbraheemA
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/beta_stability.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ body:
- internal/aws
- internal/collectd
- internal/common
- internal/conventions
- internal/core
- internal/datadog
- internal/datadog/e2e
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ body:
- internal/aws
- internal/collectd
- internal/common
- internal/conventions
- internal/core
- internal/datadog
- internal/datadog/e2e
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ body:
- internal/aws
- internal/collectd
- internal/common
- internal/conventions
- internal/core
- internal/datadog
- internal/datadog/e2e
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/other.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ body:
- internal/aws
- internal/collectd
- internal/common
- internal/conventions
- internal/core
- internal/datadog
- internal/datadog/e2e
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/unmaintained.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ body:
- internal/aws
- internal/collectd
- internal/common
- internal/conventions
- internal/core
- internal/datadog
- internal/datadog/e2e
Expand Down
28 changes: 14 additions & 14 deletions cmd/opampsupervisor/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/pdata/ptrace"
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"google.golang.org/protobuf/proto"

"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor"
"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/config"
"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/telemetry"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions"
"github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed"
)

Expand Down Expand Up @@ -980,9 +980,9 @@ func TestSupervisorBootstrapsCollector(t *testing.T) {
identAttr := ad.IdentifyingAttributes
for _, attr := range identAttr {
switch attr.Key {
case string(semconv.ServiceNameKey):
case string(conventions.ServiceNameKey):
agentName = attr.Value.GetStringValue()
case string(semconv.ServiceVersionKey):
case string(conventions.ServiceVersionKey):
agentVersion = attr.Value.GetStringValue()
}
}
Expand Down Expand Up @@ -1080,9 +1080,9 @@ func TestSupervisorBootstrapsCollectorAvailableComponents(t *testing.T) {
identAttr := ad.IdentifyingAttributes
for _, attr := range identAttr {
switch attr.Key {
case string(semconv.ServiceNameKey):
case string(conventions.ServiceNameKey):
agentName = attr.Value.GetStringValue()
case string(semconv.ServiceVersionKey):
case string(conventions.ServiceVersionKey):
agentVersion = attr.Value.GetStringValue()
}
}
Expand Down Expand Up @@ -1239,15 +1239,15 @@ func TestSupervisorAgentDescriptionConfigApplies(t *testing.T) {
expectedDescription := &protobufs.AgentDescription{
IdentifyingAttributes: []*protobufs.KeyValue{
stringKeyValue("client.id", "my-client-id"),
stringKeyValue(string(semconv.ServiceInstanceIDKey), uuid.UUID(ad.InstanceUid).String()),
stringKeyValue(string(semconv.ServiceNameKey), command),
stringKeyValue(string(semconv.ServiceVersionKey), version),
stringKeyValue(string(conventions.ServiceInstanceIDKey), uuid.UUID(ad.InstanceUid).String()),
stringKeyValue(string(conventions.ServiceNameKey), command),
stringKeyValue(string(conventions.ServiceVersionKey), version),
},
NonIdentifyingAttributes: []*protobufs.KeyValue{
stringKeyValue("env", "prod"),
stringKeyValue(string(semconv.HostArchKey), runtime.GOARCH),
stringKeyValue(string(semconv.HostNameKey), host),
stringKeyValue(string(semconv.OSTypeKey), runtime.GOOS),
stringKeyValue(string(conventions.HostArchKey), runtime.GOARCH),
stringKeyValue(string(conventions.HostNameKey), host),
stringKeyValue(string(conventions.OSTypeKey), runtime.GOOS),
},
}

Expand Down Expand Up @@ -2496,9 +2496,9 @@ func TestSupervisorEmitBootstrapTelemetry(t *testing.T) {
identAttr := ad.IdentifyingAttributes
for _, attr := range identAttr {
switch attr.Key {
case string(semconv.ServiceNameKey):
case string(conventions.ServiceNameKey):
agentName = attr.Value.GetStringValue()
case string(semconv.ServiceVersionKey):
case string(conventions.ServiceVersionKey):
agentVersion = attr.Value.GetStringValue()
}
}
Expand All @@ -2516,7 +2516,7 @@ func TestSupervisorEmitBootstrapTelemetry(t *testing.T) {
}, 10*time.Second, 250*time.Millisecond)

require.Equal(t, 1, mockBackend.ReceivedTraces[0].ResourceSpans().Len())
gotServiceName, ok := mockBackend.ReceivedTraces[0].ResourceSpans().At(0).Resource().Attributes().Get(string(semconv.ServiceNameKey))
gotServiceName, ok := mockBackend.ReceivedTraces[0].ResourceSpans().At(0).Resource().Attributes().Get(string(conventions.ServiceNameKey))
require.True(t, ok)
require.Equal(t, "opamp-supervisor", gotServiceName.Str())

Expand Down
3 changes: 3 additions & 0 deletions cmd/opampsupervisor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ require (
github.com/knadh/koanf/providers/rawbytes v1.0.0
github.com/knadh/koanf/v2 v2.3.0
github.com/open-telemetry/opamp-go v0.22.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions v0.0.0-00010101000000-000000000000
github.com/open-telemetry/opentelemetry-collector-contrib/testbed v0.141.0
github.com/stretchr/testify v1.11.1
go.opentelemetry.io/collector/component v1.47.1-0.20251210054218-8f51a1792add
Expand Down Expand Up @@ -337,6 +338,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/metad

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => ../../internal/k8sconfig

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions => ../../internal/conventions

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog => ../../pkg/datadog
Expand Down
14 changes: 7 additions & 7 deletions cmd/opampsupervisor/supervisor/supervisor.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import (
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/log"
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
"go.opentelemetry.io/otel/trace"
"go.uber.org/multierr"
"go.uber.org/zap"
Expand All @@ -54,6 +53,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/commander"
"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/config"
supervisorTelemetry "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/telemetry"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions"
)

var (
Expand Down Expand Up @@ -254,14 +254,14 @@ func initTelemetrySettings(ctx context.Context, logger *zap.Logger, cfg config.T
pcommonRes.Attributes().PutStr(k, *v)
}

if _, ok := cfg.Resource[string(semconv.ServiceNameKey)]; !ok {
pcommonRes.Attributes().PutStr(string(semconv.ServiceNameKey), "opamp-supervisor")
if _, ok := cfg.Resource[string(conventions.ServiceNameKey)]; !ok {
pcommonRes.Attributes().PutStr(string(conventions.ServiceNameKey), "opamp-supervisor")
}

if _, ok := cfg.Resource[string(semconv.ServiceInstanceIDKey)]; !ok {
if _, ok := cfg.Resource[string(conventions.ServiceInstanceIDKey)]; !ok {
instanceUUID, _ := uuid.NewRandom()
instanceID := instanceUUID.String()
pcommonRes.Attributes().PutStr(string(semconv.ServiceInstanceIDKey), instanceID)
pcommonRes.Attributes().PutStr(string(conventions.ServiceInstanceIDKey), instanceID)
}

// TODO currently we do not have the build info containing the version available to set semconv.ServiceVersionKey
Expand All @@ -271,7 +271,7 @@ func initTelemetrySettings(ctx context.Context, logger *zap.Logger, cfg config.T
attrs = append(attrs, telemetryconfig.AttributeNameValue{Name: k, Value: v.Str()})
}

sch := semconv.SchemaURL
sch := conventions.SchemaURL

sdk, err := telemetryconfig.NewSDK(
telemetryconfig.WithContext(ctx),
Expand Down Expand Up @@ -497,7 +497,7 @@ func (s *Supervisor) getBootstrapInfo() (err error) {
identAttr := message.AgentDescription.IdentifyingAttributes

for _, attr := range identAttr {
if attr.Key == string(semconv.ServiceInstanceIDKey) {
if attr.Key == string(conventions.ServiceInstanceIDKey) {
if attr.Value.GetStringValue() != s.persistentState.InstanceID.String() {
done <- fmt.Errorf(
"the Collector's instance ID (%s) does not match with the instance ID set by the Supervisor (%s): %w",
Expand Down
2 changes: 1 addition & 1 deletion connector/exceptionsconnector/connector.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package exceptionsconnector // import "github.com/open-telemetry/opentelemetry-c

import (
"go.opentelemetry.io/collector/pdata/pcommon"
conventions "go.opentelemetry.io/otel/semconv/v1.37.0"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil"
)

Expand Down
2 changes: 1 addition & 1 deletion connector/exceptionsconnector/connector_logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/otel/semconv/v1.37.0"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/traceutil"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil"
)
Expand Down
2 changes: 1 addition & 1 deletion connector/exceptionsconnector/connector_metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/otel/semconv/v1.37.0"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/traceutil"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil"
)
Expand Down
3 changes: 2 additions & 1 deletion connector/exceptionsconnector/connector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import (

"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/otel/semconv/v1.27.0"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions"
)

const (
Expand Down
5 changes: 4 additions & 1 deletion connector/exceptionsconnector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/connector/excep
go 1.24.0

require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions v0.0.0-00010101000000-000000000000
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.141.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.141.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.141.0
Expand All @@ -18,7 +19,6 @@ require (
go.opentelemetry.io/collector/consumer/consumertest v0.141.1-0.20251210054218-8f51a1792add
go.opentelemetry.io/collector/pdata v1.47.1-0.20251210054218-8f51a1792add
go.opentelemetry.io/collector/pipeline v1.47.1-0.20251210054218-8f51a1792add
go.opentelemetry.io/otel v1.39.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.1
google.golang.org/grpc v1.77.0
Expand Down Expand Up @@ -51,6 +51,7 @@ require (
go.opentelemetry.io/collector/internal/fanoutconsumer v0.141.1-0.20251210054218-8f51a1792add // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.141.1-0.20251210054218-8f51a1792add // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.141.1-0.20251210054218-8f51a1792add // indirect
go.opentelemetry.io/otel v1.39.0 // indirect
go.opentelemetry.io/otel/metric v1.39.0 // indirect
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
Expand All @@ -61,6 +62,8 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions => ../../internal/conventions

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil => ../../internal/pdatautil
Expand Down
8 changes: 4 additions & 4 deletions connector/signaltometricsconnector/connector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/pmetric"
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector/config"
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector/internal/metadata"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/pmetrictest"
)
Expand Down Expand Up @@ -348,9 +348,9 @@ func telemetryResource(t *testing.T) pcommon.Resource {
t.Helper()

r := pcommon.NewResource()
r.Attributes().PutStr(string(semconv.ServiceInstanceIDKey), "627cc493-f310-47de-96bd-71410b7dec09")
r.Attributes().PutStr(string(semconv.ServiceNameKey), "signaltometrics")
r.Attributes().PutStr(string(semconv.ServiceNamespaceKey), "test")
r.Attributes().PutStr(string(conventions.ServiceInstanceIDKey), "627cc493-f310-47de-96bd-71410b7dec09")
r.Attributes().PutStr(string(conventions.ServiceNameKey), "signaltometrics")
r.Attributes().PutStr(string(conventions.ServiceNamespaceKey), "test")
return r
}

Expand Down
5 changes: 4 additions & 1 deletion connector/signaltometricsconnector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ go 1.24.0
require (
github.com/google/go-cmp v0.7.0
github.com/lightstep/go-expohisto v1.0.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions v0.0.0-00010101000000-000000000000
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.141.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.141.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.141.0
Expand All @@ -24,7 +25,6 @@ require (
go.opentelemetry.io/collector/pdata v1.47.1-0.20251210054218-8f51a1792add
go.opentelemetry.io/collector/pdata/pprofile v0.141.1-0.20251210054218-8f51a1792add
go.opentelemetry.io/collector/pipeline v1.47.1-0.20251210054218-8f51a1792add
go.opentelemetry.io/otel v1.39.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.1
)
Expand Down Expand Up @@ -67,6 +67,7 @@ require (
go.opentelemetry.io/collector/featuregate v1.47.1-0.20251210054218-8f51a1792add // indirect
go.opentelemetry.io/collector/internal/fanoutconsumer v0.141.1-0.20251210054218-8f51a1792add // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.141.1-0.20251210054218-8f51a1792add // indirect
go.opentelemetry.io/otel v1.39.0 // indirect
go.opentelemetry.io/otel/metric v1.39.0 // indirect
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
Expand All @@ -83,6 +84,8 @@ require (

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl => ../../pkg/ottl

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions => ../../internal/conventions

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ package model // import "github.com/open-telemetry/opentelemetry-collector-contr
import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/pdata/pcommon"
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector/internal/metadata"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions"
)

var prefix = metadata.Type.String()
Expand All @@ -27,7 +27,7 @@ func NewCollectorInstanceInfo(
) CollectorInstanceInfo {
var info CollectorInstanceInfo
for k, v := range set.Resource.Attributes().All() {
if k == string(semconv.ServiceInstanceIDKey) {
if k == string(conventions.ServiceInstanceIDKey) {
if str := v.Str(); str != "" {
info.serviceInstanceID = v.Str()
info.size++
Expand All @@ -46,7 +46,7 @@ func (info CollectorInstanceInfo) Size() int {
func (info CollectorInstanceInfo) Copy(to pcommon.Map) {
to.EnsureCapacity(info.Size())
if info.serviceInstanceID != "" {
to.PutStr(keyWithPrefix(string(semconv.ServiceInstanceIDKey)), info.serviceInstanceID)
to.PutStr(keyWithPrefix(string(conventions.ServiceInstanceIDKey)), info.serviceInstanceID)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/pdata/pcommon"
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions"
)

func TestCollectorInstanceInfo(t *testing.T) {
Expand All @@ -30,13 +31,13 @@ func TestCollectorInstanceInfo(t *testing.T) {
name: "with_service_instance_id",
input: func() component.TelemetrySettings {
ts := componenttest.NewNopTelemetrySettings()
ts.Resource.Attributes().PutStr(string(semconv.ServiceInstanceIDKey), "627cc493-f310-47de-96bd-71410b7dec09")
ts.Resource.Attributes().PutStr(string(conventions.ServiceInstanceIDKey), "627cc493-f310-47de-96bd-71410b7dec09")
return ts
}(),
expected: func() pcommon.Map {
m := pcommon.NewMap()
m.PutStr(
"signaltometrics."+string(semconv.ServiceInstanceIDKey),
"signaltometrics."+string(conventions.ServiceInstanceIDKey),
"627cc493-f310-47de-96bd-71410b7dec09",
)
return m
Expand Down
Loading
Loading