Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] Update Jaeger model import paths to use jaeger-idl v1 #37782

Merged
merged 5 commits into from
Feb 10, 2025
Merged
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
3 changes: 1 addition & 2 deletions exporter/awskinesisexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/cenkalti/backoff/v4 v4.3.0
github.com/gogo/protobuf v1.3.2
github.com/google/uuid v1.6.0
github.com/jaegertracing/jaeger v1.66.0
github.com/jaegertracing/jaeger-idl v0.5.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.119.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.119.0
github.com/stretchr/testify v1.10.0
Expand Down Expand Up @@ -45,7 +45,6 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/jaegertracing/jaeger-idl v0.5.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
Expand Down
3 changes: 0 additions & 3 deletions exporter/awskinesisexporter/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package batch // import "github.com/open-telemetry/opentelemetry-collector-contr

import (
"github.com/gogo/protobuf/proto"
"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger-idl/model/v1"
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"
Expand Down
4 changes: 2 additions & 2 deletions exporter/kafkaexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/IBM/sarama v1.45.0
github.com/cenkalti/backoff/v4 v4.3.0
github.com/gogo/protobuf v1.3.2
github.com/jaegertracing/jaeger v1.66.0
github.com/jaegertracing/jaeger-idl v0.5.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.119.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.119.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.119.0
Expand Down Expand Up @@ -64,7 +64,6 @@ require (
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/jaegertracing/jaeger-idl v0.5.0 // indirect
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
github.com/jcmturner/gofork v1.7.6 // indirect
Expand Down Expand Up @@ -113,6 +112,7 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
google.golang.org/grpc v1.70.0 // indirect
google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
3 changes: 0 additions & 3 deletions exporter/kafkaexporter/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporter/kafkaexporter/jaeger_marshaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/IBM/sarama"
"github.com/gogo/protobuf/jsonpb"
jaegerproto "github.com/jaegertracing/jaeger/model"
jaegerproto "github.com/jaegertracing/jaeger-idl/model/v1"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.uber.org/multierr"

Expand Down
2 changes: 1 addition & 1 deletion exporter/logzioexporter/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"time"

"github.com/hashicorp/go-hclog"
"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/pkg/cache"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer/consumererror"
Expand Down
2 changes: 1 addition & 1 deletion exporter/logzioexporter/from_domain.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package logzioexporter // import "github.com/open-telemetry/opentelemetry-collec
import (
"strings"

"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger-idl/model/v1"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter/internal/dbmodel"
)
Expand Down
2 changes: 1 addition & 1 deletion exporter/logzioexporter/from_domain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"testing"

"github.com/gogo/protobuf/jsonpb"
"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

Expand Down
2 changes: 1 addition & 1 deletion exporter/logzioexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/hashicorp/go-hclog v1.6.3
github.com/jaegertracing/jaeger v1.66.0
github.com/jaegertracing/jaeger-idl v0.5.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.119.0
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component v0.119.0
Expand Down Expand Up @@ -40,7 +41,6 @@ require (
github.com/golang/snappy v0.0.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/jaegertracing/jaeger-idl v0.5.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
Expand Down
2 changes: 1 addition & 1 deletion exporter/logzioexporter/logzioservice.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"hash/fnv"

"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger-idl/model/v1"
)

const serviceLogType = "jaegerService"
Expand Down
2 changes: 1 addition & 1 deletion exporter/logzioexporter/logziospan.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package logzioexporter // import "github.com/open-telemetry/opentelemetry-collec
import (
"encoding/json"

"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger-idl/model/v1"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter/internal/dbmodel"
)
Expand Down
2 changes: 1 addition & 1 deletion exporter/logzioexporter/logziospan_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"os"
"testing"

"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/stretchr/testify/require"
)

Expand Down
7 changes: 5 additions & 2 deletions exporter/pulsarexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/apache/pulsar-client-go v0.14.0
github.com/cenkalti/backoff/v4 v4.3.0
github.com/gogo/protobuf v1.3.2
github.com/jaegertracing/jaeger v1.66.0
github.com/jaegertracing/jaeger-idl v0.5.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.119.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.119.0
github.com/stretchr/testify v1.10.0
Expand Down Expand Up @@ -40,6 +40,7 @@ require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
github.com/frankban/quicktest v1.14.3 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
Expand All @@ -52,12 +53,12 @@ require (
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/jaegertracing/jaeger-idl v0.5.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
github.com/knadh/koanf/v2 v2.1.2 // indirect
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
Expand All @@ -69,6 +70,7 @@ require (
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
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.62.0 // indirect
Expand All @@ -88,6 +90,7 @@ require (
go.opentelemetry.io/collector/receiver v0.119.0 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.119.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.119.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
Expand Down
5 changes: 2 additions & 3 deletions exporter/pulsarexporter/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporter/pulsarexporter/jaeger_marshaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/apache/pulsar-client-go/pulsar"
"github.com/gogo/protobuf/jsonpb"
jaegerproto "github.com/jaegertracing/jaeger/model"
jaegerproto "github.com/jaegertracing/jaeger-idl/model/v1"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.uber.org/multierr"

Expand Down
2 changes: 1 addition & 1 deletion exporter/sapmexporter/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"context"
"errors"

"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger-idl/model/v1"
sapmclient "github.com/signalfx/sapm-proto/client"
"go.opentelemetry.io/collector/client"
"go.opentelemetry.io/collector/component"
Expand Down
2 changes: 1 addition & 1 deletion exporter/sapmexporter/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"net/http/httptest"
"testing"

"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/klauspost/compress/zstd"
splunksapm "github.com/signalfx/sapm-proto/gen"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions exporter/sapmexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22.7

require (
github.com/cenkalti/backoff/v4 v4.3.0
github.com/jaegertracing/jaeger v1.66.0
github.com/jaegertracing/jaeger-idl v0.5.0
github.com/klauspost/compress v1.17.11
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.119.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.119.0
Expand Down Expand Up @@ -37,7 +37,7 @@ require (
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/jaegertracing/jaeger-idl v0.5.0 // indirect
github.com/jaegertracing/jaeger v1.66.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
Expand Down
3 changes: 1 addition & 2 deletions extension/encoding/jaegerencodingextension/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22.7

require (
github.com/gogo/protobuf v1.3.2
github.com/jaegertracing/jaeger v1.66.0
github.com/jaegertracing/jaeger-idl v0.5.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.119.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.119.0
github.com/stretchr/testify v1.10.0
Expand All @@ -24,7 +24,6 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/jaegertracing/jaeger-idl v0.5.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
Expand Down
2 changes: 0 additions & 2 deletions extension/encoding/jaegerencodingextension/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion extension/encoding/jaegerencodingextension/jaeger.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"bytes"

"github.com/gogo/protobuf/jsonpb"
jaegerproto "github.com/jaegertracing/jaeger/model"
jaegerproto "github.com/jaegertracing/jaeger-idl/model/v1"
"go.opentelemetry.io/collector/pdata/ptrace"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
Expand Down
2 changes: 1 addition & 1 deletion extension/jaegerremotesampling/extension_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"
"time"

"github.com/jaegertracing/jaeger/proto-gen/api_v2"
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component/componenttest"
Expand Down
3 changes: 1 addition & 2 deletions extension/jaegerremotesampling/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22.7

require (
github.com/fortytw2/leaktest v1.3.0
github.com/jaegertracing/jaeger v1.66.0
github.com/jaegertracing/jaeger-idl v0.5.0
github.com/jonboulle/clockwork v0.4.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.119.0
github.com/stretchr/testify v1.10.0
Expand Down Expand Up @@ -37,7 +37,6 @@ require (
github.com/golang/snappy v0.0.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/jaegertracing/jaeger-idl v0.5.0 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
Expand Down
3 changes: 0 additions & 3 deletions extension/jaegerremotesampling/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package mocks // import "github.com/open-telemetry/opentelemetry-collector-contr
import (
"context"

"github.com/jaegertracing/jaeger/proto-gen/api_v2"
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
)

type MockCfgMgr struct {
Expand Down
Loading