From 16c87a7871d128f9ac1932865a22a587b3b39de8 Mon Sep 17 00:00:00 2001 From: odubajDT Date: Fri, 10 Jan 2025 09:48:53 +0100 Subject: [PATCH] rename with x prefix Signed-off-by: odubajDT --- .github/CODEOWNERS | 2 +- .github/ISSUE_TEMPLATE/bug_report.yaml | 2 +- .github/ISSUE_TEMPLATE/feature_request.yaml | 2 +- .github/ISSUE_TEMPLATE/other.yaml | 2 +- .github/ISSUE_TEMPLATE/unmaintained.yaml | 2 +- cmd/otelcontribcol/builder-config.yaml | 2 +- connector/datadogconnector/go.mod | 2 +- exporter/awskinesisexporter/go.mod | 4 ++-- exporter/datadogexporter/go.mod | 2 +- exporter/datadogexporter/integrationtest/go.mod | 2 +- .../elasticsearchexporter/integrationtest/go.mod | 4 ++-- exporter/kafkaexporter/go.mod | 4 ++-- exporter/logzioexporter/go.mod | 4 ++-- exporter/pulsarexporter/go.mod | 4 ++-- exporter/sapmexporter/go.mod | 4 ++-- exporter/zipkinexporter/go.mod | 4 ++-- extension/encoding/jaegerencodingextension/go.mod | 4 ++-- extension/encoding/zipkinencodingextension/go.mod | 4 ++-- internal/coreinternal/timeutils/doc.go | 2 +- internal/otelarrow/testutil/testutil.go | 4 ++-- pkg/core/{idutils => xidutils}/Makefile | 0 .../{idutils => xidutils}/big_endian_converter.go | 2 +- .../big_endian_converter_test.go | 2 +- pkg/core/{idutils => xidutils}/doc.go | 4 ++-- pkg/core/{idutils => xidutils}/go.mod | 8 ++++---- pkg/core/{idutils => xidutils}/go.sum | 12 ++++++------ pkg/core/{idutils => xidutils}/metadata.yaml | 0 pkg/core/{idutils => xidutils}/package_test.go | 2 +- pkg/translator/jaeger/go.mod | 4 ++-- pkg/translator/jaeger/jaegerproto_to_traces.go | 2 +- pkg/translator/jaeger/jaegerproto_to_traces_test.go | 2 +- pkg/translator/jaeger/jaegerthrift_to_traces.go | 2 +- pkg/translator/jaeger/traces_to_jaegerproto.go | 2 +- pkg/translator/zipkin/go.mod | 4 ++-- pkg/translator/zipkin/zipkinv1/thrift.go | 2 +- pkg/translator/zipkin/zipkinv2/from_translator.go | 2 +- pkg/translator/zipkin/zipkinv2/to_translator.go | 2 +- processor/probabilisticsamplerprocessor/go.mod | 4 ++-- .../tracesprocessor_test.go | 2 +- receiver/jaegerreceiver/go.mod | 4 ++-- receiver/kafkareceiver/go.mod | 4 ++-- receiver/pulsarreceiver/go.mod | 4 ++-- receiver/sapmreceiver/go.mod | 4 ++-- receiver/zipkinreceiver/go.mod | 6 ++---- testbed/go.mod | 4 ++-- testbed/testbed/data_providers.go | 2 +- testbed/tests/trace_test.go | 2 +- versions.yaml | 2 +- 48 files changed, 74 insertions(+), 76 deletions(-) rename pkg/core/{idutils => xidutils}/Makefile (100%) rename pkg/core/{idutils => xidutils}/big_endian_converter.go (91%) rename pkg/core/{idutils => xidutils}/big_endian_converter_test.go (99%) rename pkg/core/{idutils => xidutils}/doc.go (54%) rename pkg/core/{idutils => xidutils}/go.mod (78%) rename pkg/core/{idutils => xidutils}/go.sum (93%) rename pkg/core/{idutils => xidutils}/metadata.yaml (100%) rename pkg/core/{idutils => xidutils}/package_test.go (91%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d2fe34eba660..7530f3e73e12 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -145,7 +145,6 @@ internal/tools/ @open-telemetry/collector-cont pkg/batchperresourceattr/ @open-telemetry/collector-contrib-approvers @atoulme @dmitryax pkg/batchpersignal/ @open-telemetry/collector-contrib-approvers @jpkrohling -pkg/core/idutils/ @open-telemetry/collector-contrib-approvers @odubajDT pkg/datadog/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @liustanley @songy23 @mackjmr @ankitpatel96 @jade-guiton-dd pkg/experimentalmetricmetadata/ @open-telemetry/collector-contrib-approvers @dmitryax pkg/golden/ @open-telemetry/collector-contrib-approvers @djaglowski @atoulme @@ -169,6 +168,7 @@ pkg/translator/signalfx/ @open-telemetry/collector-cont pkg/translator/skywalking/ @open-telemetry/collector-contrib-approvers @JaredTan95 pkg/translator/zipkin/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @andrzej-stencel @crobert-1 pkg/winperfcounters/ @open-telemetry/collector-contrib-approvers @dashpole @Mrod1598 @alxbl @pjanotti +pkg/core/xidutils/ @open-telemetry/collector-contrib-approvers @odubajDT processor/attributesprocessor/ @open-telemetry/collector-contrib-approvers @boostchicken processor/coralogixprocessor/ @open-telemetry/collector-contrib-approvers @crobert-1 @povilasv diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 65689fefcd31..21ad56018757 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -144,7 +144,7 @@ body: - internal/tools - pkg/batchperresourceattr - pkg/batchpersignal - - pkg/core/idutils + - pkg/core/xidutils - pkg/datadog - pkg/experimentalmetricmetadata - pkg/golden diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 4977658a8cab..04ea5837b1b1 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -138,7 +138,7 @@ body: - internal/tools - pkg/batchperresourceattr - pkg/batchpersignal - - pkg/core/idutils + - pkg/core/xidutils - pkg/datadog - pkg/experimentalmetricmetadata - pkg/golden diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml index 7e7e254c548f..38bddce977de 100644 --- a/.github/ISSUE_TEMPLATE/other.yaml +++ b/.github/ISSUE_TEMPLATE/other.yaml @@ -138,7 +138,7 @@ body: - internal/tools - pkg/batchperresourceattr - pkg/batchpersignal - - pkg/core/idutils + - pkg/core/xidutils - pkg/datadog - pkg/experimentalmetricmetadata - pkg/golden diff --git a/.github/ISSUE_TEMPLATE/unmaintained.yaml b/.github/ISSUE_TEMPLATE/unmaintained.yaml index f913a7e52bd4..0dab7966c2e0 100644 --- a/.github/ISSUE_TEMPLATE/unmaintained.yaml +++ b/.github/ISSUE_TEMPLATE/unmaintained.yaml @@ -143,7 +143,7 @@ body: - internal/tools - pkg/batchperresourceattr - pkg/batchpersignal - - pkg/core/idutils + - pkg/core/xidutils - pkg/datadog - pkg/experimentalmetricmetadata - pkg/golden diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index 78c1a361cfc6..55c6762db1e2 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -334,7 +334,7 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver => ../../receiver/journaldreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter => ../../exporter/logzioexporter - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal - - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../pkg/core/idutils + - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver => ../../receiver/k8seventsreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver => ../../receiver/k8sclusterreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor => ../../processor/transformprocessor diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index 69d273ba776c..e12a6c3e5274 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -385,4 +385,4 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experiment replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog => ../../pkg/datadog -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 7b2a944d7a34..fddebdcb1ffb 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -55,7 +55,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 // indirect github.com/openzipkin/zipkin-go v0.4.3 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.117.0 // indirect @@ -92,7 +92,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils retract ( v0.76.2 diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index d97358845967..5229968e818e 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -425,7 +425,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/e replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common diff --git a/exporter/datadogexporter/integrationtest/go.mod b/exporter/datadogexporter/integrationtest/go.mod index 2d90a265758c..345f8ece4f32 100644 --- a/exporter/datadogexporter/integrationtest/go.mod +++ b/exporter/datadogexporter/integrationtest/go.mod @@ -462,4 +462,4 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experiment replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog => ../../../pkg/datadog/ -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../../pkg/core/xidutils diff --git a/exporter/elasticsearchexporter/integrationtest/go.mod b/exporter/elasticsearchexporter/integrationtest/go.mod index 914b953e71ed..ad8cfdaaa5d7 100644 --- a/exporter/elasticsearchexporter/integrationtest/go.mod +++ b/exporter/elasticsearchexporter/integrationtest/go.mod @@ -101,7 +101,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.117.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.117.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.117.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.117.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.117.0 // indirect @@ -237,7 +237,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/commo replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../../pkg/core/xidutils replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent => ../../../internal/sharedcomponent diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index 3a056caa146a..808d0572bb84 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -79,7 +79,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.116.1-0.20241220212031-7c2639723f67 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 // indirect github.com/pierrec/lz4/v4 v4.1.22 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect @@ -116,7 +116,7 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka => ../../internal/kafka diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index 4d893713f746..17a5617da7aa 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -52,7 +52,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 // indirect github.com/pierrec/lz4/v4 v4.1.22 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rs/cors v1.11.1 // indirect @@ -91,7 +91,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils retract ( v0.76.2 diff --git a/exporter/pulsarexporter/go.mod b/exporter/pulsarexporter/go.mod index fddf210989bb..9a0119cad9ac 100644 --- a/exporter/pulsarexporter/go.mod +++ b/exporter/pulsarexporter/go.mod @@ -64,7 +64,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.116.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect @@ -106,7 +106,7 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger => ../../pkg/translator/jaeger diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 8116c089e921..6076fa6b2dc5 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -46,7 +46,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.117.0 // indirect go.opentelemetry.io/collector/consumer/consumertest v0.117.0 // indirect @@ -85,7 +85,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils retract ( v0.76.2 diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index 7fe26a00594c..f69a58379730 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -46,7 +46,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 // indirect github.com/pierrec/lz4/v4 v4.1.22 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rs/cors v1.11.1 // indirect @@ -90,7 +90,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/commo replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin => ../../pkg/translator/zipkin diff --git a/extension/encoding/jaegerencodingextension/go.mod b/extension/encoding/jaegerencodingextension/go.mod index f5c1948e1682..55ff70e6e258 100644 --- a/extension/encoding/jaegerencodingextension/go.mod +++ b/extension/encoding/jaegerencodingextension/go.mod @@ -33,7 +33,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.117.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.117.0 // indirect @@ -56,7 +56,7 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../../pkg/core/xidutils replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../../pkg/pdatautil diff --git a/extension/encoding/zipkinencodingextension/go.mod b/extension/encoding/zipkinencodingextension/go.mod index 395d5180c847..108105d30226 100644 --- a/extension/encoding/zipkinencodingextension/go.mod +++ b/extension/encoding/zipkinencodingextension/go.mod @@ -33,7 +33,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 // indirect github.com/openzipkin/zipkin-go v0.4.3 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.117.0 // indirect @@ -57,7 +57,7 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../../pkg/core/xidutils replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin => ../../../pkg/translator/zipkin diff --git a/internal/coreinternal/timeutils/doc.go b/internal/coreinternal/timeutils/doc.go index 949487096152..5d0549775a38 100644 --- a/internal/coreinternal/timeutils/doc.go +++ b/internal/coreinternal/timeutils/doc.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -// Package idutils provides a set of helper functions to convert ids. +// Package timeutils provides a set of helper functions to convert ids. // // Functions in big_endian_converter.go help converting uint64 ids to TraceID // and SpanID using big endian, and vice versa. diff --git a/internal/otelarrow/testutil/testutil.go b/internal/otelarrow/testutil/testutil.go index 1ad0a852d9b9..9f363ca30b71 100644 --- a/internal/otelarrow/testutil/testutil.go +++ b/internal/otelarrow/testutil/testutil.go @@ -101,7 +101,7 @@ func createExclusionsList(tb testing.TB, exclusionsText string) []portpair { return exclusions } -// UInt64ToTraceID is from collector-contrib/internal/idutils +// UInt64ToTraceID is from collector-contrib/internal/xidutils func UInt64ToTraceID(high, low uint64) pcommon.TraceID { traceID := [16]byte{} binary.BigEndian.PutUint64(traceID[:8], high) @@ -109,7 +109,7 @@ func UInt64ToTraceID(high, low uint64) pcommon.TraceID { return traceID } -// UInt64ToSpanID is from collector-contrib/internal/idutils +// UInt64ToSpanID is from collector-contrib/internal/xidutils func UInt64ToSpanID(id uint64) pcommon.SpanID { spanID := [8]byte{} binary.BigEndian.PutUint64(spanID[:8], id) diff --git a/pkg/core/idutils/Makefile b/pkg/core/xidutils/Makefile similarity index 100% rename from pkg/core/idutils/Makefile rename to pkg/core/xidutils/Makefile diff --git a/pkg/core/idutils/big_endian_converter.go b/pkg/core/xidutils/big_endian_converter.go similarity index 91% rename from pkg/core/idutils/big_endian_converter.go rename to pkg/core/xidutils/big_endian_converter.go index b091f9781e32..1b8e782d4b2c 100644 --- a/pkg/core/idutils/big_endian_converter.go +++ b/pkg/core/xidutils/big_endian_converter.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package idutils // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils" +package xidutils // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils" import ( "encoding/binary" diff --git a/pkg/core/idutils/big_endian_converter_test.go b/pkg/core/xidutils/big_endian_converter_test.go similarity index 99% rename from pkg/core/idutils/big_endian_converter_test.go rename to pkg/core/xidutils/big_endian_converter_test.go index ff4594058420..f346df9c9636 100644 --- a/pkg/core/idutils/big_endian_converter_test.go +++ b/pkg/core/xidutils/big_endian_converter_test.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package idutils +package xidutils import ( "math" diff --git a/pkg/core/idutils/doc.go b/pkg/core/xidutils/doc.go similarity index 54% rename from pkg/core/idutils/doc.go rename to pkg/core/xidutils/doc.go index 01743b392655..19ba1c73980e 100644 --- a/pkg/core/idutils/doc.go +++ b/pkg/core/xidutils/doc.go @@ -1,8 +1,8 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -// Package idutils provides a set of helper functions to convert ids. +// Package xidutils provides a set of helper functions to convert ids. // // Functions in big_endian_converter.go help converting uint64 ids to TraceID // and SpanID using big endian, and vice versa. -package idutils // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils" +package xidutils // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils" diff --git a/pkg/core/idutils/go.mod b/pkg/core/xidutils/go.mod similarity index 78% rename from pkg/core/idutils/go.mod rename to pkg/core/xidutils/go.mod index a70d6ef175c2..7fb3d6056d8e 100644 --- a/pkg/core/idutils/go.mod +++ b/pkg/core/xidutils/go.mod @@ -1,10 +1,10 @@ -module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils +module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils go 1.22.0 require ( github.com/stretchr/testify v1.10.0 - go.opentelemetry.io/collector/pdata v1.22.1-0.20241220212031-7c2639723f67 + go.opentelemetry.io/collector/pdata v1.23.0 go.uber.org/goleak v1.3.0 ) @@ -18,8 +18,8 @@ require ( golang.org/x/sys v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect - google.golang.org/grpc v1.69.0 // indirect - google.golang.org/protobuf v1.36.0 // indirect + google.golang.org/grpc v1.69.2 // indirect + google.golang.org/protobuf v1.36.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/core/idutils/go.sum b/pkg/core/xidutils/go.sum similarity index 93% rename from pkg/core/idutils/go.sum rename to pkg/core/xidutils/go.sum index de84d70b2b36..83963baa35dd 100644 --- a/pkg/core/idutils/go.sum +++ b/pkg/core/xidutils/go.sum @@ -27,8 +27,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.22.1-0.20241220212031-7c2639723f67 h1:qJ2VnulbhUdJhcHAqsQsbdxyPyskTGghL18m2EYo1Ws= -go.opentelemetry.io/collector/pdata v1.22.1-0.20241220212031-7c2639723f67/go.mod h1:u3EKrLq8yiwlpVNKpucpcDUqdl6RquaOqo3jXiN7jtg= +go.opentelemetry.io/collector/pdata v1.23.0 h1:tEk0dkfB8RdSukoOMfEa8duB938gfZowdfRkrJxGDrw= +go.opentelemetry.io/collector/pdata v1.23.0/go.mod h1:I2jggpBMiO8A+7TXhzNpcJZkJtvi1cU0iVNIi+6bc+o= go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= @@ -76,10 +76,10 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= -google.golang.org/grpc v1.69.0 h1:quSiOM1GJPmPH5XtU+BCoVXcDVJJAzNcoyfC2cCjGkI= -google.golang.org/grpc v1.69.0/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= -google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ= -google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= +google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU= +google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/pkg/core/idutils/metadata.yaml b/pkg/core/xidutils/metadata.yaml similarity index 100% rename from pkg/core/idutils/metadata.yaml rename to pkg/core/xidutils/metadata.yaml diff --git a/pkg/core/idutils/package_test.go b/pkg/core/xidutils/package_test.go similarity index 91% rename from pkg/core/idutils/package_test.go rename to pkg/core/xidutils/package_test.go index 31a4b5c05844..019906bb2d71 100644 --- a/pkg/core/idutils/package_test.go +++ b/pkg/core/xidutils/package_test.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package idutils +package xidutils import ( "testing" diff --git a/pkg/translator/jaeger/go.mod b/pkg/translator/jaeger/go.mod index 93f63664d0b9..057715500f70 100644 --- a/pkg/translator/jaeger/go.mod +++ b/pkg/translator/jaeger/go.mod @@ -5,7 +5,7 @@ go 1.22.7 require ( github.com/jaegertracing/jaeger v1.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/pdata v1.23.0 go.opentelemetry.io/collector/semconv v0.117.0 @@ -36,7 +36,7 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../../pkg/core/xidutils retract ( v0.76.2 diff --git a/pkg/translator/jaeger/jaegerproto_to_traces.go b/pkg/translator/jaeger/jaegerproto_to_traces.go index f3945be93b3d..68f982f633e7 100644 --- a/pkg/translator/jaeger/jaegerproto_to_traces.go +++ b/pkg/translator/jaeger/jaegerproto_to_traces.go @@ -18,7 +18,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/occonventions" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/tracetranslator" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils" + idutils "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils" ) var blankJaegerProtoSpan = new(model.Span) diff --git a/pkg/translator/jaeger/jaegerproto_to_traces_test.go b/pkg/translator/jaeger/jaegerproto_to_traces_test.go index e4cc684d2141..51269feb490d 100644 --- a/pkg/translator/jaeger/jaegerproto_to_traces_test.go +++ b/pkg/translator/jaeger/jaegerproto_to_traces_test.go @@ -19,7 +19,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/tracetranslator" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils" + idutils "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils" ) // Use timespamp with microsecond granularity to work well with jaeger thrift translation diff --git a/pkg/translator/jaeger/jaegerthrift_to_traces.go b/pkg/translator/jaeger/jaegerthrift_to_traces.go index 9d4d78acf09a..aad97dc71ce2 100644 --- a/pkg/translator/jaeger/jaegerthrift_to_traces.go +++ b/pkg/translator/jaeger/jaegerthrift_to_traces.go @@ -13,7 +13,7 @@ import ( conventions "go.opentelemetry.io/collector/semconv/v1.9.0" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/tracetranslator" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils" + idutils "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils" ) var blankJaegerThriftSpan = new(jaeger.Span) diff --git a/pkg/translator/jaeger/traces_to_jaegerproto.go b/pkg/translator/jaeger/traces_to_jaegerproto.go index 636aa19432b0..15410f0d33ef 100644 --- a/pkg/translator/jaeger/traces_to_jaegerproto.go +++ b/pkg/translator/jaeger/traces_to_jaegerproto.go @@ -10,7 +10,7 @@ import ( conventions "go.opentelemetry.io/collector/semconv/v1.16.0" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/tracetranslator" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils" + idutils "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils" ) // ProtoFromTraces translates internal trace data into the Jaeger Proto for GRPC. diff --git a/pkg/translator/zipkin/go.mod b/pkg/translator/zipkin/go.mod index 933ce44b751d..89a51c0ffd34 100644 --- a/pkg/translator/zipkin/go.mod +++ b/pkg/translator/zipkin/go.mod @@ -5,7 +5,7 @@ go 1.22.7 require ( github.com/jaegertracing/jaeger v1.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 github.com/openzipkin/zipkin-go v0.4.3 github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/pdata v1.23.0 @@ -37,7 +37,7 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../../pkg/core/xidutils retract ( v0.76.2 diff --git a/pkg/translator/zipkin/zipkinv1/thrift.go b/pkg/translator/zipkin/zipkinv1/thrift.go index 2a5e1cff4bf3..97702eeaab96 100644 --- a/pkg/translator/zipkin/zipkinv1/thrift.go +++ b/pkg/translator/zipkin/zipkinv1/thrift.go @@ -18,7 +18,7 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils" + idutils "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils" ) type thriftUnmarshaler struct{} diff --git a/pkg/translator/zipkin/zipkinv2/from_translator.go b/pkg/translator/zipkin/zipkinv2/from_translator.go index 4ee473bbee67..6c63d438c340 100644 --- a/pkg/translator/zipkin/zipkinv2/from_translator.go +++ b/pkg/translator/zipkin/zipkinv2/from_translator.go @@ -18,7 +18,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/tracetranslator" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/traceutil" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils" + idutils "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin/internal/zipkin" ) diff --git a/pkg/translator/zipkin/zipkinv2/to_translator.go b/pkg/translator/zipkin/zipkinv2/to_translator.go index 929fa7c00259..53abad9653d0 100644 --- a/pkg/translator/zipkin/zipkinv2/to_translator.go +++ b/pkg/translator/zipkin/zipkinv2/to_translator.go @@ -21,7 +21,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/occonventions" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/tracetranslator" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils" + idutils "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin/internal/zipkin" ) diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index 4eb9d8b54bd1..7ef829e83eaf 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/proba go 1.22.0 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.117.0 github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/component v0.117.0 @@ -121,7 +121,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils retract ( v0.76.2 diff --git a/processor/probabilisticsamplerprocessor/tracesprocessor_test.go b/processor/probabilisticsamplerprocessor/tracesprocessor_test.go index dd441e56d351..23215689bbcf 100644 --- a/processor/probabilisticsamplerprocessor/tracesprocessor_test.go +++ b/processor/probabilisticsamplerprocessor/tracesprocessor_test.go @@ -22,7 +22,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils" + idutils "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling" ) diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index d086c7e4f6ca..835f980e50a9 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -53,7 +53,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.2.3 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 // indirect github.com/pierrec/lz4/v4 v4.1.22 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rs/cors v1.11.1 // indirect @@ -88,7 +88,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/commo replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger => ../../pkg/translator/jaeger diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index 1d1ddd622cb6..e17e6b780215 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -82,7 +82,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.117.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.117.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.117.0 // indirect github.com/pierrec/lz4/v4 v4.1.22 // indirect @@ -122,7 +122,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafka replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka => ../../internal/kafka diff --git a/receiver/pulsarreceiver/go.mod b/receiver/pulsarreceiver/go.mod index 540106802013..72754a80a470 100644 --- a/receiver/pulsarreceiver/go.mod +++ b/receiver/pulsarreceiver/go.mod @@ -62,7 +62,7 @@ require ( github.com/mtibben/percent v0.2.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect @@ -99,7 +99,7 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger => ../../pkg/translator/jaeger diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 14ee0b62ea4a..7cfa0bb951ab 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -49,7 +49,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 // indirect github.com/pierrec/lz4/v4 v4.1.22 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rs/cors v1.11.1 // indirect @@ -87,7 +87,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/commo replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils retract ( v0.76.2 diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index b342ba1d015c..be0e0fb69e43 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -44,7 +44,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 // indirect github.com/pierrec/lz4/v4 v4.1.22 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rs/cors v1.11.1 // indirect @@ -78,9 +78,7 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../../pkg/core/idutils - -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin => ../../pkg/translator/zipkin diff --git a/testbed/go.mod b/testbed/go.mod index ea7cf7207489..f3e51aeffab1 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -16,7 +16,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils v0.117.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.117.0 @@ -413,7 +413,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils => ../pkg/core/idutils +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../pkg/core/xidutils replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => ../pkg/resourcetotelemetry diff --git a/testbed/testbed/data_providers.go b/testbed/testbed/data_providers.go index fd3dfa4da938..4e39d20e1e0e 100644 --- a/testbed/testbed/data_providers.go +++ b/testbed/testbed/data_providers.go @@ -16,7 +16,7 @@ import ( "go.opentelemetry.io/collector/pipeline" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/goldendataset" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils" + idutils "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" ) diff --git a/testbed/tests/trace_test.go b/testbed/tests/trace_test.go index 9b2194fc79df..892da96408ca 100644 --- a/testbed/tests/trace_test.go +++ b/testbed/tests/trace_test.go @@ -20,7 +20,7 @@ import ( conventions "go.opentelemetry.io/collector/semconv/v1.6.1" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils" + idutils "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datareceivers" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datasenders" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" diff --git a/versions.yaml b/versions.yaml index f37139834ef8..6b6f602bb0c5 100644 --- a/versions.yaml +++ b/versions.yaml @@ -142,7 +142,7 @@ module-sets: - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal - - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/idutils + - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic