diff --git a/go.mod b/go.mod index 5898198d114..9642992caed 100644 --- a/go.mod +++ b/go.mod @@ -61,7 +61,7 @@ require ( go.etcd.io/etcd/client/v3 v3.5.12 go.opentelemetry.io/contrib/propagators/aws v1.22.0 go.opentelemetry.io/otel v1.25.0 - go.opentelemetry.io/otel/bridge/opentracing v1.22.0 + go.opentelemetry.io/otel/bridge/opentracing v1.25.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 go.opentelemetry.io/otel/sdk v1.25.0 diff --git a/go.sum b/go.sum index f54c31b176e..58a4c012792 100644 --- a/go.sum +++ b/go.sum @@ -1484,8 +1484,8 @@ go.opentelemetry.io/contrib/propagators/ot v1.13.0 h1:tHWNd0WRS6w9keZoZg9aF3zYoh go.opentelemetry.io/contrib/propagators/ot v1.13.0/go.mod h1:R6Op9T6LxNaMRVlGD0wVwz40LSsAq296CXiEydKLQBU= go.opentelemetry.io/otel v1.25.0 h1:gldB5FfhRl7OJQbUHt/8s0a7cE8fbsPAtdpRaApKy4k= go.opentelemetry.io/otel v1.25.0/go.mod h1:Wa2ds5NOXEMkCmUou1WA7ZBfLTHWIsp034OVD7AO+Vg= -go.opentelemetry.io/otel/bridge/opentracing v1.22.0 h1:ZujpdLoATPdsyzp8hE5xW3jCNVZE46eMm42eu1JuxKk= -go.opentelemetry.io/otel/bridge/opentracing v1.22.0/go.mod h1:tnna9idtdH9//GUou9KCMo9pmnU9G14zrosFeeaqFP0= +go.opentelemetry.io/otel/bridge/opentracing v1.25.0 h1:GoFru3WAzDDBSrWxZgLfz1WAgt/AiQA1E7Dqu5Fe8PU= +go.opentelemetry.io/otel/bridge/opentracing v1.25.0/go.mod h1:GlUuTUEEBWqkqqtv9zYWbhgYPvOMEYCt+yjNCTmfyCk= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 h1:t6wl9SPayj+c7lEIFgm4ooDBZVb01IhLB4InpomhRw8= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0/go.mod h1:iSDOcsnSA5INXzZtwaBPrKp/lWu/V14Dd+llD0oI2EA= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 h1:Mw5xcxMwlqoJd97vwPxA8isEaIoxsta9/Q51+TTJLGE= diff --git a/vendor/go.opentelemetry.io/otel/bridge/opentracing/bridge.go b/vendor/go.opentelemetry.io/otel/bridge/opentracing/bridge.go index 6ecb3fc25bf..8aee5567f9e 100644 --- a/vendor/go.opentelemetry.io/otel/bridge/opentracing/bridge.go +++ b/vendor/go.opentelemetry.io/otel/bridge/opentracing/bridge.go @@ -1,16 +1,5 @@ // Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: Apache-2.0 package opentracing // import "go.opentelemetry.io/otel/bridge/opentracing" diff --git a/vendor/go.opentelemetry.io/otel/bridge/opentracing/doc.go b/vendor/go.opentelemetry.io/otel/bridge/opentracing/doc.go index 5b97ee334ab..5a89b6549a7 100644 --- a/vendor/go.opentelemetry.io/otel/bridge/opentracing/doc.go +++ b/vendor/go.opentelemetry.io/otel/bridge/opentracing/doc.go @@ -1,16 +1,5 @@ // Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: Apache-2.0 // Package opentracing implements a bridge that forwards OpenTracing API // calls to the OpenTelemetry SDK. diff --git a/vendor/go.opentelemetry.io/otel/bridge/opentracing/migration/README.md b/vendor/go.opentelemetry.io/otel/bridge/opentracing/migration/README.md new file mode 100644 index 00000000000..2324d5e8ec1 --- /dev/null +++ b/vendor/go.opentelemetry.io/otel/bridge/opentracing/migration/README.md @@ -0,0 +1,3 @@ +# OpenTracing Migration + +[![PkgGoDev](https://pkg.go.dev/badge/go.opentelemetry.io/otel/bridge/opentracing/migration)](https://pkg.go.dev/go.opentelemetry.io/otel/bridge/opentracing/migration) diff --git a/vendor/go.opentelemetry.io/otel/bridge/opentracing/migration/api.go b/vendor/go.opentelemetry.io/otel/bridge/opentracing/migration/api.go index 9a6b70d9da0..3a97a86e041 100644 --- a/vendor/go.opentelemetry.io/otel/bridge/opentracing/migration/api.go +++ b/vendor/go.opentelemetry.io/otel/bridge/opentracing/migration/api.go @@ -1,16 +1,5 @@ // Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: Apache-2.0 // Package migration provides interfaces and functions that are useful for // providing a cooperation of the OpenTelemetry tracers with the diff --git a/vendor/go.opentelemetry.io/otel/bridge/opentracing/migration/defer.go b/vendor/go.opentelemetry.io/otel/bridge/opentracing/migration/defer.go index cbeca54cccc..8d87385fe8a 100644 --- a/vendor/go.opentelemetry.io/otel/bridge/opentracing/migration/defer.go +++ b/vendor/go.opentelemetry.io/otel/bridge/opentracing/migration/defer.go @@ -1,16 +1,5 @@ // Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: Apache-2.0 package migration // import "go.opentelemetry.io/otel/bridge/opentracing/migration" diff --git a/vendor/go.opentelemetry.io/otel/bridge/opentracing/provider.go b/vendor/go.opentelemetry.io/otel/bridge/opentracing/provider.go index 90bad0bd516..b069753f7e9 100644 --- a/vendor/go.opentelemetry.io/otel/bridge/opentracing/provider.go +++ b/vendor/go.opentelemetry.io/otel/bridge/opentracing/provider.go @@ -1,16 +1,5 @@ // Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: Apache-2.0 package opentracing // import "go.opentelemetry.io/otel/bridge/opentracing" diff --git a/vendor/go.opentelemetry.io/otel/bridge/opentracing/util.go b/vendor/go.opentelemetry.io/otel/bridge/opentracing/util.go index 725777c7adb..585e2dee4d4 100644 --- a/vendor/go.opentelemetry.io/otel/bridge/opentracing/util.go +++ b/vendor/go.opentelemetry.io/otel/bridge/opentracing/util.go @@ -1,16 +1,5 @@ // Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: Apache-2.0 package opentracing // import "go.opentelemetry.io/otel/bridge/opentracing" diff --git a/vendor/go.opentelemetry.io/otel/bridge/opentracing/wrapper.go b/vendor/go.opentelemetry.io/otel/bridge/opentracing/wrapper.go index 1e065e3bc62..13b91c24048 100644 --- a/vendor/go.opentelemetry.io/otel/bridge/opentracing/wrapper.go +++ b/vendor/go.opentelemetry.io/otel/bridge/opentracing/wrapper.go @@ -1,16 +1,5 @@ // Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: Apache-2.0 package opentracing // import "go.opentelemetry.io/otel/bridge/opentracing" diff --git a/vendor/modules.txt b/vendor/modules.txt index 11fb64b70bc..34f183d73f9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1161,8 +1161,8 @@ go.opentelemetry.io/otel/semconv/v1.17.0/httpconv go.opentelemetry.io/otel/semconv/v1.20.0 go.opentelemetry.io/otel/semconv/v1.21.0 go.opentelemetry.io/otel/semconv/v1.24.0 -# go.opentelemetry.io/otel/bridge/opentracing v1.22.0 -## explicit; go 1.20 +# go.opentelemetry.io/otel/bridge/opentracing v1.25.0 +## explicit; go 1.21 go.opentelemetry.io/otel/bridge/opentracing go.opentelemetry.io/otel/bridge/opentracing/migration # go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0